From 177ce2a217bf8fe47abd1993cf99d4defe6ff711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Austvik?= <jaustvik@acm.org>
Date: Thu, 8 Dec 2022 21:00:11 +0100
Subject: [PATCH 01/48] [Nanolaef] Visual State Bugfix (#13880)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Nanoleaf Visual State fix

Fix the visual state channel name.

Also:
- Better name (from state to visual state) of the (new) channel
- Better logs which has helped us debug the problem
- Some more information on when it will work in the README

Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
---
 .../org.openhab.binding.nanoleaf/README.md    |  2 ++
 .../internal/NanoleafBindingConstants.java    |  2 +-
 .../handler/NanoleafControllerHandler.java    | 26 +++++++++++++++----
 .../internal/layout/NanoleafLayout.java       |  5 ++++
 .../nanoleaf/internal/layout/PanelState.java  | 16 ++++++++++++
 .../resources/OH-INF/i18n/nanoleaf.properties |  4 +--
 .../resources/OH-INF/thing/lightpanels.xml    |  4 +--
 7 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/bundles/org.openhab.binding.nanoleaf/README.md b/bundles/org.openhab.binding.nanoleaf/README.md
index c7220da82f6a3..c6226731fedd9 100644
--- a/bundles/org.openhab.binding.nanoleaf/README.md
+++ b/bundles/org.openhab.binding.nanoleaf/README.md
@@ -110,6 +110,8 @@ Compare the following output with the right picture at the beginning of the arti
 The state channel shows an image of the panels on the wall.
 You have to configure things for each panel to get the correct color. 
 Since the colors of the panels can make it difficult to see the panel ids, please use the layout channel where the background color is always white to identify them.
+For state to work, you need to set static colors to your panel. 
+This is because Nanoleaf does not return updates on colors for dynamic effects and animations.
 
 ![Image](doc/NanoCanvas_rendered.jpg)
 
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/NanoleafBindingConstants.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/NanoleafBindingConstants.java
index db83c1fd78921..5109d8abce320 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/NanoleafBindingConstants.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/NanoleafBindingConstants.java
@@ -59,7 +59,7 @@ public class NanoleafBindingConstants {
     public static final String CHANNEL_SWIPE_EVENT_LEFT = "LEFT";
     public static final String CHANNEL_SWIPE_EVENT_RIGHT = "RIGHT";
     public static final String CHANNEL_LAYOUT = "layout";
-    public static final String CHANNEL_STATE = "state";
+    public static final String CHANNEL_VISUAL_STATE = "visualState";
 
     // List of light panel channels
     public static final String CHANNEL_PANEL_COLOR = "color";
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
index d37a82f06c714..cd34d655d755d 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
@@ -669,7 +669,7 @@ private void updateFromControllerInfo() throws NanoleafException {
         updateProperties();
         updateConfiguration();
         updateLayout(controllerInfo.getPanelLayout());
-        updateState(controllerInfo.getPanelLayout());
+        updateVisualState(controllerInfo.getPanelLayout());
 
         for (NanoleafControllerListener controllerListener : controllerListeners) {
             controllerListener.onControllerInfoFetched(getThing().getUID(), controllerInfo);
@@ -711,16 +711,27 @@ private void updateProperties() {
         }
     }
 
-    private void updateState(PanelLayout panelLayout) {
-        ChannelUID stateChannel = new ChannelUID(getThing().getUID(), CHANNEL_STATE);
+    private void updateVisualState(PanelLayout panelLayout) {
+        ChannelUID stateChannel = new ChannelUID(getThing().getUID(), CHANNEL_VISUAL_STATE);
 
         Bridge bridge = getThing();
         List<Thing> things = bridge.getThings();
+        if (things == null) {
+            logger.trace("No things to get state from!");
+            return;
+        }
+
         try {
             LayoutSettings settings = new LayoutSettings(false, true, true, true);
-            byte[] bytes = NanoleafLayout.render(panelLayout, new PanelState(things), settings);
+            logger.trace("Getting panel state for {} things", things.size());
+            PanelState panelState = new PanelState(things);
+            byte[] bytes = NanoleafLayout.render(panelLayout, panelState, settings);
             if (bytes.length > 0) {
                 updateState(stateChannel, new RawType(bytes, "image/png"));
+                logger.trace("Rendered visual state of panel {} in updateState has {} bytes", getThing().getUID(),
+                        bytes.length);
+            } else {
+                logger.debug("Visual state of {} failed to produce any image", getThing().getUID());
             }
 
             previousPanelLayout = panelLayout;
@@ -740,7 +751,8 @@ private void updateLayout(PanelLayout panelLayout) {
         }
 
         if (previousPanelLayout.equals(panelLayout)) {
-            logger.trace("Not rendering panel layout as it is the same as previous rendered panel layout");
+            logger.trace("Not rendering panel layout for {} as it is the same as previous rendered panel layout",
+                    getThing().getUID());
             return;
         }
 
@@ -751,6 +763,10 @@ private void updateLayout(PanelLayout panelLayout) {
             byte[] bytes = NanoleafLayout.render(panelLayout, new PanelState(things), settings);
             if (bytes.length > 0) {
                 updateState(layoutChannel, new RawType(bytes, "image/png"));
+                logger.trace("Rendered layout of panel {} in updateState has {} bytes", getThing().getUID(),
+                        bytes.length);
+            } else {
+                logger.debug("Layout of {} failed to produce any image", getThing().getUID());
             }
 
             previousPanelLayout = panelLayout;
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayout.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayout.java
index 61ceaa5497d72..ebdb4ffe991b9 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayout.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayout.java
@@ -31,6 +31,8 @@
 import org.openhab.binding.nanoleaf.internal.model.Layout;
 import org.openhab.binding.nanoleaf.internal.model.PanelLayout;
 import org.openhab.binding.nanoleaf.internal.model.PositionDatum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Renders the Nanoleaf layout to an image.
@@ -40,6 +42,7 @@
 @NonNullByDefault
 public class NanoleafLayout {
 
+    private static final Logger logger = LoggerFactory.getLogger(NanoleafLayout.class);
     private static final Color COLOR_BACKGROUND = Color.WHITE;
 
     public static byte[] render(PanelLayout panelLayout, PanelState state, LayoutSettings settings) throws IOException {
@@ -51,11 +54,13 @@ public static byte[] render(PanelLayout panelLayout, PanelState state, LayoutSet
 
         Layout layout = panelLayout.getLayout();
         if (layout == null) {
+            logger.warn("Returning no image as we don't have any layout to render");
             return new byte[] {};
         }
 
         List<PositionDatum> positionDatums = layout.getPositionData();
         if (positionDatums == null) {
+            logger.warn("Returning no image as we don't have any position datums to render");
             return new byte[] {};
         }
 
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/PanelState.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/PanelState.java
index fba1804fe85de..02c6a7a947d61 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/PanelState.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/PanelState.java
@@ -23,6 +23,8 @@
 import org.openhab.binding.nanoleaf.internal.handler.NanoleafPanelHandler;
 import org.openhab.core.library.types.HSBType;
 import org.openhab.core.thing.Thing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Stores the state of the panels.
@@ -32,6 +34,7 @@
 @NonNullByDefault
 public class PanelState {
 
+    private static final Logger logger = LoggerFactory.getLogger(PanelState.class);
     private final Map<Integer, HSBType> panelStates = new HashMap<>();
 
     public PanelState(List<Thing> panels) {
@@ -40,13 +43,26 @@ public PanelState(List<Thing> panels) {
             NanoleafPanelHandler panelHandler = (NanoleafPanelHandler) panel.getHandler();
             if (panelHandler != null) {
                 HSBType c = panelHandler.getColor();
+
+                if (c == null) {
+                    logger.trace("Panel {}: Failed to get color", panelId);
+                }
+
                 HSBType color = (c == null) ? HSBType.BLACK : c;
                 panelStates.put(panelId, color);
+            } else {
+                logger.trace("Panel {}: Couldn't find handler", panelId);
             }
         }
     }
 
     public HSBType getHSBForPanel(Integer panelId) {
+        if (logger.isTraceEnabled()) {
+            if (!panelStates.containsKey(panelId)) {
+                logger.trace("Failed to get color for panel {}, falling back to black", panelId);
+            }
+        }
+
         return panelStates.getOrDefault(panelId, HSBType.BLACK);
     }
 }
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf.properties b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf.properties
index a730c5089d690..f1cd2dac08ea7 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf.properties
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf.properties
@@ -40,8 +40,8 @@ channel-type.nanoleaf.swipe.label = Swipe
 channel-type.nanoleaf.swipe.description = Swipe over the panels
 channel-type.nanoleaf.layout.label = Layout
 channel-type.nanoleaf.layout.description = Layout of the panels
-channel-type.nanoleaf.state.label = State
-channel-type.nanoleaf.state.description = Current state of the panels
+channel-type.nanoleaf.state.label = Visual State
+channel-type.nanoleaf.state.description = Current visual state of the panels
 
 # error messages
 error.nanoleaf.controller.noIp = IP/host address and/or port are not configured for the controller.
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/thing/lightpanels.xml b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/thing/lightpanels.xml
index d5ac6ea23e585..52228fb02bdc0 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/thing/lightpanels.xml
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/thing/lightpanels.xml
@@ -19,7 +19,7 @@
 			<channel id="rhythmMode" typeId="rhythmMode"/>
 			<channel id="swipe" typeId="swipe"/>
 			<channel id="layout" typeId="layout"/>
-			<channel id="currentState" typeId="state"/>
+			<channel id="visualState" typeId="visualState"/>
 		</channels>
 
 		<properties>
@@ -115,7 +115,7 @@
 		<description>@text/channel-type.nanoleaf.layout.description</description>
 	</channel-type>
 
-	<channel-type id="state">
+	<channel-type id="visualState">
 		<item-type>Image</item-type>
 		<label>@text/channel-type.nanoleaf.state.label</label>
 		<description>@text/channel-type.nanoleaf.state.description</description>

From 0ffc5257d5262e9e4c6c444dee722035a851c980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= <git-dpa@aegee.org>
Date: Thu, 8 Dec 2022 22:12:49 +0200
Subject: [PATCH 02/48] Typos a/an (#13876)

---
 .../automation/pidcontroller/internal/LowpassFilter.java  | 2 +-
 .../binding/autelis/internal/handler/AutelisHandler.java  | 2 +-
 .../internal/domain/QueryResultJSONEncoderTest.java       | 4 ++--
 bundles/org.openhab.binding.deconz/README.md              | 2 +-
 .../deconz/internal/handler/LightThingHandler.java        | 2 +-
 .../binding/deutschebahn/internal/EventAttribute.java     | 6 +++---
 .../binding/deutschebahn/internal/filter/AndOperator.java | 2 +-
 .../deutschebahn/internal/filter/FilterParser.java        | 4 ++--
 .../deutschebahn/internal/filter/FilterScanner.java       | 2 +-
 .../binding/deutschebahn/internal/filter/FilterToken.java | 2 +-
 .../binding/deutschebahn/internal/filter/OrOperator.java  | 2 +-
 .../internal/filter/TimetableStopPredicate.java           | 2 +-
 .../deutschebahn/internal/timetable/TimetableLoader.java  | 6 +++---
 .../deutschebahn/internal/timetable/TimetablesV1Impl.java | 2 +-
 .../deutschebahn/internal/TripLabelAttributeTest.java     | 2 +-
 .../internal/timetable/TimetablesV1ApiStub.java           | 2 +-
 bundles/org.openhab.binding.digitalstrom/README.md        | 2 +-
 .../digitalstrom/internal/handler/BridgeHandler.java      | 2 +-
 .../jsonresponsecontainer/BaseTemperatureControl.java     | 2 +-
 .../climate/jsonresponsecontainer/BaseZoneIdentifier.java | 4 ++--
 .../jsonresponsecontainer/impl/AssignedSensors.java       | 2 +-
 .../climate/jsonresponsecontainer/impl/SensorValues.java  | 2 +-
 .../impl/TemperatureControlConfig.java                    | 2 +-
 .../impl/TemperatureControlStatus.java                    | 2 +-
 .../impl/TemperatureControlValues.java                    | 2 +-
 .../digitalstrom/internal/lib/event/types/EventItem.java  | 2 +-
 .../internal/lib/listener/DeviceStatusListener.java       | 2 +-
 .../internal/lib/listener/ManagerStatusListener.java      | 2 +-
 .../internal/lib/manager/DeviceStatusManager.java         | 2 +-
 .../internal/lib/manager/StructureManager.java            | 2 +-
 .../internal/lib/serverconnection/HttpTransport.java      | 2 +-
 .../lib/serverconnection/impl/HttpTransportImpl.java      | 4 ++--
 .../lib/serverconnection/impl/JSONResponseHandler.java    | 4 ++--
 .../internal/lib/structure/devices/Device.java            | 8 ++++----
 .../devices/deviceparameters/CachedMeteringValue.java     | 2 +-
 .../devices/deviceparameters/DeviceStateUpdate.java       | 2 +-
 .../devices/deviceparameters/impl/DeviceBinaryInput.java  | 2 +-
 .../devices/deviceparameters/impl/DeviceSensorValue.java  | 2 +-
 .../internal/lib/structure/devices/impl/DeviceImpl.java   | 2 +-
 .../digitalstrom/internal/providers/BaseDsI18n.java       | 4 ++--
 .../binding/dsmr/internal/device/cosem/CosemDecimal.java  | 4 ++--
 .../dsmr/internal/device/cosem/OBISIdentifier.java        | 4 ++--
 .../internal/discovery/DSMRBridgeDiscoveryService.java    | 2 +-
 .../binding/easee/internal/handler/StatusHandler.java     | 2 +-
 bundles/org.openhab.binding.ecobee/README.md              | 2 +-
 bundles/org.openhab.binding.enigma2/README.md             | 2 +-
 .../enphase/internal/handler/EnvoyBridgeHandler.java      | 2 +-
 .../internal/handler/FroniusSymoInverterHandler.java      | 2 +-
 .../gardena/internal/handler/GardenaDeviceConfig.java     | 2 +-
 .../rest/exceptions/GroupePSACommunicationException.java  | 2 +-
 .../resources/HeosStringPropertyChangeListener.java       | 2 +-
 .../openhab/binding/heos/internal/resources/Telnet.java   | 2 +-
 .../homematic/internal/handler/SimplePortPool.java        | 2 +-
 .../binding/hyperion/internal/protocol/v1/Correction.java | 2 +-
 .../iaqualink/internal/handler/IAqualinkHandler.java      | 2 +-
 .../internal/logic/BiweeklyPresentableCalendar.java       | 2 +-
 .../binding/icalendar/internal/logic/CommandTagType.java  | 2 +-
 .../binding/insteon/internal/message/MsgFactory.java      | 2 +-
 .../binding/keba/internal/handler/KeContactHandler.java   | 2 +-
 bundles/org.openhab.binding.kodi/README.md                | 2 +-
 .../SecondGenerationDxsEntriesContainerDTO.java           | 2 +-
 .../openhab/binding/lcn/internal/LcnModuleHandler.java    | 2 +-
 .../lgwebos/internal/handler/core/ChannelInfo.java        | 2 +-
 .../binding/linuxinput/internal/LinuxInputHandler.java    | 2 +-
 .../internal/controls/LxControlLeftRightAnalog.java       | 2 +-
 .../internal/controls/LxControlLeftRightDigital.java      | 2 +-
 .../binding/lutron/internal/grxprg/SocketSession.java     | 2 +-
 .../internal/discovery/MagentaTVDiscoveryParticipant.java | 2 +-
 .../main/java/org/openhab/binding/max/internal/Utils.java | 2 +-
 .../internal/parser/SystemInfromationBlockParser.java     | 2 +-
 .../internal/parser/SystemParameterBlockParser.java       | 2 +-
 .../internal/parser/SystemStateBlockParser.java           | 2 +-
 bundles/org.openhab.binding.modbus/README.md              | 2 +-
 .../src/main/resources/OH-INF/i18n/modbus.properties      | 2 +-
 .../src/main/resources/OH-INF/thing/thing-data.xml        | 2 +-
 .../binding/mqtt/generic/values/RollershutterValue.java   | 2 +-
 .../mqtt/homeassistant/internal/ComponentChannel.java     | 2 +-
 .../binding/mqtt/homie/internal/homie300/Property.java    | 2 +-
 .../openhab/binding/neeo/internal/models/NeeoAction.java  | 2 +-
 .../binding/neeo/internal/models/NeeoForwardActions.java  | 2 +-
 .../binding/nest/internal/wwn/dto/WWNUpdateRequest.java   | 2 +-
 .../main/resources/OH-INF/i18n/nikohomecontrol.properties | 2 +-
 .../nobohub/internal/model/WeekProfileRegister.java       | 2 +-
 .../src/main/resources/OH-INF/i18n/omnilink.properties    | 2 +-
 .../src/main/resources/OH-INF/thing/area.xml              | 2 +-
 .../openhab/binding/onewire/internal/device/BAE0910.java  | 2 +-
 .../openhab/binding/onewire/internal/device/DS18x20.java  | 2 +-
 .../openhab/binding/onewire/internal/device/DS1923.java   | 2 +-
 .../openhab/binding/onewire/internal/device/DS2401.java   | 2 +-
 .../openhab/binding/onewire/internal/device/DS2405.java   | 2 +-
 .../binding/onewire/internal/device/DS2406_DS2413.java    | 2 +-
 .../openhab/binding/onewire/internal/device/DS2408.java   | 2 +-
 .../openhab/binding/onewire/internal/device/DS2423.java   | 2 +-
 .../openhab/binding/onewire/internal/device/DS2438.java   | 2 +-
 .../internal/api/OpenSprinklerHttpApiV210.java            | 2 +-
 .../binding/opensprinkler/internal/util/Parse.java        | 2 +-
 .../java/org/openhab/binding/phc/internal/PHCHelper.java  | 2 +-
 .../binding/phc/internal/handler/PHCBridgeHandler.java    | 2 +-
 .../src/main/resources/OH-INF/i18n/phc.properties         | 6 +++---
 .../src/main/resources/OH-INF/thing/channel-types.xml     | 4 ++--
 .../src/main/resources/OH-INF/thing/thing-types.xml       | 2 +-
 .../pulseaudio/internal/items/AbstractDeviceConfig.java   | 2 +-
 .../org/openhab/binding/pushover/internal/dto/Sound.java  | 2 +-
 .../org/openhab/binding/pushsafer/internal/dto/Icon.java  | 2 +-
 .../org/openhab/binding/pushsafer/internal/dto/Sound.java | 2 +-
 .../internal/rego6xx/Rego6xxProtocolException.java        | 2 +-
 bundles/org.openhab.binding.rfxcom/README.md              | 2 +-
 .../src/main/resources/OH-INF/i18n/rfxcom.properties      | 2 +-
 .../src/main/resources/OH-INF/thing/raw.xml               | 2 +-
 .../discovery/RioSystemDeviceDiscoveryService.java        | 2 +-
 .../russound/internal/rio/StatefulHandlerCallback.java    | 2 +-
 bundles/org.openhab.binding.smartmeter/README.md          | 2 +-
 .../openhab/binding/smartmeter/internal/MeterDevice.java  | 2 +-
 .../internal/SmartMeterChannelTypeProvider.java           | 2 +-
 .../java/org/smslib/pduUtils/gsm3040/PduGenerator.java    | 2 +-
 .../binding/spotify/internal/api/SpotifyConnector.java    | 2 +-
 bundles/org.openhab.binding.tacmi/README.md               | 4 ++--
 .../binding/tacmi/internal/message/DigitalMessage.java    | 2 +-
 .../internal/core/TelldusCoreDeviceController.java        | 2 +-
 .../binding/tplinksmarthome/internal/Connection.java      | 2 +-
 .../binding/velux/internal/VeluxRSBindingConfig.java      | 2 +-
 .../bridge/slip/io/DataInputStreamWithTimeout.java        | 2 +-
 .../binding/velux/internal/things/VeluxGwState.java       | 2 +-
 .../binding/velux/internal/things/VeluxKLFAPI.java        | 4 ++--
 .../binding/velux/internal/things/VeluxProduct.java       | 2 +-
 .../binding/velux/internal/things/VeluxProductType.java   | 2 +-
 .../vigicrues/internal/dto/vigicrues/CdStationHydro.java  | 2 +-
 .../vigicrues/internal/dto/vigicrues/InfoVigiCru.java     | 2 +-
 .../vigicrues/internal/dto/vigicrues/TerEntVigiCru.java   | 2 +-
 .../vigicrues/internal/dto/vigicrues/TronEntVigiCru.java  | 2 +-
 .../vigicrues/internal/dto/vigicrues/VicANMoinsUn.java    | 2 +-
 .../internal/handler/WolfSmartsetSystemBridgeHandler.java | 2 +-
 .../internal/handler/WolfSmartsetUnitThingHandler.java    | 2 +-
 .../main/resources/OH-INF/i18n/wolfsmartset.properties    | 4 ++--
 .../src/main/resources/OH-INF/thing/thing-types.xml       | 4 ++--
 .../internal/handler/YamahaZoneThingHandler.java          | 2 +-
 .../internal/YamahaReceiverHandlerTest.java               | 2 +-
 .../zway/internal/converter/ZWayDeviceStateConverter.java | 8 ++++----
 .../io/neeo/internal/models/NeeoDeviceChannelKind.java    | 2 +-
 .../openhab/io/neeo/internal/models/NeeoDeviceType.java   | 4 ++--
 140 files changed, 166 insertions(+), 166 deletions(-)

diff --git a/bundles/org.openhab.automation.pidcontroller/src/main/java/org/openhab/automation/pidcontroller/internal/LowpassFilter.java b/bundles/org.openhab.automation.pidcontroller/src/main/java/org/openhab/automation/pidcontroller/internal/LowpassFilter.java
index 880573180e0c0..2b4365c84f85b 100644
--- a/bundles/org.openhab.automation.pidcontroller/src/main/java/org/openhab/automation/pidcontroller/internal/LowpassFilter.java
+++ b/bundles/org.openhab.automation.pidcontroller/src/main/java/org/openhab/automation/pidcontroller/internal/LowpassFilter.java
@@ -15,7 +15,7 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
- * Realizes an first-order FIR low pass filter. To keep code complexity low, it is implemented as moving average (all
+ * Realizes a first-order FIR low pass filter. To keep code complexity low, it is implemented as moving average (all
  * FIR coefficients are set to normalized ones).
  *
  * The exponential decaying function is used for the calculation (see https://en.wikipedia.org/wiki/Time_constant). That
diff --git a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java
index ed0cd3353c3b5..8d7b7e62ba0ef 100644
--- a/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java
+++ b/bundles/org.openhab.binding.autelis/src/main/java/org/openhab/binding/autelis/internal/handler/AutelisHandler.java
@@ -84,7 +84,7 @@ public class AutelisHandler extends BaseThingHandler {
      * Autelis controllers will not update their XML immediately after we change
      * a value. To compensate we cache previous values for a {@link Channel}
      * using the item name as a key. After a polling run has been executed we
-     * only update an channel if the value is different then what's in the
+     * only update a channel if the value is different then what's in the
      * cache. This cache is cleared after a fixed time period when commands are
      * sent.
      */
diff --git a/bundles/org.openhab.binding.dbquery/src/test/java/org/openhab/binding/dbquery/internal/domain/QueryResultJSONEncoderTest.java b/bundles/org.openhab.binding.dbquery/src/test/java/org/openhab/binding/dbquery/internal/domain/QueryResultJSONEncoderTest.java
index a0459cbe0e34b..fdc4fbeba7b97 100644
--- a/bundles/org.openhab.binding.dbquery/src/test/java/org/openhab/binding/dbquery/internal/domain/QueryResultJSONEncoderTest.java
+++ b/bundles/org.openhab.binding.dbquery/src/test/java/org/openhab/binding/dbquery/internal/domain/QueryResultJSONEncoderTest.java
@@ -70,7 +70,7 @@ void givenQueryResultItsContentIsCorrectlySerializedToJson() {
     }
 
     private void assertReadGivenValuesDecodedFromJson(Map<?, ?> firstRow) {
-        assertThat(firstRow.get("strValue"), is("an string"));
+        assertThat(firstRow.get("strValue"), is("a string"));
 
         Object doubleValue = firstRow.get("doubleValue");
         assertThat(doubleValue, instanceOf(Number.class));
@@ -124,7 +124,7 @@ private QueryResult givenQueryResultWithResults() {
 
     private Map<String, @Nullable Object> givenRowValues() {
         Map<String, @Nullable Object> values = new HashMap<>();
-        values.put("strValue", "an string");
+        values.put("strValue", "a string");
         values.put("doubleValue", 2.3d);
         values.put("intValue", 3);
         values.put("longValue", Long.MAX_VALUE);
diff --git a/bundles/org.openhab.binding.deconz/README.md b/bundles/org.openhab.binding.deconz/README.md
index ea5759edbbe64..15e6838f5955d 100644
--- a/bundles/org.openhab.binding.deconz/README.md
+++ b/bundles/org.openhab.binding.deconz/README.md
@@ -167,7 +167,7 @@ Other devices support
 |-------------------|--------------------------|:-----------:|---------------------------------------|-------------------------------------------------|
 | brightness        | Dimmer                   |     R/W     | Brightness of the light               | `dimmablelight`, `colortemperaturelight`        |
 | switch            | Switch                   |     R/W     | State of an ON/OFF device             | `onofflight`                                    |
-| color             | Color                    |     R/W     | Color of an multi-color light         | `colorlight`, `extendedcolorlight`, `lightgroup`|
+| color             | Color                    |     R/W     | Color of a multi-color light          | `colorlight`, `extendedcolorlight`, `lightgroup`|
 | color_temperature | Number                   |     R/W     | Color temperature in Kelvin. The value range is determined by each individual light     | `colortemperaturelight`, `extendedcolorlight`, `lightgroup` |
 | effect            | String                   |     R/W     | Effect selection. Allowed commands are set dynamically                                  | `colorlight`                                    |
 | effectSpeed       | Number                   |     W       | Effect Speed                          | `colorlight`                                    |
diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
index 3f1d92f958b0e..2156ea4bb7695 100644
--- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
+++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
@@ -303,7 +303,7 @@ protected void processStateResponse(DeconzBaseMessage stateResponse) {
         LightMessage lightMessage = (LightMessage) stateResponse;
 
         if (needsPropertyUpdate) {
-            // if we did not receive an ctmin/ctmax, then we probably don't need it
+            // if we did not receive a ctmin/ctmax, then we probably don't need it
             needsPropertyUpdate = false;
 
             Integer ctmax = lightMessage.ctmax;
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/EventAttribute.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/EventAttribute.java
index e7cfb3e50e2a5..81c76a14a17e4 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/EventAttribute.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/EventAttribute.java
@@ -377,7 +377,7 @@ private static List<String> mapDateToStringList(@Nullable Date value) {
     }
 
     /**
-     * Returns an single station from an path value (i.e. pipe separated value of stations).
+     * Returns a single station from a path value (i.e. pipe separated value of stations).
      * 
      * @param getPath Getter for the path.
      * @param returnFirst if <code>true</code> the first value will be returned, <code>false</code> will return the last
@@ -401,8 +401,8 @@ private static List<String> mapDateToStringList(@Nullable Date value) {
     }
 
     /**
-     * Returns all intermediate stations from an path. The first or last station will be omitted. The values will be
-     * separated by an single dash -.
+     * Returns all intermediate stations from a path. The first or last station will be omitted. The values will be
+     * separated by a single dash -.
      * 
      * @param getPath Getter for the path.
      * @param removeFirst if <code>true</code> the first value will be removed, <code>false</code> will remove the last
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/AndOperator.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/AndOperator.java
index abece42503091..ab3fd03bc00ee 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/AndOperator.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/AndOperator.java
@@ -15,7 +15,7 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
- * A token representing an conjunction.
+ * A token representing a conjunction.
  * 
  * @author Sönke Küper - Initial contribution.
  */
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterParser.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterParser.java
index 6c3350151bafc..27f1eb956410b 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterParser.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterParser.java
@@ -134,7 +134,7 @@ public TimetableStopPredicate getResult() throws FilterParserException {
     }
 
     /**
-     * State while parsing an conjunction.
+     * State while parsing a conjunction.
      */
     private static final class AndState extends State {
 
@@ -226,7 +226,7 @@ public TimetableStopPredicate getResult() throws FilterParserException {
     }
 
     /**
-     * State while parsing an Subquery.
+     * State while parsing a Subquery.
      */
     private static final class SubQueryState extends State {
 
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterScanner.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterScanner.java
index 848b24b2067f8..10f0a76233a88 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterScanner.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterScanner.java
@@ -90,7 +90,7 @@ public void finish(int position) {
     }
 
     /**
-     * State scanning an channel name until the equals-sign.
+     * State scanning a channel name until the equals-sign.
      */
     private final class ChannelNameState implements State {
 
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterToken.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterToken.java
index 13af0fc52c57d..65b086c3e86cd 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterToken.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/FilterToken.java
@@ -15,7 +15,7 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
- * A token representing a part of an filter expression.
+ * A token representing a part of a filter expression.
  * 
  * @author Sönke Küper - Initial contribution.
  */
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/OrOperator.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/OrOperator.java
index a53d3784c97b0..060a168a16663 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/OrOperator.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/OrOperator.java
@@ -15,7 +15,7 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
- * A token representing an disjunction.
+ * A token representing a disjunction.
  * 
  * @author Sönke Küper - Initial contribution.
  */
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/TimetableStopPredicate.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/TimetableStopPredicate.java
index ddb7e555fe92d..e1acd7c6db294 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/TimetableStopPredicate.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/filter/TimetableStopPredicate.java
@@ -18,7 +18,7 @@
 import org.openhab.binding.deutschebahn.internal.timetable.dto.TimetableStop;
 
 /**
- * Predicate to match an TimetableStop
+ * Predicate to match a TimetableStop
  * 
  * @author Sönke Küper - initial contribution.
  */
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/timetable/TimetableLoader.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/timetable/TimetableLoader.java
index 892cb0d76de90..1a6b4f92993ec 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/timetable/TimetableLoader.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/timetable/TimetableLoader.java
@@ -193,7 +193,7 @@ private void updatePlan(final Date currentTime) throws IOException {
             requestTime.setTime(currentTime);
         }
 
-        // Determine the max. time for which an plan is available
+        // Determine the max. time for which a plan is available
         final GregorianCalendar maxRequestTime = new GregorianCalendar();
         maxRequestTime.setTime(currentTime);
         maxRequestTime.set(Calendar.HOUR_OF_DAY, maxRequestTime.get(Calendar.HOUR_OF_DAY) + MAX_ADVANCE_HOUR);
@@ -225,7 +225,7 @@ private void updatePlan(final Date currentTime) throws IOException {
     private void processLoadedPlan(List<TimetableStop> stops, Date currentTime) {
         for (final TimetableStop stop : stops) {
 
-            // Check if an change for the stop was cached and apply it
+            // Check if a change for the stop was cached and apply it
             final TimetableStop change = this.cachedChanges.remove(stop.getId());
             if (change != null) {
                 TimetableStopMerger.merge(stop, change);
@@ -275,7 +275,7 @@ private List<TimetableStop> loadChanges(final Date currentTime) throws IOExcepti
             return Collections.emptyList();
         }
 
-        // The recent changes are only available for 120 seconds, so if last update is older perform an full update.
+        // The recent changes are only available for 120 seconds, so if last update is older perform a full update.
         if (secondsSinceLastUpdate >= MAX_RECENT_CHANGE_UPDATE) {
             fullChanges = true;
         }
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/timetable/TimetablesV1Impl.java b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/timetable/TimetablesV1Impl.java
index 7e1b585554ac3..2a86ae06c27b4 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/timetable/TimetablesV1Impl.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/java/org/openhab/binding/deutschebahn/internal/timetable/TimetablesV1Impl.java
@@ -101,7 +101,7 @@ public TimetablesV1Impl( //
 
         // The results from webservice does not conform to the schema provided. The triplabel-Element (tl) is expected
         // to occour as
-        // last Element within an timetableStop (s) element. But it is the first element when requesting the plan.
+        // last Element within a timetableStop (s) element. But it is the first element when requesting the plan.
         // When requesting the changes it is the last element, so the schema can't just be corrected.
         // If written to developer support, but got no response yet, so schema validation is disabled at the moment.
 
diff --git a/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/TripLabelAttributeTest.java b/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/TripLabelAttributeTest.java
index 9c1dce651c05f..ffa1d3b839a31 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/TripLabelAttributeTest.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/TripLabelAttributeTest.java
@@ -48,7 +48,7 @@ private <VALUE_TYPE, STATE_TYPE extends State> void doTestTripAttribute( //
         assertThat(attribute.getValue(new TripLabel()), is(nullValue()));
         assertThat(attribute.getState(new TripLabel()), is(nullValue()));
 
-        // Create an trip label and set the attribute value.
+        // Create a trip label and set the attribute value.
         final TripLabel labelWithValueSet = new TripLabel();
         setValue.accept(labelWithValueSet);
 
diff --git a/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/timetable/TimetablesV1ApiStub.java b/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/timetable/TimetablesV1ApiStub.java
index 0f03138104440..6efe262e79d2b 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/timetable/TimetablesV1ApiStub.java
+++ b/bundles/org.openhab.binding.deutschebahn/src/test/java/org/openhab/binding/deutschebahn/internal/timetable/TimetablesV1ApiStub.java
@@ -20,7 +20,7 @@
 import org.openhab.binding.deutschebahn.internal.timetable.dto.Timetable;
 
 /**
- * Stub Implementation of {@link TimetablesV1Api}, that may return an preconfigured Timetable or
+ * Stub Implementation of {@link TimetablesV1Api}, that may return a preconfigured Timetable or
  * throws an {@link IOException} if not data has been set.
  * 
  * @author Sönke Küper - initial contribution
diff --git a/bundles/org.openhab.binding.digitalstrom/README.md b/bundles/org.openhab.binding.digitalstrom/README.md
index 4e35584c24a11..1448e90ef05ea 100644
--- a/bundles/org.openhab.binding.digitalstrom/README.md
+++ b/bundles/org.openhab.binding.digitalstrom/README.md
@@ -236,7 +236,7 @@ The digitalSTROM-Scenes can be defined with following parameters.
 | Scene ID or name | sceneID |The call scene ID or scene name, e.g. preset 1 for scene ID 5. Callable scenes are from 0 to 126. | false | false |
 
 The Scene-Thing-Type _Named-Scene_ and _Group-Scene_ have all parameters.
-The _Apartment-Scene_ only has the parameters _Scene name_ and _Scene ID_ an the _Zone-Scene_ has all parameters without _Group ID or name_.
+The _Apartment-Scene_ only has the parameters _Scene name_ and _Scene ID_ and the _Zone-Scene_ has all parameters without _Group ID or name_.
 
 ### Textual configuration examples
 
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/BridgeHandler.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/BridgeHandler.java
index 8992f19f3effc..b48731622ea5e 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/BridgeHandler.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/handler/BridgeHandler.java
@@ -632,7 +632,7 @@ public void onConnectionStateChange(String newConnectionState, String reason) {
                 case WRONG_APP_TOKEN:
                     updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
                             "User defined Application-Token is wrong. "
-                                    + "Please set user name and password to generate an Application-Token or set an valid Application-Token.");
+                                    + "Please set user name and password to generate an Application-Token or set a valid Application-Token.");
                     stopServices();
                     return;
                 case WRONG_USER_OR_PASSWORD:
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/BaseTemperatureControl.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/BaseTemperatureControl.java
index 3b93c6ab1ecb1..d29595c58f737 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/BaseTemperatureControl.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/BaseTemperatureControl.java
@@ -30,7 +30,7 @@ public abstract class BaseTemperatureControl extends BaseZoneIdentifier {
     protected Short controlMode;
 
     /**
-     * Creates a new {@link BaseTemperatureControl} through the {@link JsonObject} which will be returned by an zone
+     * Creates a new {@link BaseTemperatureControl} through the {@link JsonObject} which will be returned by a zone
      * call.<br>
      * Because zone calls do not include a zoneID or zoneName in the json response, the zoneID and zoneName have to
      * be handed over the constructor.
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/BaseZoneIdentifier.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/BaseZoneIdentifier.java
index 94c7c2060697b..6a270d12dfecd 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/BaseZoneIdentifier.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/BaseZoneIdentifier.java
@@ -28,7 +28,7 @@ public abstract class BaseZoneIdentifier implements ZoneIdentifier {
     protected String zoneName;
 
     /**
-     * Creates a new {@link BaseZoneIdentifier} with an zone id and zone name.
+     * Creates a new {@link BaseZoneIdentifier} with a zone id and zone name.
      *
      * @param zoneID must not be null
      * @param zoneName can be null
@@ -39,7 +39,7 @@ public BaseZoneIdentifier(Integer zoneID, String zoneName) {
     }
 
     /**
-     * Creates a new {@link BaseZoneIdentifier} through the {@link JsonObject} of the response of an digitalSTROM-API
+     * Creates a new {@link BaseZoneIdentifier} through the {@link JsonObject} of the response of a digitalSTROM-API
      * apartment call.
      *
      * @param jObject must not be null
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/AssignedSensors.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/AssignedSensors.java
index c7b5da322a215..67da01168d476 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/AssignedSensors.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/AssignedSensors.java
@@ -47,7 +47,7 @@ public AssignedSensors(JsonObject jObject) {
     }
 
     /**
-     * Creates a new {@link AssignedSensors} through the {@link JsonObject} which will be returned by an zone call.
+     * Creates a new {@link AssignedSensors} through the {@link JsonObject} which will be returned by a zone call.
      * Because of zone calls does not include a zoneID or zoneName in the json response, the zoneID and zoneName have to
      * be handed over the constructor.
      *
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/SensorValues.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/SensorValues.java
index 1360bd0cff462..4ca22a16d78b7 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/SensorValues.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/SensorValues.java
@@ -50,7 +50,7 @@ public SensorValues(JsonObject jObject) {
     }
 
     /**
-     * Creates a new {@link SensorValues} through the {@link JsonObject} which will be returned by an zone call.
+     * Creates a new {@link SensorValues} through the {@link JsonObject} which will be returned by a zone call.
      * Because of zone calls does not include a zoneID or zoneName in the json response, the zoneID and zoneName have to
      * be handed over the constructor.
      *
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlConfig.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlConfig.java
index d35df54aa2b25..1567d703b8fc5 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlConfig.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlConfig.java
@@ -54,7 +54,7 @@ public TemperatureControlConfig(JsonObject jObject) {
     }
 
     /**
-     * Creates a new {@link TemperatureControlConfig} through the {@link JsonObject} which will be returned by an zone
+     * Creates a new {@link TemperatureControlConfig} through the {@link JsonObject} which will be returned by a zone
      * call.<br>
      * Because of zone calls does not include a zoneID or zoneName in the json response, the zoneID and zoneName have to
      * be handed over the constructor.
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlStatus.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlStatus.java
index abbbd299c7ca2..6831f68977d4a 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlStatus.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlStatus.java
@@ -55,7 +55,7 @@ public TemperatureControlStatus(JsonObject jObject) {
     }
 
     /**
-     * Creates a new {@link TemperatureControlStatus} through the {@link JsonObject} which will be returned by an zone
+     * Creates a new {@link TemperatureControlStatus} through the {@link JsonObject} which will be returned by a zone
      * call.<br>
      * Because of zone calls does not include a zoneID or zoneName in the json response, the zoneID and zoneName have to
      * be handed over the constructor.
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlValues.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlValues.java
index 175bbc63e62d0..d23c955b364ce 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlValues.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/jsonresponsecontainer/impl/TemperatureControlValues.java
@@ -48,7 +48,7 @@ public TemperatureControlValues(JsonObject jObject) {
     }
 
     /**
-     * Creates a new {@link TemperatureControlValues} through the {@link JsonObject} which will be returned by an zone
+     * Creates a new {@link TemperatureControlValues} through the {@link JsonObject} which will be returned by a zone
      * call.<br>
      * Because of zone calls does not include a zoneID or zoneName in the json response, the zoneID and zoneName have to
      * be handed over the constructor.
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/event/types/EventItem.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/event/types/EventItem.java
index 717fc8d673563..d83067f70b70a 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/event/types/EventItem.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/event/types/EventItem.java
@@ -17,7 +17,7 @@
 import org.openhab.binding.digitalstrom.internal.lib.event.constants.EventResponseEnum;
 
 /**
- * The {@link EventItem} represents an event item of an digitalSTROM-Event.
+ * The {@link EventItem} represents an event item of a digitalSTROM-Event.
  *
  * @author Alexander Betker
  * @author Michael Ochel - add getSource()
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/DeviceStatusListener.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/DeviceStatusListener.java
index 732a833d814d7..d9f89f84ff356 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/DeviceStatusListener.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/DeviceStatusListener.java
@@ -62,7 +62,7 @@ public interface DeviceStatusListener {
     void onDeviceAdded(GeneralDeviceInformation device);
 
     /**
-     * This method is called whenever a configuration of an device has changed. What configuration has changed
+     * This method is called whenever a configuration of a device has changed. What configuration has changed
      * can be see by the given parameter whatConfig to handle the change.<br>
      * Please have a look at {@link ChangeableDeviceConfigEnum} to see what configuration are changeable.
      *
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/ManagerStatusListener.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/ManagerStatusListener.java
index 10bacbaadd897..dac68d54e5e00 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/ManagerStatusListener.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/listener/ManagerStatusListener.java
@@ -24,7 +24,7 @@
 public interface ManagerStatusListener {
 
     /**
-     * This method is called whenever the state of an digitalSTROM-Manager has changed.<br>
+     * This method is called whenever the state of a digitalSTROM-Manager has changed.<br>
      * For that it passes the {@link ManagerTypes} and the new {@link ManagerStates}.
      *
      * @param managerType of the digitalSTROM-Manager
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/DeviceStatusManager.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/DeviceStatusManager.java
index 737869f1cb21f..06566556b1255 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/DeviceStatusManager.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/DeviceStatusManager.java
@@ -28,7 +28,7 @@
 /**
  * <p>
  * The {@link DeviceStatusManager} is responsible for the synchronization between the internal model of the
- * digitalSTROM-devices and the real existing digitalSTROM-devices. You can change the state of an device by sending a
+ * digitalSTROM-devices and the real existing digitalSTROM-devices. You can change the state of a device by sending a
  * direct command to the devices or by calling a scene. Furthermore the {@link DeviceStatusManager} get informed over
  * the {@link SceneManager} by the {@link EventListener} if scenes are called by external sources. All
  * configurations of the physically device will be synchronized to the internally managed model and updated as required.
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/StructureManager.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/StructureManager.java
index 1408621467d37..9dcab1ee8d6c0 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/StructureManager.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/StructureManager.java
@@ -110,7 +110,7 @@ public interface StructureManager {
     Map<Short, List<Device>> getGroupsFromZoneX(int zoneID);
 
     /**
-     * Returns the reference {@link List} of the {@link Device}'s of an zone-group.
+     * Returns the reference {@link List} of the {@link Device}'s of a zone-group.
      *
      * @param zoneID of the zone
      * @param groupID of the group
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/HttpTransport.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/HttpTransport.java
index 2d7352981b420..455cfc440af94 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/HttpTransport.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/HttpTransport.java
@@ -13,7 +13,7 @@
 package org.openhab.binding.digitalstrom.internal.lib.serverconnection;
 
 /**
- * The {@link HttpTransport} executes an request to the DigitalSTROM-Server.
+ * The {@link HttpTransport} executes a request to the DigitalSTROM-Server.
  *
  * @author Michael Ochel - Initial contribution
  * @author Matthias Siegele - Initial contribution
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/impl/HttpTransportImpl.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/impl/HttpTransportImpl.java
index 9ce829ac2b1f4..11a4d71b97e0c 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/impl/HttpTransportImpl.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/impl/HttpTransportImpl.java
@@ -52,10 +52,10 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link HttpTransportImpl} executes an request to the digitalSTROM-Server.
+ * The {@link HttpTransportImpl} executes a request to the digitalSTROM-Server.
  * <p>
  * If a {@link Config} is given at the constructor. It sets the SSL-Certificate what is set in
- * {@link Config#getCert()}. If there is no SSL-Certificate, but an path to an external SSL-Certificate file what is set
+ * {@link Config#getCert()}. If there is no SSL-Certificate, but a path to an external SSL-Certificate file what is set
  * in {@link Config#getTrustCertPath()} this will be set. If no SSL-Certificate is set in the {@link Config} it will be
  * red out from the server and set in {@link Config#setCert(String)}.
  *
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/impl/JSONResponseHandler.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/impl/JSONResponseHandler.java
index b78e32649b5c3..aa734a79c602a 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/impl/JSONResponseHandler.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/serverconnection/impl/JSONResponseHandler.java
@@ -21,7 +21,7 @@
 import com.google.gson.JsonParser;
 
 /**
- * The {@link JSONResponseHandler} checks an digitalSTROM-JSON response and can parse it to a {@link JsonObject}.
+ * The {@link JSONResponseHandler} checks a digitalSTROM-JSON response and can parse it to a {@link JsonObject}.
  *
  * @author Alexander Betker - Initial contribution
  * @author Alex Maier - Initial contribution
@@ -65,7 +65,7 @@ public static JsonObject toJsonObject(String jsonResponse) {
             try {
                 return (JsonObject) JsonParser.parseString(jsonResponse);
             } catch (JsonParseException e) {
-                LOGGER.error("An JsonParseException occurred by parsing jsonRequest: {}", jsonResponse, e);
+                LOGGER.error("A JsonParseException occurred by parsing jsonRequest: {}", jsonResponse, e);
             }
         }
         return null;
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/Device.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/Device.java
index c85b42b7a4f8d..8ee4e833ff7f1 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/Device.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/Device.java
@@ -163,7 +163,7 @@ public interface Device extends GeneralDeviceInformation {
     void increase();
 
     /**
-     * Adds an decrease command as {@link DeviceStateUpdate} to the list of outstanding commands.
+     * Adds a decrease command as {@link DeviceStateUpdate} to the list of outstanding commands.
      */
     void decrease();
 
@@ -175,7 +175,7 @@ public interface Device extends GeneralDeviceInformation {
     int getSlatPosition();
 
     /**
-     * Adds an set slat position command as {@link DeviceStateUpdate} with the given slat position to the list of
+     * Adds a set slat position command as {@link DeviceStateUpdate} with the given slat position to the list of
      * outstanding commands.
      *
      * @param slatPosition to set
@@ -205,7 +205,7 @@ public interface Device extends GeneralDeviceInformation {
     short getOutputValue();
 
     /**
-     * Adds an set output value command as {@link DeviceStateUpdate} with the given output value to the list of
+     * Adds a set output value command as {@link DeviceStateUpdate} with the given output value to the list of
      * outstanding commands.
      *
      * @param outputValue to set
@@ -427,7 +427,7 @@ void setSensorDataRefreshPriority(String powerConsumptionRefreshPriority, String
     short getAnglePosition();
 
     /**
-     * Adds an set angle value command as {@link DeviceStateUpdate} with the given angle value to the list of
+     * Adds a set angle value command as {@link DeviceStateUpdate} with the given angle value to the list of
      * outstanding commands.
      *
      * @param angle to set
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/CachedMeteringValue.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/CachedMeteringValue.java
index 15b406a22b67a..0815fc8abf30c 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/CachedMeteringValue.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/CachedMeteringValue.java
@@ -20,7 +20,7 @@
 import org.openhab.binding.digitalstrom.internal.lib.structure.devices.deviceparameters.impl.DSUID;
 
 /**
- * The {@link CachedMeteringValue} saves the metering value of an digitalSTROM-Circuit.
+ * The {@link CachedMeteringValue} saves the metering value of a digitalSTROM-Circuit.
  *
  * @author Alexander Betker - Initial contribution
  * @author Michael Ochel - add methods getDateAsDate(), getMeteringType() and getMeteringUnit(); add missing java-doc
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/DeviceStateUpdate.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/DeviceStateUpdate.java
index 04f8fddea056f..e13d7a1a9212a 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/DeviceStateUpdate.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/DeviceStateUpdate.java
@@ -63,7 +63,7 @@ public interface DeviceStateUpdate {
     static final String UPDATE_SCENE_CONFIG = "sceneConfig";
 
     // general
-    /** command to refresh the output value of an device. */
+    /** command to refresh the output value of a device. */
     static final String REFRESH_OUTPUT = "refreshOutput";
 
     // standard values
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceBinaryInput.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceBinaryInput.java
index 8b4e045c77464..ecc98469b306e 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceBinaryInput.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceBinaryInput.java
@@ -17,7 +17,7 @@
 import com.google.gson.JsonObject;
 
 /**
- * The {@link DeviceBinaryInput} contains all information of an device binary input, e.g. binary input type id (see
+ * The {@link DeviceBinaryInput} contains all information of a device binary input, e.g. binary input type id (see
  * {@link DeviceBinarayInputEnum}, state and so on.
  *
  * @author Michael Ochel - initial contributer
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceSensorValue.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceSensorValue.java
index 73060a3f1e3f7..0767e5bb5d8b8 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceSensorValue.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceSensorValue.java
@@ -28,7 +28,7 @@
 import com.google.gson.JsonObject;
 
 /**
- * The {@link DeviceSensorValue} contains all needed information of an device sensor, e.g. the sensor type, to detect
+ * The {@link DeviceSensorValue} contains all needed information of a device sensor, e.g. the sensor type, to detect
  * which kind of sensor it is (see {@link SensorEnum}), the sensor index to read out sensor at the digitalSTROM device
  * by calling {@link DsAPI#getDeviceSensorValue(String, DSID, String, String, Short)} and as well as of course the value
  * and
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/impl/DeviceImpl.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/impl/DeviceImpl.java
index 1e331473182af..85195e7c1430d 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/impl/DeviceImpl.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/impl/DeviceImpl.java
@@ -111,7 +111,7 @@ public class DeviceImpl extends AbstractGeneralDeviceInformations implements Dev
 
     /*
      * Saves the refresh priorities and reading initialized flag of power sensors as
-     * an matrix. The first array fields are 0 = active power, 1 = output current, 2
+     * a matrix. The first array fields are 0 = active power, 1 = output current, 2
      * = electric meter, 3 = power consumption and in each field is a string array
      * with the fields 0 = refresh priority 1 = reading initial flag (true = reading
      * is initialized, otherwise false)
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/BaseDsI18n.java b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/BaseDsI18n.java
index 25ef00a187c1a..6723aa34ae386 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/BaseDsI18n.java
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/providers/BaseDsI18n.java
@@ -85,8 +85,8 @@ protected void unsetTranslationProvider(TranslationProvider translationProvider)
     }
 
     /**
-     * Returns the internationalized text in the language of the {@link Locale} of the given key. If the key an does not
-     * exist at the internationalization of the {@link Locale} the {@link Locale#ENGLISH} will be used. If the key dose
+     * Returns the internationalized text in the language of the {@link Locale} of the given key. If the key does not
+     * exist at the internationalization of the {@link Locale} the {@link Locale#ENGLISH} will be used. If the key does
      * not exists in {@link Locale#ENGLISH}, too, the key will be returned.
      *
      * @param key
diff --git a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/CosemDecimal.java b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/CosemDecimal.java
index 11d1ceb9c905e..9366609de33e9 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/CosemDecimal.java
+++ b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/CosemDecimal.java
@@ -18,7 +18,7 @@
 import org.openhab.core.library.types.DecimalType;
 
 /**
- * CosemInteger represents an decimal value
+ * CosemInteger represents a decimal value
  *
  * @author M. Volaart - Initial contribution
  * @author Hilbrand Bouwkamp - Combined Integer and Double because {@link DecimalType} handles both
@@ -44,7 +44,7 @@ public CosemDecimal(String ohChannelId) {
     }
 
     /**
-     * Parses a String value (that represents an decimal) to a {@link DecimalType} object.
+     * Parses a String value (that represents a decimal) to a {@link DecimalType} object.
      *
      * @param cosemValue the value to parse
      * @return {@link DecimalType} representing the value of the cosem value
diff --git a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/OBISIdentifier.java b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/OBISIdentifier.java
index 8dc57e9183570..4ac4dfc07ee33 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/OBISIdentifier.java
+++ b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/OBISIdentifier.java
@@ -235,7 +235,7 @@ public int hashCode() {
     }
 
     /**
-     * Returns an reduced OBIS Identifier.
+     * Returns a reduced OBIS Identifier.
      *
      * @return reduced OBIS Identifier
      */
@@ -244,7 +244,7 @@ public OBISIdentifier getReducedOBISIdentifier() {
     }
 
     /**
-     * Returns an reduced OBIS Identifier with group E set to null (.i.e. not applicable)
+     * Returns a reduced OBIS Identifier with group E set to null (.i.e. not applicable)
      *
      * @return reduced OBIS Identifier
      */
diff --git a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/discovery/DSMRBridgeDiscoveryService.java b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/discovery/DSMRBridgeDiscoveryService.java
index 5cd6345fb04e1..1406014f1ad76 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/discovery/DSMRBridgeDiscoveryService.java
+++ b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/discovery/DSMRBridgeDiscoveryService.java
@@ -62,7 +62,7 @@
  * If a telegram is received with at least 1 Cosem Object a bridge is assumed available and a Thing is added (regardless
  * if there were problems receiving the telegram) and the discovery is stopped.
  *
- * If there are communication problems the service will give an warning and give up
+ * If there are communication problems the service will give a warning and give up
  *
  * @author M. Volaart - Initial contribution
  * @author Hilbrand Bouwkamp - Refactored code to detect meters during actual discovery phase.
diff --git a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/handler/StatusHandler.java b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/handler/StatusHandler.java
index c68da39615aa3..211cf6e1e3172 100644
--- a/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/handler/StatusHandler.java
+++ b/bundles/org.openhab.binding.easee/src/main/java/org/openhab/binding/easee/internal/handler/StatusHandler.java
@@ -17,7 +17,7 @@
 import org.openhab.core.thing.ThingStatusDetail;
 
 /**
- * functional interface to provide an function to update status of a thing or bridge.
+ * functional interface to provide a function to update status of a thing or bridge.
  *
  * @author Alexander Friese - initial contribution
  */
diff --git a/bundles/org.openhab.binding.ecobee/README.md b/bundles/org.openhab.binding.ecobee/README.md
index de7d461625ba2..871fbb86dd38c 100644
--- a/bundles/org.openhab.binding.ecobee/README.md
+++ b/bundles/org.openhab.binding.ecobee/README.md
@@ -1176,7 +1176,7 @@ Switch SetTemperatureHold "Set Temperature Hold [%s]"
 Number:Temperature UserCool "User Selected Heat [%.1f %unit%]"
 Number:Temperature UserHeat "User Selected Cool [%.1f %unit%]"
 String UserClimateRef "User Climate Ref [%s]"
-String SendMessage "Send an Message [%s]"
+String SendMessage "Send a Message [%s]"
 String AcknowledgeAlert "Acknowledge An Alert [%s]"
 Switch GetAlerts "Get All Alerts [%s]"
 Switch GetEvents "Get All Events [%s]"
diff --git a/bundles/org.openhab.binding.enigma2/README.md b/bundles/org.openhab.binding.enigma2/README.md
index 154d857588952..2992c67e739b3 100644
--- a/bundles/org.openhab.binding.enigma2/README.md
+++ b/bundles/org.openhab.binding.enigma2/README.md
@@ -324,7 +324,7 @@ actions.sendQuestion("Say hello?")
 
 ### sendQuestion(text, timeout)
 
-Sends an question message to the device with will be shown on the TV screen.
+Sends a question message to the device with will be shown on the TV screen.
 The answer is provided to the "answer"-channel.
 
 Parameters:
diff --git a/bundles/org.openhab.binding.enphase/src/main/java/org/openhab/binding/enphase/internal/handler/EnvoyBridgeHandler.java b/bundles/org.openhab.binding.enphase/src/main/java/org/openhab/binding/enphase/internal/handler/EnvoyBridgeHandler.java
index cecc5d2577bea..17cfae6030744 100644
--- a/bundles/org.openhab.binding.enphase/src/main/java/org/openhab/binding/enphase/internal/handler/EnvoyBridgeHandler.java
+++ b/bundles/org.openhab.binding.enphase/src/main/java/org/openhab/binding/enphase/internal/handler/EnvoyBridgeHandler.java
@@ -398,7 +398,7 @@ public void dispose() {
     }
 
     /**
-     * @return Returns true if the bridge is online and not has an configuration pending.
+     * @return Returns true if the bridge is online and not has a configuration pending.
      */
     public boolean isOnline() {
         return getThing().getStatus() == ThingStatus.ONLINE;
diff --git a/bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/handler/FroniusSymoInverterHandler.java b/bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/handler/FroniusSymoInverterHandler.java
index 1b8b328aba48b..71c6fd6389178 100644
--- a/bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/handler/FroniusSymoInverterHandler.java
+++ b/bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/handler/FroniusSymoInverterHandler.java
@@ -163,7 +163,7 @@ protected State getValue(String channelId) {
      * get flow data for a specific inverter.
      *
      * @param number The inverter object of the given index
-     * @return an PowerFlowRealtimeInverter object.
+     * @return a PowerFlowRealtimeInverter object.
      */
     private PowerFlowRealtimeInverter getInverter(final String number) {
         return powerFlowResponse.getBody().getData().getInverters().get(number);
diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaDeviceConfig.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaDeviceConfig.java
index 281e9f0860ab2..399b487a5769a 100644
--- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaDeviceConfig.java
+++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaDeviceConfig.java
@@ -16,7 +16,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
- * The {@link GardenaDeviceConfig} class represents the configuration for a device connected to an Gardena account.
+ * The {@link GardenaDeviceConfig} class represents the configuration for a device connected to a Gardena account.
  *
  * @author Gerhard Riegler - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/rest/exceptions/GroupePSACommunicationException.java b/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/rest/exceptions/GroupePSACommunicationException.java
index 8ea05e487a569..6c551ff538ccb 100644
--- a/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/rest/exceptions/GroupePSACommunicationException.java
+++ b/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/rest/exceptions/GroupePSACommunicationException.java
@@ -18,7 +18,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
- * An exception that occurred while communicating with an groupepsa or an groupepsa bridge
+ * An exception that occurred while communicating with a groupepsa or a groupepsa bridge
  *
  * @author Arjan Mels - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/resources/HeosStringPropertyChangeListener.java b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/resources/HeosStringPropertyChangeListener.java
index 86393e62087a9..a5e54b8ee530e 100644
--- a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/resources/HeosStringPropertyChangeListener.java
+++ b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/resources/HeosStringPropertyChangeListener.java
@@ -21,7 +21,7 @@
 
 /**
  * The {@Link HeosStringPropertyChangeListener} provides the possibility
- * to add a listener to an String and get informed about the new value.
+ * to add a listener to a String and get informed about the new value.
  *
  * @author Johannes Einig - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/resources/Telnet.java b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/resources/Telnet.java
index a19f852d0e9d9..3b157ed720e9c 100644
--- a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/resources/Telnet.java
+++ b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/resources/Telnet.java
@@ -37,7 +37,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link Telnet} is an Telnet Client which handles the connection
+ * The {@link Telnet} is a Telnet Client which handles the connection
  * to a network via the Telnet interface
  *
  * @author Johannes Einig - Initial contribution
diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/SimplePortPool.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/SimplePortPool.java
index fc501403b5aaf..466bb19033eef 100644
--- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/SimplePortPool.java
+++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/SimplePortPool.java
@@ -27,7 +27,7 @@ public class SimplePortPool {
     private List<PortInfo> availablePorts = new ArrayList<>();
 
     /**
-     * Adds the specified port to the pool an mark it as in use.
+     * Adds the specified port to the pool and mark it as in use.
      */
     public void setInUse(int port) {
         PortInfo portInfo = new PortInfo();
diff --git a/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/protocol/v1/Correction.java b/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/protocol/v1/Correction.java
index 1c0f024094480..32c9159a8fd54 100644
--- a/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/protocol/v1/Correction.java
+++ b/bundles/org.openhab.binding.hyperion/src/main/java/org/openhab/binding/hyperion/internal/protocol/v1/Correction.java
@@ -17,7 +17,7 @@
 import com.google.gson.annotations.SerializedName;
 
 /**
- * The {@link Correction} is a POJO for an color correction on the Hyperion server.
+ * The {@link Correction} is a POJO for a color correction on the Hyperion server.
  *
  * @author Daniel Walters - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java b/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java
index d2ae0dc51b5bd..ad0f9c2791b5a 100644
--- a/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java
+++ b/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java
@@ -416,7 +416,7 @@ private void pollController() {
     }
 
     /**
-     * Update an channels state only if the value of the channel has changed since our last poll.
+     * Update a channel state only if the value of the channel has changed since our last poll.
      *
      * @param name
      * @param value
diff --git a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendar.java b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendar.java
index 02d64bbdf5e0b..4deff64fd95f3 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendar.java
+++ b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendar.java
@@ -375,7 +375,7 @@ private DateIterator getRecurredEventDateIterator(VEvent vEvent) {
     }
 
     /**
-     * Checks whether an counter event blocks an event with given uid and start.
+     * Checks whether a counter event blocks an event with given uid and start.
      *
      * @param startInstant The start of the event.
      * @param eventUid The uid of the event.
diff --git a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTagType.java b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTagType.java
index d4a35318d9d08..dd598d5b9859b 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTagType.java
+++ b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTagType.java
@@ -16,7 +16,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
- * An type enumerator to indicate whether a Command Tag is of type BEGIN or END; as in the following examples:
+ * A type enumerator to indicate whether a Command Tag is of type BEGIN or END; as in the following examples:
  *
  * BEGIN:<item_name>:<new_state>
  * END:<item_name>:<new_state>
diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/MsgFactory.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/MsgFactory.java
index 9029fd65859c6..aaa3be7c5119c 100644
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/MsgFactory.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/message/MsgFactory.java
@@ -22,7 +22,7 @@
 
 /**
  * This class takes data coming from the serial port and turns it
- * into an message. For that, it has to figure out the length of the
+ * into a message. For that, it has to figure out the length of the
  * message from the header, and read enough bytes until it hits the
  * message boundary. The code is tricky, partly because the Insteon protocol is.
  * Most of the time the command code (second byte) is enough to determine the length
diff --git a/bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java b/bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java
index 54867b0d879b9..08406fe9cbe56 100644
--- a/bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java
+++ b/bundles/org.openhab.binding.keba/src/main/java/org/openhab/binding/keba/internal/handler/KeContactHandler.java
@@ -182,7 +182,7 @@ private void pollingRunnable() {
             if (!isKebaReachable()) {
                 logger.debug("isKebaReachable() timed out after '{}' milliseconds", System.currentTimeMillis() - stamp);
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
-                        "An timeout occurred while polling the charging station");
+                        "A timeout occurred while polling the charging station");
             } else {
                 ByteBuffer response = cache.get(CACHE_REPORT_1);
                 if (response == null) {
diff --git a/bundles/org.openhab.binding.kodi/README.md b/bundles/org.openhab.binding.kodi/README.md
index 220347702c239..60ce5b4e84ae6 100644
--- a/bundles/org.openhab.binding.kodi/README.md
+++ b/bundles/org.openhab.binding.kodi/README.md
@@ -1,6 +1,6 @@
 # Kodi Binding
 
-[Kodi](https://kodi.tv) (formerly known as XBMC) is an free and open source (GPL) software media center for playing videos, music, pictures, games, and more.
+[Kodi](https://kodi.tv) (formerly known as XBMC) is a free and open source (GPL) software media center for playing videos, music, pictures, games, and more.
 Kodi runs on Linux, OS X, BSD, Windows, iOS, and Android.
 It allows users to play and view most videos, music, podcasts, and other digital media files from local and network storage media and the internet.
 
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/secondgeneration/SecondGenerationDxsEntriesContainerDTO.java b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/secondgeneration/SecondGenerationDxsEntriesContainerDTO.java
index 702e3d154636a..879e5ef3bbdda 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/secondgeneration/SecondGenerationDxsEntriesContainerDTO.java
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/secondgeneration/SecondGenerationDxsEntriesContainerDTO.java
@@ -15,7 +15,7 @@
 import java.util.List;
 
 /**
- * The {@link SecondGenerationDxsEntriesContainer} class defines an Container, which is
+ * The {@link SecondGenerationDxsEntriesContainer} class defines a Container, which is
  * used in the second generation part of the binding.
  *
  * @author Örjan Backsell - Initial contribution Piko1020, Piko New Generation
diff --git a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/LcnModuleHandler.java b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/LcnModuleHandler.java
index 25a53beea1ab0..e9a95dd88477d 100644
--- a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/LcnModuleHandler.java
+++ b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/LcnModuleHandler.java
@@ -365,7 +365,7 @@ public void updateFirmwareVersionProperty(String firmwareVersion) {
     }
 
     /**
-     * Invoked when an trigger for this LCN module should be fired to openHAB.
+     * Invoked when a trigger for this LCN module should be fired to openHAB.
      *
      * @param channelGroup the Channel to update
      * @param channelId the ID within the Channel to update
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/core/ChannelInfo.java b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/core/ChannelInfo.java
index eb1f7a8eb6dce..d3868ad7e7eb0 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/core/ChannelInfo.java
+++ b/bundles/org.openhab.binding.lgwebos/src/main/java/org/openhab/binding/lgwebos/internal/handler/core/ChannelInfo.java
@@ -35,7 +35,7 @@
 
 /**
  * {@link ChannelInfo} is a value object to describe a channel on WebOSTV.
- * The id value is mandatory when starting an channel. The channelName is a human readable friendly name, which is not
+ * The id value is mandatory when starting a channel. The channelName is a human readable friendly name, which is not
  * further interpreted by the TV.
  *
  * @author Hyun Kook Khang - Connect SDK initial contribution
diff --git a/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputHandler.java b/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputHandler.java
index 7f8e40c893fb4..ede2656b89a8b 100644
--- a/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputHandler.java
+++ b/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputHandler.java
@@ -149,7 +149,7 @@ void handleEventsInThread() throws IOException {
             @Nullable
             EvdevDevice currentDevice = device;
             if (currentDevice == null) {
-                throw new IOException("trying to handle events without an device");
+                throw new IOException("trying to handle events without a device");
             }
             SelectionKey evdevReady = currentDevice.register(selector);
 
diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlLeftRightAnalog.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlLeftRightAnalog.java
index 6065f54c92f11..b959130b5eb8d 100644
--- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlLeftRightAnalog.java
+++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlLeftRightAnalog.java
@@ -15,7 +15,7 @@
 import org.openhab.binding.loxone.internal.types.LxUuid;
 
 /**
- * An LeftRightAnalog type of control on Loxone Miniserver.
+ * A LeftRightAnalog type of control on Loxone Miniserver.
  * <p>
  * According to Loxone API documentation, LeftRightAnalog control is a virtual input that is analog and has an input
  * type
diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlLeftRightDigital.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlLeftRightDigital.java
index a7925eaa77f2c..b5b442a10a188 100644
--- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlLeftRightDigital.java
+++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/controls/LxControlLeftRightDigital.java
@@ -15,7 +15,7 @@
 import org.openhab.binding.loxone.internal.types.LxUuid;
 
 /**
- * An LeftRightDigital type of control on Loxone Miniserver.
+ * A LeftRightDigital type of control on Loxone Miniserver.
  * <p>
  * According to Loxone API documentation, LeftRightDigital control is a virtual input that is digital and has an input
  * type left-right buttons. It has no states and can only accept commands. Only left/right (which are actually equal to
diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/SocketSession.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/SocketSession.java
index b3c1e0ab5f26f..b7b61fc4e77bb 100644
--- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/SocketSession.java
+++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/SocketSession.java
@@ -31,7 +31,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Represents a restartable socket connection to the underlying telnet session with an GRX-PRG/GRX-CI-PRG. Commands can
+ * Represents a restartable socket connection to the underlying telnet session with a GRX-PRG/GRX-CI-PRG. Commands can
  * be sent via {@link #sendCommand(String)} and responses will be received on the {@link SocketSessionCallback}
  *
  * @author Tim Roberts - Initial contribution
diff --git a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/discovery/MagentaTVDiscoveryParticipant.java b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/discovery/MagentaTVDiscoveryParticipant.java
index a7379379d5083..0e999f5a90f94 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/discovery/MagentaTVDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/discovery/MagentaTVDiscoveryParticipant.java
@@ -63,7 +63,7 @@ public Set<ThingTypeUID> getSupportedThingTypeUIDs() {
 
             ThingUID uid = getThingUID(device);
             if (uid != null) {
-                logger.debug("Discovered an MagentaTV Media Receiver {}, UDN: {}, Model {}.{}",
+                logger.debug("Discovered a MagentaTV Media Receiver {}, UDN: {}, Model {}.{}",
                         device.getDetails().getFriendlyName(), device.getIdentity().getUdn().getIdentifierString(),
                         modelName, device.getDetails().getModelDetails().getModelNumber());
 
diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/Utils.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/Utils.java
index 8f8a69fe2e29c..c42409964dd5b 100644
--- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/Utils.java
+++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/Utils.java
@@ -69,7 +69,7 @@ public static final String toHex(boolean[] bits) {
     }
 
     /**
-     * Converts an Java signed byte into its general (unsigned) value as being
+     * Converts a Java signed byte into its general (unsigned) value as being
      * used in other programming languages and platforms.
      *
      * @param b
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInfromationBlockParser.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInfromationBlockParser.java
index 65bb1ebcf5aff..ad83510e8a114 100644
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInfromationBlockParser.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemInfromationBlockParser.java
@@ -17,7 +17,7 @@
 import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 
 /**
- * Parses inverter modbus data into an SystemB Information lock
+ * Parses inverter modbus data into a SystemB Information lock
  *
  * @author Paul Frank - Initial contribution
  *
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemParameterBlockParser.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemParameterBlockParser.java
index 6fbb15825dab5..4ea4f7898c231 100644
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemParameterBlockParser.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemParameterBlockParser.java
@@ -17,7 +17,7 @@
 import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 
 /**
- * Parses inverter modbus data into an System Parameter Block
+ * Parses inverter modbus data into a System Parameter Block
  *
  * @author Paul Frank - Initial contribution
  *
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemStateBlockParser.java b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemStateBlockParser.java
index 6571fdbc6ed46..53ea57a31f849 100644
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemStateBlockParser.java
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/src/main/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/SystemStateBlockParser.java
@@ -17,7 +17,7 @@
 import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 
 /**
- * Parses inverter modbus data into an System State Block
+ * Parses inverter modbus data into a System State Block
  *
  * @author Paul Frank - Initial contribution
  *
diff --git a/bundles/org.openhab.binding.modbus/README.md b/bundles/org.openhab.binding.modbus/README.md
index cd967d5f51c8e..7cbc606efb3e5 100644
--- a/bundles/org.openhab.binding.modbus/README.md
+++ b/bundles/org.openhab.binding.modbus/README.md
@@ -9,7 +9,7 @@ The binding can act as
 * Modbus TCP Client (that is, as modbus master), querying data from Modbus TCP servers (that is, modbus slaves)
 * Modbus serial master, querying data from modbus serial slaves
 
-The Modbus binding polls the slave data with an configurable poll period.
+The Modbus binding polls the slave data with a configurable poll period.
 openHAB commands are translated to write requests.
 
 The binding has the following extensions:
diff --git a/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/i18n/modbus.properties b/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/i18n/modbus.properties
index 038370585910e..bee8c2ea995ad 100644
--- a/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/i18n/modbus.properties
+++ b/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/i18n/modbus.properties
@@ -44,7 +44,7 @@ thing-type.config.modbus.data.writeMaxTries.description = Number of tries when w
 thing-type.config.modbus.data.writeMultipleEvenWithSingleRegisterOrCoil.label = Write Multiple Even with Single Register or Coil
 thing-type.config.modbus.data.writeMultipleEvenWithSingleRegisterOrCoil.description = Whether single register / coil of data is written using FC16 ("Write Multiple Holding Registers") / FC15 ("Write Multiple Coils"), respectively. <br /> <br />If false, FC6/FC5 are used with single register and single coil, respectively.
 thing-type.config.modbus.data.writeStart.label = Write Address
-thing-type.config.modbus.data.writeStart.description = Start address of the first holding register or coil in the write. Use empty for read-only things. <br />Use zero based address, e.g. in place of 400001 (first holding register), use the address 0. This address is passed to data frame as is. <br />One can write individual bits of an register using X.Y format where X is the register and Y is the bit (0 refers to least significant bit).
+thing-type.config.modbus.data.writeStart.description = Start address of the first holding register or coil in the write. Use empty for read-only things. <br />Use zero based address, e.g. in place of 400001 (first holding register), use the address 0. This address is passed to data frame as is. <br />One can write individual bits of a register using X.Y format where X is the register and Y is the bit (0 refers to least significant bit).
 thing-type.config.modbus.data.writeTransform.label = Write Transform
 thing-type.config.modbus.data.writeTransform.description = Transformation to apply to received commands. <br /><br />Use "default" to communicate that no transformation is done and value should be passed as is. <br />Use SERVICENAME(ARG) or SERVICENAME:ARG to use transformation service. <br />Any other value than the above types will be interpreted as static text, in which case the actual content of the command <br />You can chain many transformations with ∩, for example SERVICE1:ARG1∩SERVICE2:ARG2 value is ignored.
 thing-type.config.modbus.data.writeType.label = Write Type
diff --git a/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/thing/thing-data.xml b/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/thing/thing-data.xml
index 0de4849a6b378..f063aa846b30d 100644
--- a/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/thing/thing-data.xml
+++ b/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/thing/thing-data.xml
@@ -82,7 +82,7 @@
 				<label>Write Address</label>
 				<description><![CDATA[Start address of the first holding register or coil in the write. Use empty for read-only things.
 				<br />Use zero based address, e.g. in place of 400001 (first holding register), use the address 0. This address is passed to data frame as is.
-				<br />One can write individual bits of an register using X.Y format where X is the register and Y is the bit (0 refers to least significant bit).
+				<br />One can write individual bits of a register using X.Y format where X is the register and Y is the bit (0 refers to least significant bit).
 				]]></description>
 			</parameter>
 			<parameter name="writeType" type="text">
diff --git a/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/values/RollershutterValue.java b/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/values/RollershutterValue.java
index b8f37e05ce88b..501dbb557f705 100644
--- a/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/values/RollershutterValue.java
+++ b/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/values/RollershutterValue.java
@@ -24,7 +24,7 @@
 import org.openhab.core.types.Command;
 
 /**
- * Implements an rollershutter value.
+ * Implements a rollershutter value.
  * <p>
  * The stop, up and down strings have multiple purposes.
  * For one if those strings are received via MQTT they are recognised as corresponding commands
diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ComponentChannel.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ComponentChannel.java
index 5e603b8432178..74313bff3cc47 100644
--- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ComponentChannel.java
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ComponentChannel.java
@@ -96,7 +96,7 @@ public ChannelState getState() {
 
     public CompletableFuture<@Nullable Void> start(MqttBrokerConnection connection, ScheduledExecutorService scheduler,
             int timeout) {
-        // Make sure we set the callback again which might have been nulled during an stop
+        // Make sure we set the callback again which might have been nulled during a stop
         channelState.setChannelStateUpdateListener(this.channelStateUpdateListener);
 
         return channelState.start(connection, scheduler, timeout);
diff --git a/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/internal/homie300/Property.java b/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/internal/homie300/Property.java
index 016ecfc227d09..6d6775f59f415 100644
--- a/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/internal/homie300/Property.java
+++ b/bundles/org.openhab.binding.mqtt.homie/src/main/java/org/openhab/binding/mqtt/homie/internal/homie300/Property.java
@@ -291,7 +291,7 @@ public void createChannelFromAttribute() {
             f.completeExceptionally(new IllegalStateException("Attributes not yet received!"));
             return f;
         }
-        // Make sure we set the callback again which might have been nulled during an stop
+        // Make sure we set the callback again which might have been nulled during a stop
         channelState.setChannelStateUpdateListener(this.callback);
         return channelState.start(connection, scheduler, timeout);
     }
diff --git a/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/models/NeeoAction.java b/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/models/NeeoAction.java
index 7ee1019040bf2..94a0c8d5ff737 100644
--- a/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/models/NeeoAction.java
+++ b/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/models/NeeoAction.java
@@ -18,7 +18,7 @@
 import com.google.gson.annotations.SerializedName;
 
 /**
- * The model representing an forward actions result (serialize/deserialize json use only).
+ * The model representing a forward actions result (serialize/deserialize json use only).
  *
  * @author Tim Roberts - Initial contribution
  *
diff --git a/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/models/NeeoForwardActions.java b/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/models/NeeoForwardActions.java
index 987b81e597953..ddfd15d86c75d 100644
--- a/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/models/NeeoForwardActions.java
+++ b/bundles/org.openhab.binding.neeo/src/main/java/org/openhab/binding/neeo/internal/models/NeeoForwardActions.java
@@ -16,7 +16,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
- * The model representing an forward actions request (serialize/deserialize json use only).
+ * The model representing a forward actions request (serialize/deserialize json use only).
  *
  * @author Tim Roberts - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/wwn/dto/WWNUpdateRequest.java b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/wwn/dto/WWNUpdateRequest.java
index 915c0c613dc2e..03b1e3fd02899 100644
--- a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/wwn/dto/WWNUpdateRequest.java
+++ b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/wwn/dto/WWNUpdateRequest.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 
 /**
- * Contains the data needed to do an WWN update request back to Nest.
+ * Contains the data needed to do a WWN update request back to Nest.
  *
  * @author David Bennett - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol.properties b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol.properties
index 7c1f12cd35349..8ae3b792126c1 100644
--- a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol.properties
+++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol.properties
@@ -119,7 +119,7 @@ offline.configuration-error.actionRemoved = Action has been removed from control
 offline.configuration-error.energyMeterId = Configured energy meter ID does not match an energy meter in controller
 offline.configuration-error.energyMeterRemoved = Energy meter has been removed from controller
 
-offline.configuration-error.thermostatId = Configured thermostat ID does not match an thermostat in controller
+offline.configuration-error.thermostatId = Configured thermostat ID does not match a thermostat in controller
 offline.configuration-error.thermostatRemoved = Thermostat has been removed from controller
 
 offline.configuration-error.invalid-bridge-handler = Invalid bridge handler
diff --git a/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/WeekProfileRegister.java b/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/WeekProfileRegister.java
index b8cc4df700ab3..1b1fc693f4917 100644
--- a/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/WeekProfileRegister.java
+++ b/bundles/org.openhab.binding.nobohub/src/main/java/org/openhab/binding/nobohub/internal/model/WeekProfileRegister.java
@@ -32,7 +32,7 @@ public final class WeekProfileRegister {
     private @NotNull Map<Integer, WeekProfile> register = new HashMap<Integer, WeekProfile>();
 
     /**
-     * Stores a new week profile in the register. If an week profile exists with the same id, that value is overwritten.
+     * Stores a new week profile in the register. If a week profile exists with the same id, that value is overwritten.
      *
      * @param profile The week profile to store.
      */
diff --git a/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/i18n/omnilink.properties b/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/i18n/omnilink.properties
index d96696757d46c..72c9c55e2564c 100644
--- a/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/i18n/omnilink.properties
+++ b/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/i18n/omnilink.properties
@@ -40,7 +40,7 @@ thing-type.omnilink.humidity_sensor.description = A humidity sensor configured i
 thing-type.omnilink.lock.label = Lock
 thing-type.omnilink.lock.description = An access control reader lock configured in the controller.
 thing-type.omnilink.lumina_area.label = Lumina Area
-thing-type.omnilink.lumina_area.description = An Lumina area configured in the controller.
+thing-type.omnilink.lumina_area.description = A Lumina area configured in the controller.
 thing-type.omnilink.output.label = Voltage Output
 thing-type.omnilink.output.description = A voltage output configured in the controller.
 thing-type.omnilink.output.channel.switch.label = Voltage Output Switch
diff --git a/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/thing/area.xml b/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/thing/area.xml
index 021e2fd5b89c7..45ef59d0fd60e 100644
--- a/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/thing/area.xml
+++ b/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/thing/area.xml
@@ -46,7 +46,7 @@
 			<bridge-type-ref id="controller"/>
 		</supported-bridge-type-refs>
 		<label>Lumina Area</label>
-		<description>An Lumina area configured in the controller.</description>
+		<description>A Lumina area configured in the controller.</description>
 		<channels>
 			<channel id="mode" typeId="lumina_area_mode"/>
 			<channel id="home" typeId="area_command"/>
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/BAE0910.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/BAE0910.java
index 7e4348083f233..847f82269eeb4 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/BAE0910.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/BAE0910.java
@@ -40,7 +40,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link BAE0910} class defines an BAE0910 device
+ * The {@link BAE0910} class defines a BAE0910 device
  *
  * @author Jan N. Klug - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS18x20.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS18x20.java
index f09e81cc06948..72888a6aa913a 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS18x20.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS18x20.java
@@ -32,7 +32,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link DS18x20} class defines an DS18x20 or DS1822 device
+ * The {@link DS18x20} class defines a DS18x20 or DS1822 device
  *
  * @author Jan N. Klug - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS1923.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS1923.java
index 30ca59ff1ed7a..83a5b49ad6a0d 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS1923.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS1923.java
@@ -32,7 +32,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link DS1923} class defines an DS1923 device
+ * The {@link DS1923} class defines a DS1923 device
  *
  * @author Jan N. Klug - Initial contribution
  * @author Michał Wójcik - Adapted to DS1923
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2401.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2401.java
index bcb1aa0ddffec..616ebbd80cd86 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2401.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2401.java
@@ -19,7 +19,7 @@
 import org.openhab.binding.onewire.internal.handler.OwserverBridgeHandler;
 
 /**
- * The {@link DS2401} class defines an DS2401 (iButton) device
+ * The {@link DS2401} class defines a DS2401 (iButton) device
  *
  * @author Jan N. Klug - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2405.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2405.java
index 040df27706726..3b60389ea4eb3 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2405.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2405.java
@@ -20,7 +20,7 @@
 import org.openhab.binding.onewire.internal.owserver.OwserverDeviceParameter;
 
 /**
- * The {@link DS2405} class defines an DS2405 device
+ * The {@link DS2405} class defines a DS2405 device
  *
  * @author Jan N. Klug - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2406_DS2413.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2406_DS2413.java
index 534489357869d..9037b85ea496f 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2406_DS2413.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2406_DS2413.java
@@ -20,7 +20,7 @@
 import org.openhab.binding.onewire.internal.owserver.OwserverDeviceParameter;
 
 /**
- * The {@link DS2406_DS2413} class defines an DS2406 or DS2413 device
+ * The {@link DS2406_DS2413} class defines a DS2406 or DS2413 device
  *
  * @author Jan N. Klug - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2408.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2408.java
index c36c66080be65..1396b0567daaa 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2408.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2408.java
@@ -20,7 +20,7 @@
 import org.openhab.binding.onewire.internal.owserver.OwserverDeviceParameter;
 
 /**
- * The {@link DS2408} class defines an DS2408 device
+ * The {@link DS2408} class defines a DS2408 device
  *
  * @author Jan N. Klug - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2423.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2423.java
index f37b40a2b24b0..e8bc7a21df223 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2423.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2423.java
@@ -27,7 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link DS2423} class defines an DS2423 device
+ * The {@link DS2423} class defines a DS2423 device
  *
  * @author Jan N. Klug - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2438.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2438.java
index e003e933957c8..95b9fd2e5047c 100644
--- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2438.java
+++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/device/DS2438.java
@@ -38,7 +38,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link DS2438} class defines an DS2438 device
+ * The {@link DS2438} class defines a DS2438 device
  *
  * @author Jan N. Klug - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV210.java b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV210.java
index 49eb8e79a106a..f10812083c448 100644
--- a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV210.java
+++ b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/api/OpenSprinklerHttpApiV210.java
@@ -164,7 +164,7 @@ protected void resultParser(String returnContent) throws GeneralApiException {
         switch (returnCode) {
             case -1:
                 throw new UnknownApiException(
-                        "The OpenSprinkler API returnd an result that was not parseable: " + returnContent);
+                        "The OpenSprinkler API returnd a result that was not parseable: " + returnContent);
             case 1:
                 return;
             case 2:
diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/util/Parse.java b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/util/Parse.java
index eebd9f3e575d9..9895d9ae80345 100644
--- a/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/util/Parse.java
+++ b/bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/util/Parse.java
@@ -112,7 +112,7 @@ public static List<Integer> jsonIntArray(String jsonData, String keyName) {
     }
 
     /**
-     * Parses an String array from a JSON string given its key name.
+     * Parses a String array from a JSON string given its key name.
      *
      * @param jsonData The JSON formatted string to parse from.
      * @param keyName The name of the object array to search through.
diff --git a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java
index e91dbd4b7b492..298957781aa4b 100644
--- a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java
+++ b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/PHCHelper.java
@@ -44,7 +44,7 @@ public static ThingUID getThingUIDreverse(ThingTypeUID thingTypeUID, byte module
     }
 
     /**
-     * Convert the byte b into an binary String
+     * Convert the byte b into a binary String
      *
      * @param b
      * @return
diff --git a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java
index bede8a6563c0f..d2e60b428699c 100644
--- a/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java
+++ b/bundles/org.openhab.binding.phc/src/main/java/org/openhab/binding/phc/internal/handler/PHCBridgeHandler.java
@@ -438,7 +438,7 @@ private void sendQueueObject(QueueObject qo) {
             amOutputState[qo.getModuleAddress() & 0x1F] = -1;
         } else if (PHCBindingConstants.CHANNELS_DIM.equals(qo.getModuleType())) {
             // state ist the same for every dim level except zero/off -> inizialize state
-            // with 0x0F after sending an command.
+            // with 0x0F after sending a command.
             dmOutputState[qo.getModuleAddress() & 0x1F] |= (0x0F << (qo.getChannel() * 4));
         }
 
diff --git a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc.properties b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc.properties
index c7c4edd8764e1..c6e76ede82e85 100644
--- a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc.properties
+++ b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc.properties
@@ -12,7 +12,7 @@ thing-type.phc.DIM.description = Thing for a dimmer module (DM).
 thing-type.phc.EM.label = PHC EM
 thing-type.phc.EM.description = Thing for an input/switch module (EM).
 thing-type.phc.JRM.label = PHC JRM
-thing-type.phc.JRM.description = Thing for an shutter module (JRM).
+thing-type.phc.JRM.description = Thing for a shutter module (JRM).
 thing-type.phc.bridge.label = PHC Bridge
 thing-type.phc.bridge.description = The serial bridge to the PHC modules. Max 32 modules per model group(thing type) per Bridge, equates one STM.
 
@@ -63,6 +63,6 @@ channel-type.phc.dim-channel.description = Channel for a DIM module.
 channel-type.phc.em-channel.label = PHC EM Channel
 channel-type.phc.em-channel.description = Channel from an EM module.
 channel-type.phc.jrm-channel.label = PHC JRM Channel
-channel-type.phc.jrm-channel.description = Channel to an JRM module.
+channel-type.phc.jrm-channel.description = Channel to a JRM module.
 channel-type.phc.jrmTime-channel.label = JRM-time Channel
-channel-type.phc.jrmTime-channel.description = The Time in seconds for an JRM channel.
+channel-type.phc.jrmTime-channel.description = The Time in seconds for a JRM channel.
diff --git a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/thing/channel-types.xml b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/thing/channel-types.xml
index 6c6cf128b6c74..990b5e66e7b4e 100644
--- a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/thing/channel-types.xml
+++ b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/thing/channel-types.xml
@@ -90,13 +90,13 @@
 	<channel-type id="jrm-channel">
 		<item-type>Rollershutter</item-type>
 		<label>PHC JRM Channel</label>
-		<description>Channel to an JRM module.</description>
+		<description>Channel to a JRM module.</description>
 	</channel-type>
 
 	<channel-type id="jrmTime-channel" advanced="true">
 		<item-type>Number</item-type>
 		<label>JRM-time Channel</label>
-		<description>The Time in seconds for an JRM channel.</description>
+		<description>The Time in seconds for a JRM channel.</description>
 		<state min="1" max="65535"/>
 	</channel-type>
 
diff --git a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/thing/thing-types.xml
index c0de447653961..020161b41298a 100644
--- a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/thing/thing-types.xml
@@ -69,7 +69,7 @@
 		</supported-bridge-type-refs>
 
 		<label>PHC JRM</label>
-		<description>Thing for an shutter module (JRM).</description>
+		<description>Thing for a shutter module (JRM).</description>
 
 		<channel-groups>
 			<channel-group id="jrm" typeId="jrmChannels"/>
diff --git a/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/items/AbstractDeviceConfig.java b/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/items/AbstractDeviceConfig.java
index 493293147ae28..7ed72b86075e8 100644
--- a/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/items/AbstractDeviceConfig.java
+++ b/bundles/org.openhab.binding.pulseaudio/src/main/java/org/openhab/binding/pulseaudio/internal/items/AbstractDeviceConfig.java
@@ -15,7 +15,7 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
- * Abstract root class for all items in an pulseaudio server. Every item in a
+ * Abstract root class for all items in a pulseaudio server. Every item in a
  * pulseaudio server has a name and a unique id which can be inherited by this
  * class.
  *
diff --git a/bundles/org.openhab.binding.pushover/src/main/java/org/openhab/binding/pushover/internal/dto/Sound.java b/bundles/org.openhab.binding.pushover/src/main/java/org/openhab/binding/pushover/internal/dto/Sound.java
index e5815b6ec9a82..b92bcc26fb442 100644
--- a/bundles/org.openhab.binding.pushover/src/main/java/org/openhab/binding/pushover/internal/dto/Sound.java
+++ b/bundles/org.openhab.binding.pushover/src/main/java/org/openhab/binding/pushover/internal/dto/Sound.java
@@ -16,7 +16,7 @@
 import org.openhab.core.config.core.ParameterOption;
 
 /**
- * The {@link Sound} is the Java class used to map the JSON response to an Pushover API request..
+ * The {@link Sound} is the Java class used to map the JSON response to a Pushover API request..
  *
  * @author Christoph Weitkamp - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/dto/Icon.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/dto/Icon.java
index 4773543d34907..a40d3b94d7c4f 100644
--- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/dto/Icon.java
+++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/dto/Icon.java
@@ -16,7 +16,7 @@
 import org.openhab.core.config.core.ParameterOption;
 
 /**
- * The {@link Icons} is the Java class used to map the JSON response to an Pushsafer API request..
+ * The {@link Icons} is the Java class used to map the JSON response to a Pushsafer API request..
  *
  * @author Kevin Siml - Initial contribution, forked from Christoph Weitkamp
  */
diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/dto/Sound.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/dto/Sound.java
index d6f7342d93b2c..31d76c2fd11d5 100644
--- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/dto/Sound.java
+++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/dto/Sound.java
@@ -16,7 +16,7 @@
 import org.openhab.core.config.core.ParameterOption;
 
 /**
- * The {@link Sound} is the Java class used to map the JSON response to an Pushsafer API request.
+ * The {@link Sound} is the Java class used to map the JSON response to a Pushsafer API request.
  *
  * @author Kevin Siml - Initial contribution, forked from Christoph Weitkamp
  */
diff --git a/bundles/org.openhab.binding.regoheatpump/src/main/java/org/openhab/binding/regoheatpump/internal/rego6xx/Rego6xxProtocolException.java b/bundles/org.openhab.binding.regoheatpump/src/main/java/org/openhab/binding/regoheatpump/internal/rego6xx/Rego6xxProtocolException.java
index 5204316da865d..3c266e9fad634 100644
--- a/bundles/org.openhab.binding.regoheatpump/src/main/java/org/openhab/binding/regoheatpump/internal/rego6xx/Rego6xxProtocolException.java
+++ b/bundles/org.openhab.binding.regoheatpump/src/main/java/org/openhab/binding/regoheatpump/internal/rego6xx/Rego6xxProtocolException.java
@@ -15,7 +15,7 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
- * The {@link Rego6xxProtocolException} is responsible for holding information about an Rego6xx protocol error.
+ * The {@link Rego6xxProtocolException} is responsible for holding information about a Rego6xx protocol error.
  *
  * @author Boris Krivonog - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.rfxcom/README.md b/bundles/org.openhab.binding.rfxcom/README.md
index 8cc9863804646..92974b32abe9c 100644
--- a/bundles/org.openhab.binding.rfxcom/README.md
+++ b/bundles/org.openhab.binding.rfxcom/README.md
@@ -978,7 +978,7 @@ using them to configure a raw thing item.
         information.
 
 *   closedPulses - Closed Pulses
-    *   Pulses to send for an CLOSED command. Space delimited pulse lengths
+    *   Pulses to send for a CLOSED command. Space delimited pulse lengths
         in usec. Must be an even number of pulse lengths, with a maximum
         of 142 total pulses. Max pulse length is 65535. Pulses of value 0
         will be transmitted as 10000. See the RFXtfx user guide for more
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
index 83ce9eba54119..718e0c03c3630 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
@@ -223,7 +223,7 @@ thing-type.config.rfxcom.rain.subType.option.RAIN5 = WS2300
 thing-type.config.rfxcom.rain.subType.option.RAIN6 = La Crosse TX5
 thing-type.config.rfxcom.rain.subType.option.RAIN9 = TFA 30.3233.1
 thing-type.config.rfxcom.raw.closedPulses.label = Closed Pulses
-thing-type.config.rfxcom.raw.closedPulses.description = Pulses to send for an CLOSED command. Space delimited pulse lengths in usec. Must be an even number of pulse lengths, with a maximum of 142 total pulses. Max pulse length is 65535. Pulses of value 0 will be transmitted as 10000. See the RFXtfx user guide for more information.
+thing-type.config.rfxcom.raw.closedPulses.description = Pulses to send for a CLOSED command. Space delimited pulse lengths in usec. Must be an even number of pulse lengths, with a maximum of 142 total pulses. Max pulse length is 65535. Pulses of value 0 will be transmitted as 10000. See the RFXtfx user guide for more information.
 thing-type.config.rfxcom.raw.deviceId.description = Received raw message cannot provide a device ID, so to receive raw messages the device id must be RAW. For transmit-only things, use any device id.
 thing-type.config.rfxcom.raw.offPulses.label = Off Pulses
 thing-type.config.rfxcom.raw.offPulses.description = Pulses to send for an OFF command. Space delimited pulse lengths in usec. Must be an even number of pulse lengths, with a maximum of 142 total pulses. Max pulse length is 65535. Pulses of value 0 will be transmitted as 10000. See the RFXtfx user guide for more information.
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/raw.xml b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/raw.xml
index 157005717be44..950da40e740e7 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/raw.xml
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/thing/raw.xml
@@ -63,7 +63,7 @@
 			</parameter>
 			<parameter name="closedPulses" type="text" required="false">
 				<label>Closed Pulses</label>
-				<description>Pulses to send for an CLOSED command. Space delimited pulse lengths in usec. Must be an even number of
+				<description>Pulses to send for a CLOSED command. Space delimited pulse lengths in usec. Must be an even number of
 					pulse lengths, with a maximum of 142 total pulses. Max pulse length is 65535. Pulses of value 0 will be transmitted
 					as 10000. See the RFXtfx user guide for more information.</description>
 			</parameter>
diff --git a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/discovery/RioSystemDeviceDiscoveryService.java b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/discovery/RioSystemDeviceDiscoveryService.java
index 9cf21c93ed51e..302d39dbdcc18 100644
--- a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/discovery/RioSystemDeviceDiscoveryService.java
+++ b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/discovery/RioSystemDeviceDiscoveryService.java
@@ -247,7 +247,7 @@ private void discoverZones(ThingUID controllerUID, int c) {
             final String r = listener.getResponse();
             final Matcher m = respPattern.matcher(r);
             if (m.matches() && m.groupCount() >= groupNum) {
-                logger.debug("Message '{}' returned an valid response: {}", message, r);
+                logger.debug("Message '{}' returned a valid response: {}", message, r);
                 return m.group(groupNum);
             }
             logger.debug("Message '{}' returned an invalid response: {}", message, r);
diff --git a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/StatefulHandlerCallback.java b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/StatefulHandlerCallback.java
index 205de39aa9bfe..1fdfad1fc389d 100644
--- a/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/StatefulHandlerCallback.java
+++ b/bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/StatefulHandlerCallback.java
@@ -24,7 +24,7 @@
 
 /**
  * Defines an implementation of {@link RioHandlerCallback} that will remember the last state
- * for an channelId and suppress the callback if the state hasn't changed
+ * for a channelId and suppress the callback if the state hasn't changed
  *
  * @author Tim Roberts - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.smartmeter/README.md b/bundles/org.openhab.binding.smartmeter/README.md
index 8f5e310e70bb0..46025054f0dec 100644
--- a/bundles/org.openhab.binding.smartmeter/README.md
+++ b/bundles/org.openhab.binding.smartmeter/README.md
@@ -14,7 +14,7 @@ Discovery is not available, as the binding only reads from serial ports.
 
 ## Thing Configuration
 
-The smartmeter thing requires the serial port where the meter device is connected and optionally an refresh interval.
+The smartmeter thing requires the serial port where the meter device is connected and optionally a refresh interval.
 
 | Parameter | Name | Description | Required | Default |
 |-----------|------|-------------|----------|---------|
diff --git a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterDevice.java b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterDevice.java
index 3c43ba40df9e8..d7b89ad33b361 100644
--- a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterDevice.java
+++ b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterDevice.java
@@ -151,7 +151,7 @@ public Collection<String> getObisCodes() {
     }
 
     /**
-     * Read values from this device an store them locally against their OBIS code.
+     * Read values from this device a store them locally against their OBIS code.
      *
      * If there is an error in reading, it will be retried {@value #NUMBER_OF_RETRIES} times. The retry will be delayed
      * by {@code period} seconds.
diff --git a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterChannelTypeProvider.java b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterChannelTypeProvider.java
index 3175a18852e44..b09eb89c9a483 100644
--- a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterChannelTypeProvider.java
+++ b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterChannelTypeProvider.java
@@ -64,7 +64,7 @@ public Collection<ChannelType> getChannelTypes(@Nullable Locale locale) {
 
     @Override
     public void errorOccurred(Throwable e) {
-        // Nothing to do if there is an reading error...
+        // Nothing to do if there is a reading error...
     }
 
     @Override
diff --git a/bundles/org.openhab.binding.smsmodem/src/3rdparty/java/org/smslib/pduUtils/gsm3040/PduGenerator.java b/bundles/org.openhab.binding.smsmodem/src/3rdparty/java/org/smslib/pduUtils/gsm3040/PduGenerator.java
index 77453acf2e8fe..2db3dad18a19d 100644
--- a/bundles/org.openhab.binding.smsmodem/src/3rdparty/java/org/smslib/pduUtils/gsm3040/PduGenerator.java
+++ b/bundles/org.openhab.binding.smsmodem/src/3rdparty/java/org/smslib/pduUtils/gsm3040/PduGenerator.java
@@ -130,7 +130,7 @@ protected void writeBCDAddress(String address, int addressType, int addressLengt
         // ADDRESS TYPE
         this.baos.write(addressType);
         // ADDRESS NUMBERS
-        // if address.length is not even, pad the string an with F at the end
+        // if address.length is not even, pad the string with an F at the end
         String myaddress = address;
         if (myaddress.length() % 2 == 1) {
             myaddress = myaddress + "F";
diff --git a/bundles/org.openhab.binding.spotify/src/main/java/org/openhab/binding/spotify/internal/api/SpotifyConnector.java b/bundles/org.openhab.binding.spotify/src/main/java/org/openhab/binding/spotify/internal/api/SpotifyConnector.java
index bb435609802bc..8ee0f3ea20d3a 100644
--- a/bundles/org.openhab.binding.spotify/src/main/java/org/openhab/binding/spotify/internal/api/SpotifyConnector.java
+++ b/bundles/org.openhab.binding.spotify/src/main/java/org/openhab/binding/spotify/internal/api/SpotifyConnector.java
@@ -166,7 +166,7 @@ public CompletableFuture<ContentResponse> call() {
         /**
          * Processes the response of the Spotify Web Api call and handles the HTTP status codes. The method returns true
          * if the response indicates a successful and false if the call should be retried. If there were other problems
-         * a Spotify exception is thrown indicating no retry should be done an the user should be informed.
+         * a Spotify exception is thrown indicating no retry should be done and the user should be informed.
          *
          * @param response the response given by the Spotify Web Api
          * @return true if the response indicated a successful call, false if the call should be retried
diff --git a/bundles/org.openhab.binding.tacmi/README.md b/bundles/org.openhab.binding.tacmi/README.md
index 89485195d1552..cfcbfd90b9ea1 100644
--- a/bundles/org.openhab.binding.tacmi/README.md
+++ b/bundles/org.openhab.binding.tacmi/README.md
@@ -86,7 +86,7 @@ The bridge could be used for multiple C.M.I. devices.
 * TA C.M.I. CoE Connection - Thing
 
 This thing reflects a connection to a node behind a specific C.M.I..
-This node could be every CAN-Capable device from TA which allows to define an CAN-Input.
+This node could be every CAN-Capable device from TA which allows to define a CAN-Input.
 
 ## Discovery
 
@@ -114,7 +114,7 @@ This thing doesn't need a bridge. Multiple of these things for different C.M.I.'
 
 The _TA C.M.I. CoE Connection_ has to be manually configured.
 
-This thing reflects a connection to a node behind a specific C.M.I.. This node could be every CAN-Capable device from TA which allows to define an CAN-Input.
+This thing reflects a connection to a node behind a specific C.M.I.. This node could be every CAN-Capable device from TA which allows to define a CAN-Input.
 
 | Parameter Label         | Parameter ID    | Description                                                                                                   | Accepted values        |
 |-------------------------|-----------------|---------------------------------------------------------------------------------------------------------------|------------------------|
diff --git a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/message/DigitalMessage.java b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/message/DigitalMessage.java
index 04f0782df6b8c..6e88795fda0fb 100644
--- a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/message/DigitalMessage.java
+++ b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/message/DigitalMessage.java
@@ -16,7 +16,7 @@
 
 /**
  * This class can be used to decode the digital values received in a messag and
- * also to create a new DigitalMessage used to send ON/OFF to an digital CAN
+ * also to create a new DigitalMessage used to send ON/OFF to a digital CAN
  * Input port
  *
  * @author Timo Wendt - Initial contribution
diff --git a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/core/TelldusCoreDeviceController.java b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/core/TelldusCoreDeviceController.java
index d0bd741a80fa6..65dd593675ac4 100644
--- a/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/core/TelldusCoreDeviceController.java
+++ b/bundles/org.openhab.binding.tellstick/src/main/java/org/openhab/binding/tellstick/internal/core/TelldusCoreDeviceController.java
@@ -241,7 +241,7 @@ private void checkLastAndWait(long resendInterval) {
     /**
      * This class is a worker which execute the commands sent to the TelldusCoreDeviceController.
      * This enables separation between Telldus Core and openHAB for preventing latency on the bus.
-     * The Tellstick have an send pace of 4 Hz which is far slower then the bus itself.
+     * The Tellstick have a send pace of 4 Hz which is far slower then the bus itself.
      *
      * @author Elias Gabrielsson
      *
diff --git a/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/Connection.java b/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/Connection.java
index 1421e34c73d16..2717e5d0e09a5 100644
--- a/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/Connection.java
+++ b/bundles/org.openhab.binding.tplinksmarthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/Connection.java
@@ -27,7 +27,7 @@
  * This class acts as and interface to the physical device.
  *
  * @author Christian Fischer - Initial contribution
- * @author Hilbrand Bouwkamp - Reorganized code an put connection in single class
+ * @author Hilbrand Bouwkamp - Reorganized code and put connection in single class
  */
 @NonNullByDefault
 public class Connection {
diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java
index 01ddb9674717f..bc72e5aa791d8 100644
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java
@@ -137,7 +137,7 @@ public VeluxRSBindingConfig(VeluxItemType bindingItemType, String channelValue)
     }
 
     /**
-     * Returns the next shutter level for an DOWN command w/ adjusting the actual position.
+     * Returns the next shutter level for a DOWN command w/ adjusting the actual position.
      *
      * @return <b>rollershutterLevel</b> of type Integer with next position after DOWN command.
      */
diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/bridge/slip/io/DataInputStreamWithTimeout.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/bridge/slip/io/DataInputStreamWithTimeout.java
index 0edfcb7ebbb14..157a92d0fd922 100644
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/bridge/slip/io/DataInputStreamWithTimeout.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/bridge/slip/io/DataInputStreamWithTimeout.java
@@ -32,7 +32,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * This is an wrapper around {@link java.io.InputStream} to support socket receive operations.
+ * This is a wrapper around {@link java.io.InputStream} to support socket receive operations.
  *
  * It implements a secondary polling thread to asynchronously read bytes from the socket input stream into a buffer. And
  * it parses the bytes into SLIP messages, which are placed on a message queue. Callers can access the SLIP messages in
diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxGwState.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxGwState.java
index eec31bdae6e3d..b751263a1c9aa 100644
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxGwState.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxGwState.java
@@ -112,7 +112,7 @@ public enum VeluxGatewaySubState {
         private int stateValue;
         private String stateDescription;
 
-        // Reverse-lookup map for getting a VeluxGatewayState from an TypeId
+        // Reverse-lookup map for getting a VeluxGatewayState from a TypeId
         private static final Map<Integer, VeluxGatewaySubState> LOOKUPTYPEID2ENUM = Stream
                 .of(VeluxGatewaySubState.values())
                 .collect(Collectors.toMap(VeluxGatewaySubState::getStateValue, Function.identity()));
diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxKLFAPI.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxKLFAPI.java
index aac38ec3d28c5..5960c635a2cea 100644
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxKLFAPI.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxKLFAPI.java
@@ -47,7 +47,7 @@ public class VeluxKLFAPI {
     // Constants
 
     /**
-     * System table index parameter - an be a number from 0 to 203.
+     * System table index parameter - a number from 0 to 203.
      *
      * See <a href=
      * "https://velcdn.azureedge.net/~/media/com/api/klf200/technical%20specification%20for%20klf%20200%20api.pdf#page=25">KLF200
@@ -318,7 +318,7 @@ public enum Command {
         private CommandNumber command;
         private String description;
 
-        // Reverse-lookup map for getting a Command from an TypeId
+        // Reverse-lookup map for getting a Command from a TypeId
         private static final Map<Short, Command> LOOKUPTYPEID2ENUM = Stream.of(Command.values())
                 .collect(Collectors.toMap(Command::getShort, Function.identity()));
 
diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxProduct.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxProduct.java
index d4dfa3bd4f07b..32f99d5f04f49 100644
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxProduct.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxProduct.java
@@ -88,7 +88,7 @@ private ProductState(int value) {
         }
 
         /**
-         * Create an ProductState from an integer seed value.
+         * Create a ProductState from an integer seed value.
          *
          * @param value the seed value.
          * @return the ProductState.
diff --git a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxProductType.java b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxProductType.java
index 7a047ecbff9da..2b87ba03359dc 100644
--- a/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxProductType.java
+++ b/bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxProductType.java
@@ -83,7 +83,7 @@ public static enum ActuatorType {
         private String description;
         private VeluxProductType typeClass;
 
-        // Reverse-lookup map for getting an ActuatorType from an TypeId
+        // Reverse-lookup map for getting an ActuatorType from a TypeId
         private static final Map<Integer, ActuatorType> LOOKUPTYPEID2ENUM = Stream.of(ActuatorType.values())
                 .collect(Collectors.toMap(ActuatorType::getNodeType, Function.identity()));
 
diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/CdStationHydro.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/CdStationHydro.java
index 2a8bc377300be..5f2b45fb65598 100644
--- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/CdStationHydro.java
+++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/CdStationHydro.java
@@ -23,7 +23,7 @@
 
 /**
  * The {@link CdStationHydro} is the Java class used to map the JSON
- * response to an vigicrue api endpoint request.
+ * response to a vigicrue api endpoint request.
  *
  * @author Gaël L'hopital - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/InfoVigiCru.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/InfoVigiCru.java
index 2d03feefac732..f8fecf16afab9 100644
--- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/InfoVigiCru.java
+++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/InfoVigiCru.java
@@ -16,7 +16,7 @@
 
 /**
  * The {@link InfoVigiCru} is the Java class used to map the JSON
- * response to an vigicrue api endpoint request.
+ * response to a vigicrue api endpoint request.
  *
  * @author Gaël L'hopital - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/TerEntVigiCru.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/TerEntVigiCru.java
index b9c99bfa8006b..6396e81edfc59 100644
--- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/TerEntVigiCru.java
+++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/TerEntVigiCru.java
@@ -18,7 +18,7 @@
 
 /**
  * The {@link TerEntVigiCru} is the Java class used to map the JSON
- * response to an vigicrue api endpoint request.
+ * response to a vigicrue api endpoint request.
  *
  * @author Gaël L'hopital - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/TronEntVigiCru.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/TronEntVigiCru.java
index 5602ad4e49f78..b9732a676002d 100644
--- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/TronEntVigiCru.java
+++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/TronEntVigiCru.java
@@ -19,7 +19,7 @@
 
 /**
  * The {@link TronEntVigiCru} is the Java class used to map the JSON
- * response to an vigicrue api endpoint request.
+ * response to a vigicrue api endpoint request.
  *
  * @author Gaël L'hopital - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/VicANMoinsUn.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/VicANMoinsUn.java
index 08709dd931808..d45602ab3f256 100644
--- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/VicANMoinsUn.java
+++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/dto/vigicrues/VicANMoinsUn.java
@@ -16,7 +16,7 @@
 
 /**
  * The {@link VicANMoinsUn} is the Java class used to map the JSON
- * response to an vigicrue api endpoint request.
+ * response to a vigicrue api endpoint request.
  *
  * @author Gaël L'hopital - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetSystemBridgeHandler.java b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetSystemBridgeHandler.java
index c96d70ccd8dbc..90dd3488132a6 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetSystemBridgeHandler.java
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetSystemBridgeHandler.java
@@ -46,7 +46,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link WolfSmartsetSystemBridgeHandler} is the handler for an WolfSmartset system.
+ * The {@link WolfSmartsetSystemBridgeHandler} is the handler for a WolfSmartset system.
  *
  * @author Bo Biene - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUnitThingHandler.java b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUnitThingHandler.java
index 5a80787dfcc72..5729e007de6fd 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUnitThingHandler.java
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUnitThingHandler.java
@@ -43,7 +43,7 @@
 
 /**
  * The {@link WolfSmartsetUnitThingHandler} is responsible for updating the channels associated
- * with an WolfSmartset unit.
+ * with a WolfSmartset unit.
  *
  * @author Bo Biene - Initial contribution
  */
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/i18n/wolfsmartset.properties b/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/i18n/wolfsmartset.properties
index b42be5e09a58f..6ecd18ed95b13 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/i18n/wolfsmartset.properties
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/i18n/wolfsmartset.properties
@@ -8,9 +8,9 @@ binding.wolfsmartset.description = This is the binding for WolfSmartset smart sy
 thing-type.wolfsmartset.account.label = WolfSmartset Account
 thing-type.wolfsmartset.account.description = Represents an account at WolfSmartset
 thing-type.wolfsmartset.system.label = WolfSmartset System
-thing-type.wolfsmartset.system.description = An WolfSmartset system
+thing-type.wolfsmartset.system.description = A WolfSmartset system
 thing-type.wolfsmartset.unit.label = WolfSmartset Unit
-thing-type.wolfsmartset.unit.description = An WolfSmartset remote unit
+thing-type.wolfsmartset.unit.description = A WolfSmartset remote unit
 
 # thing types config
 
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/thing/thing-types.xml
index c24778e554186..4c3f7a0d40462 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/thing/thing-types.xml
@@ -17,7 +17,7 @@
 			<bridge-type-ref id="account"/>
 		</supported-bridge-type-refs>
 		<label>WolfSmartset System</label>
-		<description>An WolfSmartset system</description>
+		<description>A WolfSmartset system</description>
 		<representation-property>systemId</representation-property>
 		<config-description-ref uri="thing-type:wolfsmartset:system"/>
 	</bridge-type>
@@ -28,7 +28,7 @@
 			<bridge-type-ref id="system"/>
 		</supported-bridge-type-refs>
 		<label>WolfSmartset Unit</label>
-		<description>An WolfSmartset remote unit</description>
+		<description>A WolfSmartset remote unit</description>
 
 		<representation-property>unitId</representation-property>
 		<config-description-ref uri="thing-type:wolfsmartset:unit"/>
diff --git a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/handler/YamahaZoneThingHandler.java b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/handler/YamahaZoneThingHandler.java
index a08b3033f0b70..e54425c783311 100644
--- a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/handler/YamahaZoneThingHandler.java
+++ b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/handler/YamahaZoneThingHandler.java
@@ -81,7 +81,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The {@link YamahaZoneThingHandler} is managing one zone of an Yamaha AVR.
+ * The {@link YamahaZoneThingHandler} is managing one zone of a Yamaha AVR.
  * It has a state consisting of the zone, the current input ID, {@link ZoneControlState}
  * and some more state objects and uses the zone control protocol
  * class {@link ZoneControlXML}, {@link InputWithPlayControlXML} and {@link InputWithNavigationControlXML}
diff --git a/bundles/org.openhab.binding.yamahareceiver/src/test/java/org/openhab/binding/yamahareceiver/internal/YamahaReceiverHandlerTest.java b/bundles/org.openhab.binding.yamahareceiver/src/test/java/org/openhab/binding/yamahareceiver/internal/YamahaReceiverHandlerTest.java
index dcb332431f521..be5b6bb435f1c 100644
--- a/bundles/org.openhab.binding.yamahareceiver/src/test/java/org/openhab/binding/yamahareceiver/internal/YamahaReceiverHandlerTest.java
+++ b/bundles/org.openhab.binding.yamahareceiver/src/test/java/org/openhab/binding/yamahareceiver/internal/YamahaReceiverHandlerTest.java
@@ -88,7 +88,7 @@ protected void onSetUp() throws Exception {
     public void afterInitializeBridgeShouldBeOnline() throws InterruptedException {
         // when
         subject.initialize();
-        // internally there is an timer, let's allow it to execute
+        // internally there is a timer, let's allow it to execute
         Thread.sleep(200);
 
         // then
diff --git a/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/converter/ZWayDeviceStateConverter.java b/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/converter/ZWayDeviceStateConverter.java
index 38c167987b4b9..ec2324b1e1997 100644
--- a/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/converter/ZWayDeviceStateConverter.java
+++ b/bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/converter/ZWayDeviceStateConverter.java
@@ -84,7 +84,7 @@ public static State toState(Device device, Channel channel) {
     }
 
     /**
-     * Transforms an value in an openHAB type.
+     * Transforms a value in an openHAB type.
      *
      * @param multilevel sensor value
      * @return transformed openHAB state
@@ -104,7 +104,7 @@ private static State getPercentState(String multilevelValue) {
     }
 
     /**
-     * Transforms an value in an openHAB type.
+     * Transforms a value in an openHAB type.
      *
      * @param binary switch value
      * @return transformed openHAB state
@@ -121,7 +121,7 @@ private static State getBinaryState(String binarySwitchState) {
     }
 
     /**
-     * Transforms an value in an openHAB type.
+     * Transforms a value in an openHAB type.
      * - ON to OPEN
      * - OFF to CLOSED
      *
@@ -140,7 +140,7 @@ private static State getDoorlockState(String binarySensorState) {
     }
 
     /**
-     * Transforms an value in an openHAB type.
+     * Transforms a value in an openHAB type.
      *
      * @param Z-Way color value
      * @return transformed openHAB state
diff --git a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/models/NeeoDeviceChannelKind.java b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/models/NeeoDeviceChannelKind.java
index d0c3f4093704f..7778c3cd34c9d 100644
--- a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/models/NeeoDeviceChannelKind.java
+++ b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/models/NeeoDeviceChannelKind.java
@@ -26,7 +26,7 @@
 public enum NeeoDeviceChannelKind {
     /** Represents an item */
     ITEM("item"),
-    /** Represents an trigger item */
+    /** Represents a trigger item */
     TRIGGER("trigger");
 
     /** The text value of the enum */
diff --git a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/models/NeeoDeviceType.java b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/models/NeeoDeviceType.java
index 45293595f5a6c..4131533d3224a 100644
--- a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/models/NeeoDeviceType.java
+++ b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/models/NeeoDeviceType.java
@@ -30,11 +30,11 @@
  */
 @NonNullByDefault
 public class NeeoDeviceType {
-    /** Represents an device that should be excluded */
+    /** Represents a device that should be excluded */
     public static final NeeoDeviceType EXCLUDE = new NeeoDeviceType("");
     /** Represents an accessory device (spelled the way NEEO spells it) */
     public static final NeeoDeviceType ACCESSOIRE = new NeeoDeviceType("ACCESSOIRE");
-    /** Represents an light device */
+    /** Represents a light device */
     static final NeeoDeviceType LIGHT = new NeeoDeviceType("LIGHT");
 
     /** Represents the propery way to spell accessory! */

From 3c236b31034881c58a9cb9436da49466d322b29d Mon Sep 17 00:00:00 2001
From: Hawkinzw <4316127+Hawkinzw@users.noreply.github.com>
Date: Thu, 8 Dec 2022 14:17:45 -0600
Subject: [PATCH 03/48] [insteon] Binding Documentation: Updated I/O Linc
 Section (#13811)

* Update I/O Linc Documentation

The I/O Linc has a feature to match or invert the status of the contact with its control messages. The binding was written expecting the messages to be inverted. This is the opposite of how insteon recommends setting up the garage kit, and not described well by the original "Note" at the bottom of the section. Updated the instructions to specify the input is OFF when linking, and changed the note to better describe what happens if you don't. All based off of my own experience with the sensor: https://community.openhab.org/t/insteon-io-linc-garage-door-contact-slow-update/141469
---
 bundles/org.openhab.binding.insteon/README.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.insteon/README.md b/bundles/org.openhab.binding.insteon/README.md
index eb818ee7b68d2..2fff1020acc8b 100644
--- a/bundles/org.openhab.binding.insteon/README.md
+++ b/bundles/org.openhab.binding.insteon/README.md
@@ -489,7 +489,12 @@ and create a file "lock.map" in the transforms directory with these entries:
 ### I/O Linc (garage door openers)
 
 The I/O Linc devices are really two devices in one: a relay and a contact.
-Link the modem both ways, as responder and controller using the set buttons as described in the instructions.
+To control the relay, link the modem as a controller using the set buttons as described in the instructions.
+To get the status of the contact, the modem must also be linked as a responder to the I/O Linc.
+The I/O Linc has a feature to invert the contact or match the contact when it sends commands to any linked responders.
+This is based on the status of the contact when it is linked, and was intended for controlling other devices with the contact.
+The binding expects the contact to be inverted to work properly.
+Ensure the contact is OFF (status LED is dark/garage door open) when linking the modem as a responder to the I/O Linc in order for it to function properly.
 
 Add this map into your transforms directory as "contact.map":
 
@@ -517,9 +522,10 @@ To make it visible in the GUI, put this into your sitemap file:
 
 For safety reasons, only close the garage door if you have visual contact to make sure there is no obstruction! The use of automated rules for closing garage doors is dangerous.
 
-> NOTE: If the I/O Linc returns the wrong value when the device is polled (For example you open the garage door and the state correctly shows OPEN, but during polling it shows CLOSED), you probably linked the device with the PLM or hub when the door was in the wrong position.
-You need unlink and then link again with the door in the opposite position.
-Please see the Insteon I/O Linc documentation for further details.
+> NOTE: If the I/O Linc contact status appears delayed, or returns the wrong value when the sensor changes states, the contact was likely ON (status LED lit) when the modem was linked as a responder.
+Examples of this behavior would include: The status remaining CLOSED for up to 3 minutes after the door is opened, or the status remains OPEN for up to three minutes after the garage is opened and immediately closed again.
+To resolve this behavior the I/O Linc will need to be unlinked and then re-linked to the modem with the contact OFF (stats LED off). 
+That would be with the door open when using the Insteon garage kit.
 
 ### Keypads
 

From 0e68936663b14a4d0330d4b6c0d2778b0dabfdf0 Mon Sep 17 00:00:00 2001
From: Jerome Luckenbach <github@luckenba.ch>
Date: Thu, 8 Dec 2022 21:36:05 +0100
Subject: [PATCH 04/48] [Documentation] Markdown improvements f to m (#13866)

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
---
 .../README.md                                 |  86 +--
 .../org.openhab.binding.flicbutton/README.md  |  25 +-
 .../org.openhab.binding.fmiweather/README.md  |  11 +-
 .../README.md                                 |   2 -
 bundles/org.openhab.binding.foobot/README.md  |   7 +-
 bundles/org.openhab.binding.freebox/README.md |  14 +-
 bundles/org.openhab.binding.fronius/README.md |  20 +-
 .../README.md                                 |  61 +-
 .../org.openhab.binding.ftpupload/README.md   |  24 +-
 bundles/org.openhab.binding.gardena/README.md |  30 +-
 bundles/org.openhab.binding.gce/README.md     |  36 +-
 .../README.md                                 |  11 +-
 .../org.openhab.binding.globalcache/README.md |  54 +-
 .../org.openhab.binding.goecharger/README.md  |  10 +-
 bundles/org.openhab.binding.gpio/README.md    |  25 +-
 .../org.openhab.binding.gpstracker/README.md  | 122 ++--
 bundles/org.openhab.binding.gree/README.md    |  29 +-
 .../org.openhab.binding.groheondus/README.md  |   8 +-
 .../org.openhab.binding.groupepsa/README.md   |  12 +-
 .../org.openhab.binding.guntamatic/README.md  | 564 +++++++++---------
 .../README.md                                 |  12 +-
 .../org.openhab.binding.harmonyhub/README.md  |  79 +--
 .../README.md                                 |   2 +-
 .../README.md                                 |  12 +-
 .../org.openhab.binding.hdanywhere/README.md  |   6 +-
 .../org.openhab.binding.hdpowerview/README.md |  50 +-
 bundles/org.openhab.binding.helios/README.md  |  12 +-
 .../README.md                                 |  10 +-
 bundles/org.openhab.binding.heos/README.md    | 117 ++--
 .../org.openhab.binding.herzborg/README.md    |   8 +-
 .../org.openhab.binding.homeconnect/README.md | 220 ++++---
 .../org.openhab.binding.homematic/README.md   |  81 +--
 .../org.openhab.binding.homewizard/README.md  |   7 +-
 .../org.openhab.binding.hpprinter/README.md   |  28 +-
 bundles/org.openhab.binding.http/README.md    |  24 +-
 .../xtend_examples.md                         |  21 +-
 bundles/org.openhab.binding.hue/README.md     |  35 +-
 .../org.openhab.binding.hydrawise/README.md   |  42 +-
 .../org.openhab.binding.hyperion/README.md    |  28 +-
 .../org.openhab.binding.iammeter/README.md    |  10 +-
 .../org.openhab.binding.iaqualink/README.md   |  19 +-
 .../org.openhab.binding.icalendar/README.md   |  42 +-
 bundles/org.openhab.binding.icloud/README.md  |   2 +-
 bundles/org.openhab.binding.ihc/README.md     |  22 +-
 .../README.md                                 |  47 +-
 bundles/org.openhab.binding.insteon/README.md | 354 +++++------
 bundles/org.openhab.binding.intesis/README.md |  15 +-
 .../org.openhab.binding.ipcamera/README.md    | 211 ++++---
 .../org.openhab.binding.ipobserver/README.md  |   2 +-
 bundles/org.openhab.binding.irobot/README.md  |  29 +-
 bundles/org.openhab.binding.irtrans/README.md |  32 +-
 bundles/org.openhab.binding.ism8/README.md    | 230 +++----
 .../org.openhab.binding.jablotron/README.md   |  22 +-
 bundles/org.openhab.binding.jeelink/README.md |  61 +-
 .../org.openhab.binding.jellyfin/README.md    |  29 +-
 .../org.openhab.binding.juicenet/README.md    |  12 +-
 .../README.md                                 |  34 +-
 bundles/org.openhab.binding.keba/README.md    | 157 ++---
 bundles/org.openhab.binding.km200/README.md   |  14 +-
 bundles/org.openhab.binding.knx/README.md     |  43 +-
 bundles/org.openhab.binding.kodi/README.md    |  21 +-
 .../org.openhab.binding.konnected/README.md   |  33 +-
 .../README.md                                 |  98 ++-
 bundles/org.openhab.binding.kvv/README.md     |   2 +-
 .../README.md                                 |  32 +-
 bundles/org.openhab.binding.lcn/README.md     | 156 ++---
 .../org.openhab.binding.leapmotion/README.md  |   4 +-
 .../org.openhab.binding.lghombot/README.md    |   7 +-
 bundles/org.openhab.binding.lgwebos/README.md |  44 +-
 bundles/org.openhab.binding.lifx/README.md    |  49 +-
 bundles/org.openhab.binding.linky/README.md   |  28 +-
 .../org.openhab.binding.linuxinput/README.md  |  25 +-
 bundles/org.openhab.binding.lirc/README.md    |  15 +-
 .../README.md                                 |  16 +-
 .../org.openhab.binding.logreader/README.md   |  38 +-
 bundles/org.openhab.binding.loxone/README.md  | 181 +++---
 .../README.md                                 |  24 +-
 bundles/org.openhab.binding.lutron/README.md  | 249 ++++----
 bundles/org.openhab.binding.luxom/README.md   |  46 +-
 .../README.md                                 |  30 +-
 .../org.openhab.binding.magentatv/README.md   |  52 +-
 bundles/org.openhab.binding.mail/README.md    |  24 +-
 bundles/org.openhab.binding.max/README.md     |  16 +-
 bundles/org.openhab.binding.mcd/README.md     |  32 +-
 .../org.openhab.binding.mcp23017/README.md    |  20 +-
 bundles/org.openhab.binding.meater/README.md  |  25 +-
 .../org.openhab.binding.mecmeter/README.md    |  13 +-
 .../org.openhab.binding.melcloud/README.md    |  30 +-
 .../org.openhab.binding.mercedesme/README.md  |  93 ++-
 .../org.openhab.binding.meteoalerte/README.md |   7 +-
 .../org.openhab.binding.meteoblue/README.md   |  20 +-
 .../org.openhab.binding.meteostick/README.md  |  87 ++-
 bundles/org.openhab.binding.miele/README.md   |  12 +-
 .../org.openhab.binding.mielecloud/README.md  |   9 +-
 bundles/org.openhab.binding.mihome/README.md  | 209 +++----
 .../org.openhab.binding.miio/README.base.md   |  77 ++-
 .../org.openhab.binding.mikrotik/README.md    |  82 ++-
 bundles/org.openhab.binding.milight/README.md | 121 ++--
 .../org.openhab.binding.millheat/README.md    |  38 +-
 .../org.openhab.binding.minecraft/README.md   |   7 +-
 .../org.openhab.binding.modbus.e3dc/README.md |  84 ++-
 .../README.md                                 | 447 +++++++-------
 .../org.openhab.binding.modbus.sbc/README.md  |   6 +-
 .../README.md                                 | 106 ++--
 .../README.md                                 |  21 +-
 .../DEVELOPERS.md                             |  16 +-
 .../README.md                                 |  22 +-
 .../org.openhab.binding.modbus/DEVELOPERS.md  |  41 +-
 bundles/org.openhab.binding.modbus/README.md  | 159 +++--
 .../README.md                                 |  22 +-
 bundles/org.openhab.binding.mpd/README.md     |  20 +-
 .../README.md                                 |  80 +--
 .../README.md                                 | 173 +++---
 .../xtend_examples.md                         |  44 +-
 .../README.md                                 |  18 +-
 .../org.openhab.binding.mqtt.homie/README.md  |  10 +-
 bundles/org.openhab.binding.mqtt/README.md    |  64 +-
 .../xtend_examples.md                         |  15 +-
 bundles/org.openhab.binding.mybmw/README.md   | 402 ++++++-------
 bundles/org.openhab.binding.mycroft/README.md |  13 +-
 bundles/org.openhab.binding.myq/README.md     |   6 +-
 bundles/org.openhab.binding.mystrom/README.md |   9 +-
 122 files changed, 3505 insertions(+), 3677 deletions(-)

diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/README.md b/bundles/org.openhab.binding.fineoffsetweatherstation/README.md
index 79838bbd2a67e..fd38714763e09 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/README.md
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/README.md
@@ -4,16 +4,16 @@ This binding is for weather stations manufactured by [Fine Offset](http://www.fo
 These weather stations are white labeled products which are re-branded by many distribution companies around the world.
 Some of these brands are e.g.:
 
-* Aercus
-* Ambient Weather
-* Ecowitt
-* ELV
-* Froggit
-* Misol
-* Pantech
-* Sainlogic
-* Steinberg Systems
-* Waldbeck Halley
+- Aercus
+- Ambient Weather
+- Ecowitt
+- ELV
+- Froggit
+- Misol
+- Pantech
+- Sainlogic
+- Steinberg Systems
+- Waldbeck Halley
 
 Here is a product picture of how this Weather Station looks like:
 
@@ -23,31 +23,31 @@ This binding works offline by [implementing the wire protocol](https://osswww.ec
 
 ## Discussion
 
-If you have any issues or feedback, please feel free to [get in touch via the community forum](https://community.openhab.org/t/fine-offset-weather-station-binding-discussion/134167) 
+If you have any issues or feedback, please feel free to [get in touch via the community forum](https://community.openhab.org/t/fine-offset-weather-station-binding-discussion/134167)
 
 ## Supported Things
 
 - `weatherstation`: A Fine Offset gateway device with the ThingTypeUID `fineoffsetweatherstation:weatherstation` which supports the [wire protocol](https://osswww.ecowitt.net/uploads/20220407/WN1900%20GW1000,1100%20WH2680,2650%20telenet%20v1.6.4.pdf) e.g.:
-    - HP2550
-    - HP3500
-    - GW1000
-    - GW1001
-    - GW1002
-    - GW1003
-    - GW1100
-    - GW2001
-    - WN1900
-    - WN1910
-    - WH2350
-    - WH2600
-    - WH2610
-    - WH2620
-    - WH2650 (tested)
-    - WH2680
-    - WH2900
-    - WH2950
-    - WS980 ELV (tested)
-    - WittBoy (tested)
+  - HP2550
+  - HP3500
+  - GW1000
+  - GW1001
+  - GW1002
+  - GW1003
+  - GW1100
+  - GW2001
+  - WN1900
+  - WN1910
+  - WH2350
+  - WH2600
+  - WH2610
+  - WH2620
+  - WH2650 (tested)
+  - WH2680
+  - WH2900
+  - WH2950
+  - WS980 ELV (tested)
+  - WittBoy (tested)
 - `sensor`: A Fine Offset sensor which is connected to the bridge with the ThingTypeUID `fineoffsetweatherstation:sensor`.
   Since the gateway collects all the sensor data and harmonizes them, the sensor thing itself will only hold information about the signal and battery status.
   This is a list of sensors supported by the protocol:
@@ -75,7 +75,7 @@ In this case you have to configure a service to which the data is sent.
 Please try if here the [IPObserver binding](https://www.openhab.org/addons/bindings/ipobserver/) offers an alternative.
 Known weather stations not compatible with this binding:
 
-  - [WH3000](https://community.openhab.org/t/fine-offset-weather-station-binding-beta-and-discussion/134167/52?u=andy2003)
+- [WH3000](https://community.openhab.org/t/fine-offset-weather-station-binding-beta-and-discussion/134167/52?u=andy2003)
 
 ## Discovery
 
@@ -262,13 +262,13 @@ Valid sensors:
 | sensor-co2-co2                        | Number:Dimensionless          | R          | CO2                                            |
 | sensor-co2-co2-24-hour-average        | Number:Dimensionless          | R          | CO2 24 Hour Average                            |
 | leaf-wetness-channel-1                | Number:Dimensionless          | R          | Leaf Moisture Channel 1                        |  
-| leaf-wetness-channel-2                | Number:Dimensionless          | R          | Leaf Moisture Channel 2                        | 
-| leaf-wetness-channel-3                | Number:Dimensionless          | R          | Leaf Moisture Channel 3                        | 
-| leaf-wetness-channel-4                | Number:Dimensionless          | R          | Leaf Moisture Channel 4                        | 
-| leaf-wetness-channel-5                | Number:Dimensionless          | R          | Leaf Moisture Channel 5                        | 
-| leaf-wetness-channel-6                | Number:Dimensionless          | R          | Leaf Moisture Channel 6                        | 
-| leaf-wetness-channel-7                | Number:Dimensionless          | R          | Leaf Moisture Channel 7                        | 
-| leaf-wetness-channel-8                | Number:Dimensionless          | R          | Leaf Moisture Channel 8                        | 
+| leaf-wetness-channel-2                | Number:Dimensionless          | R          | Leaf Moisture Channel 2                        |
+| leaf-wetness-channel-3                | Number:Dimensionless          | R          | Leaf Moisture Channel 3                        |
+| leaf-wetness-channel-4                | Number:Dimensionless          | R          | Leaf Moisture Channel 4                        |
+| leaf-wetness-channel-5                | Number:Dimensionless          | R          | Leaf Moisture Channel 5                        |
+| leaf-wetness-channel-6                | Number:Dimensionless          | R          | Leaf Moisture Channel 6                        |
+| leaf-wetness-channel-7                | Number:Dimensionless          | R          | Leaf Moisture Channel 7                        |
+| leaf-wetness-channel-8                | Number:Dimensionless          | R          | Leaf Moisture Channel 8                        |
 | piezo-rain-rate                       | Number:VolumetricFlowRate     | R          | Piezo - Rainfall Rate                          |
 | piezo-rain-event                      | Number:Length                 | R          | Piezo - Amount of Rainfall At the last Rain    |
 | piezo-rain-hour                       | Number:Length                 | R          | Piezo - Rainfall Current Hour                  |
@@ -295,7 +295,7 @@ This is an example configuration for the WH2650 gateway
 
 _weatherstation.things_:
 
-```xtend
+```java
 Bridge fineoffsetweatherstation:gateway:3906700515 "Weather station" [
      ip="192.168.1.42",
      port="45000", 
@@ -303,14 +303,14 @@ Bridge fineoffsetweatherstation:gateway:3906700515 "Weather station" [
      pollingInterval="16",
      protocol="DEFAULT"
 ] {
-	Thing sensor WH25 "WH25" [sensor="WH25"]
-	Thing sensor WH65 "WH65" [sensor="WH65"]
+ Thing sensor WH25 "WH25" [sensor="WH25"]
+ Thing sensor WH65 "WH65" [sensor="WH65"]
 }
 ```
 
 _weatherstation.items_:
 
-```xtend
+```java
 Group WH25 "WH25"  <Sensor> ["Sensor"]
 Number SignalWH25        "Signal WH25"      <QualityOfService> (WH25) ["Measurement", "Level"] { channel="fineoffsetweatherstation:sensor:3906700515:WH25:signal" }
 Switch BatteryStatusWH25 "Low Battery WH25" <LowBattery>       (WH25) ["Energy", "LowBattery"] { channel="fineoffsetweatherstation:sensor:3906700515:WH25:lowBattery" }
diff --git a/bundles/org.openhab.binding.flicbutton/README.md b/bundles/org.openhab.binding.flicbutton/README.md
index 87e81dfdf2d6d..36416cbef591f 100644
--- a/bundles/org.openhab.binding.flicbutton/README.md
+++ b/bundles/org.openhab.binding.flicbutton/README.md
@@ -1,4 +1,4 @@
-# Flic Button Binding 
+# Flic Button Binding
 
 openHAB binding for using [Flic Buttons](https://flic.io/)
 with a [fliclib-linux-hci](https://github.com/50ButtonsEach/fliclib-linux-hci) bridge.
@@ -20,8 +20,8 @@ After buttons are initially added to flicd, an internet connection is not requir
 
 ## Discovery
 
-* There is no automatic discovery for flicd-bridge available.
-* After flicd-bridge is (manually) configured, buttons will be automatically discovered via background discovery as soon
+- There is no automatic discovery for flicd-bridge available.
+- After flicd-bridge is (manually) configured, buttons will be automatically discovered via background discovery as soon
   as they're added with [simpleclient](https://github.com/50ButtonsEach/fliclib-linux-hci).
 
 If they're already attached to the flicd-bridge before configuring this binding, they can be discovered by triggering an
@@ -33,14 +33,14 @@ active scan.
 
 Example for textual configuration:
 
-```
+```java
 Bridge flicbutton:flicd-bridge:mybridge
 ```
 
 The default host is localhost:5551 (this should be sufficient if flicd is running with default settings on the same server as openHAB).
 If your flicd service is running somewhere else, specify it like this:
 
-```
+```java
 Bridge flicbutton:flicd-bridge:mybridge [ hostname="<YOUR_HOSTNAME>",  port=<YOUR_PORT>]
 ```
 
@@ -52,7 +52,7 @@ For the button, the only config parameter is the MAC address.
 Normally, no textual configuration is necessary as buttons are auto discovered as soon as the bridge is configured.
 If you want to use textual configuration anyway, you can do it like this:
 
-```
+```java
 Bridge flicbutton:flicd-bridge:mybridge [ hostname="<YOUR_HOSTNAME>",  port=<YOUR_PORT>] {
     Thing button myflic1 "<YOUR_LABEL>" [address ="<MAC_ADDRESS>"]
     Thing button myflic2 "<YOUR_LABEL>" [address ="<MAC_ADDRESS>"]
@@ -70,11 +70,12 @@ You're free to choose any label you like for your button.
 | rawbutton                | [System Trigger Channel](https://www.openhab.org/docs/developer/bindings/thing-xml.html#system-trigger-channel-types) `system.rawbutton`  | Depends on the  [Trigger Profile](https://www.openhab.org/docs/configuration/items.html#profiles) used | Raw Button channel that triggers `PRESSED` and `RELEASED` events, allows to use openHAB profiles or own implementations via rules to detect e.g. double clicks, long presses etc.  |
 | button                   | [System Trigger Channel](https://www.openhab.org/docs/developer/bindings/thing-xml.html#system-trigger-channel-types) `system.button`    | Depends on the [Trigger Profile](https://www.openhab.org/docs/configuration/items.html#profiles) used | Button channel that is using Flic's implementation for detecting long, short or double clicks. Triggers `SHORT_PRESSED`,`DOUBLE_PRESSED` and `LONG_PRESSED` events.   |
 | battery-level            | [System State Channel](https://www.openhab.org/docs/developer/bindings/thing-xml.html#system-state-channel-types) `system.battery-level`     | Number | Represents the battery level as a percentage (0-100%).
+
 ## Example
 
 ### Initial setup
 
-1. Setup and run flicd as described in [fliclib-linux-hci](https://github.com/50ButtonsEach/fliclib-linux-hci). 
+1. Setup and run flicd as described in [fliclib-linux-hci](https://github.com/50ButtonsEach/fliclib-linux-hci).
    Please consider that you need a separate Bluetooth adapter. Shared usage with other Bluetooth services (e.g. Bluez)
    is not possible.
 1. Connect your buttons to flicd using the simpleclient as described in
@@ -92,16 +93,16 @@ You're free to choose any label you like for your button.
 
 demo.things:
 
-```
+```java
 Bridge flicbutton:flicd-bridge:local-flicd {
-	Thing button flic_livingroom "Yellow Button Living Room" [address = "60:13:B3:02:18:BD"]
-	Thing button flic_kitchen "Black Button Kitchen" [address = "B5:7E:59:78:86:9F"]
+ Thing button flic_livingroom "Yellow Button Living Room" [address = "60:13:B3:02:18:BD"]
+ Thing button flic_kitchen "Black Button Kitchen" [address = "B5:7E:59:78:86:9F"]
 }
 ```
 
 demo.items:
 
-```
+```java
 Dimmer Light_LivingRoom  { channel="milight:rgbLed:milight2:4:ledbrightness", channel="flicbutton:button:local-flicd:flic_livingroom:rawbutton" [profile="rawbutton-toggle-switch"], channel="flicbutton:button:local-flicd:flic_kitchen:rawbutton" [profile="rawbutton-toggle-switch"] }  // We have a combined kitchen / livingroom, so we control the living room lights with switches from the living room and from the kitchen
 Switch Light_Kitchen    { channel="hue:group:1:kitchen-bulbs:switch", channel="flicbutton:button:local-flicd:flic_kitchen:rawbutton" [profile="rawbutton-toggle-switch"] }
 ```
@@ -111,7 +112,7 @@ Switch Light_Kitchen    { channel="hue:group:1:kitchen-bulbs:switch", channel="f
 It's also possible to setup [Rules](https://www.openhab.org/docs/configuration/rules-dsl.html).
 The following rules help to initially test your setup as they'll trigger log messages on incoming events.
 
-```
+```java
 rule "Button rule using the button channel"
 
 when
diff --git a/bundles/org.openhab.binding.fmiweather/README.md b/bundles/org.openhab.binding.fmiweather/README.md
index 96eecf08d8d85..c4c55701e829c 100644
--- a/bundles/org.openhab.binding.fmiweather/README.md
+++ b/bundles/org.openhab.binding.fmiweather/README.md
@@ -1,6 +1,6 @@
 # FMI Weather Binding
 
-This binding integrates to [the Finnish Meteorological Institute (FMI) Open Data API](https://en.ilmatieteenlaitos.fi/open-data). 
+This binding integrates to [the Finnish Meteorological Institute (FMI) Open Data API](https://en.ilmatieteenlaitos.fi/open-data).
 
 Binding provides access to weather observations from FMI weather stations and [HIRLAM weather forecast model](https://en.ilmatieteenlaitos.fi/weather-forecast-models) forecasts.
 Forecast covers all of Europe, see previous link for more information.
@@ -34,7 +34,6 @@ The binding automatically discovers weather stations and forecasts for nearby pl
 | --------- | ---- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------ |
 | `fmisid`  | text | ✓        | FMI Station ID. You can FMISID of see all weathers stations at [FMI web site](https://en.ilmatieteenlaitos.fi/observation-stations?p_p_id=stationlistingportlet_WAR_fmiwwwweatherportlets&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&p_p_col_id=column-4&p_p_col_count=1&_stationlistingportlet_WAR_fmiwwwweatherportlets_stationGroup=WEATHER#station-listing) | `"852678"` for Espoo Nuuksio station |
 
-
 ### `forecast` thing configuration
 
 | Parameter  | Type | Required | Description                                                                                          | Example                           |
@@ -107,7 +106,7 @@ Please use the [Units Of Measurement](https://www.openhab.org/docs/concepts/unit
 
 `fmi.things`:
 
-```
+```java
 Thing fmiweather:observation:station_Helsinki_Kumpula "Helsinki Kumpula Observation" [fmisid="101004"]
 Thing fmiweather:forecast:forecast_Paris "Paris Forecast" [location="48.864716, 2.349014"]
 ```
@@ -144,7 +143,7 @@ for channel in observation['value']['channels']:
      '"{label} [{unit}]" {{ channel="{channel_id}" }}').format(**locals()))    
 -->
 
-```
+```java
 DateTime HelsinkiObservationTime "Observation Time [%1$tY-%1$tm-%1$tdT%1$tH:%1$tM:%1$tS]" <time> { channel="fmiweather:observation:station_Helsinki_Kumpula:current#time" }
 Number:Temperature HelsinkiTemperature "Temperature [%.1f %unit%]" <temperature> { channel="fmiweather:observation:station_Helsinki_Kumpula:current#temperature" }
 Number:Dimensionless HelsinkiHumidity "Humidity [%.1f %unit%]" <humidity> { channel="fmiweather:observation:station_Helsinki_Kumpula:current#humidity" }
@@ -216,7 +215,7 @@ for channel in forecast['channels']:
      '"{label} [{unit}]" {icon} {{ channel="{channel_id}" }}').format(**locals()))       
 -->
 
-```
+```java
 DateTime ParisForecastNowTime "Forecast Time Now [%1$tY-%1$tm-%1$tdT%1$tH:%1$tM:%1$tS]" <time> { channel="fmiweather:forecast:forecast_Paris:forecastNow#time" }
 Number:Temperature ParisForecastNowTemperature "Temperature Now [%.1f %unit%]" <temperature> { channel="fmiweather:forecast:forecast_Paris:forecastNow#temperature" }
 Number:Dimensionless ParisForecastNowHumidity "Humidity Now [%.1f %unit%]" <humidity> { channel="fmiweather:forecast:forecast_Paris:forecastNow#humidity" }
@@ -783,7 +782,7 @@ Number ParisForecastHours50WeatherId "Prevailing weather id hour 50 [%.1f %unit%
 
 `fmi_weather.sitemap`:
 
-```
+```perl
 sitemap fmi_weather label="FMI Weather" {
     Frame label="Observation Helsinki" {
         Text item=HelsinkiObservationTime
diff --git a/bundles/org.openhab.binding.folderwatcher/README.md b/bundles/org.openhab.binding.folderwatcher/README.md
index 7f0abadb66358..6d9d9b4b0c447 100644
--- a/bundles/org.openhab.binding.folderwatcher/README.md
+++ b/bundles/org.openhab.binding.folderwatcher/README.md
@@ -6,7 +6,6 @@ This binding is intended to monitor FTP and local folder and its subfolders and
 
 Currently the binding support two types of things: `ftpfolder` and `localfolder`.
 
-
 ## Thing Configuration
 
 The `ftpfolder` thing has the following configuration options:
@@ -43,7 +42,6 @@ This binding currently supports the following events:
 | newftpfile | String       | A new file name discovered on FTP                                                      |
 | newlocalfile | String       | A new file name discovered on in local folder                                                      |
 
-
 ## Full Example
 
 Thing configuration:
diff --git a/bundles/org.openhab.binding.foobot/README.md b/bundles/org.openhab.binding.foobot/README.md
index 853a981e71ee0..7390e8e717958 100644
--- a/bundles/org.openhab.binding.foobot/README.md
+++ b/bundles/org.openhab.binding.foobot/README.md
@@ -25,7 +25,7 @@ Bridge has the following configuration parameters:
 
 | Parameter        | Description                                           | Required
 |------------------|-------------------------------------------------------|----------
-| apikey           | API Key from https://api.foobot.io/apidoc/index.html  | Mandatory
+| apikey           | API Key from <https://api.foobot.io/apidoc/index.html>  | Mandatory
 | username         | The e-mail address used to log into the Foobot App    | Mandatory
 | refreshInterval  | Refresh interval in minutes, minimal 5 minutes        | Optional, the default value is 8 minutes.
 
@@ -40,7 +40,6 @@ The bridge has one channel:
 |----------------------|-----------|-----------------------------------------------
 | apiKeyLimitRemaining | Number    | The remaining number of API requests for today
 
-
 The AirQuality sensors information that is retrieved is available as these channels:
 
 | Channel ID        | Item Type            | Description
@@ -57,7 +56,7 @@ The AirQuality sensors information that is retrieved is available as these chann
 
 demo.things:
 
-```
+```java
 // Bridge configuration:
 Bridge foobot:account:myfoobotaccount "Foobot Account" [apiKey="XXXXXX", username="XXXXXX", refreshInterval=8] {
   Things:
@@ -66,6 +65,6 @@ Bridge foobot:account:myfoobotaccount "Foobot Account" [apiKey="XXXXXX", usernam
 
 demo.items:
 
-```
+```java
 Number:Temperature Temperature "Temperature" <temperature> { channel="foobot:myfoobotaccount:device:myfoobot:temperature" }
 ```
diff --git a/bundles/org.openhab.binding.freebox/README.md b/bundles/org.openhab.binding.freebox/README.md
index a322527162e88..cbddce47df20b 100644
--- a/bundles/org.openhab.binding.freebox/README.md
+++ b/bundles/org.openhab.binding.freebox/README.md
@@ -34,7 +34,7 @@ The binding has the following configuration options, which can be set for "bindi
 
 ### Server
 
-The *server* bridge thing requires the following configuration parameters:
+The _server_ bridge thing requires the following configuration parameters:
 
 | Parameter Label                    | Parameter ID            | Description                                                                 | Required | Default              |
 |------------------------------------|-------------------------|-----------------------------------------------------------------------------|----------|----------------------|
@@ -47,12 +47,12 @@ The *server* bridge thing requires the following configuration parameters:
 | Enable Network Interface Discovery | discoverNetInterface    | Enable the discovery of network interface things.                           | false    | true                 |
 | Enable AirPlay Receiver Discovery  | discoverAirPlayReceiver | Enable the discovery of AirPlay receiver things.                            | false    | true                 |
 
-If the parameter *fqdn* is not set, the binding will use the default address used by Free to access your Freebox Server (mafreebox.freebox.fr).
-The bridge thing will initialize only if a valid application token (parameter *appToken*) is filled.
+If the parameter _fqdn_ is not set, the binding will use the default address used by Free to access your Freebox Server (mafreebox.freebox.fr).
+The bridge thing will initialize only if a valid application token (parameter _appToken_) is filled.
 
 ### Phone
 
-The *phone* thing requires the following configuration parameters:
+The _phone_ thing requires the following configuration parameters:
 
 | Parameter Label              | Parameter ID              | Description                                                                                 | Required | Default |
 |------------------------------|---------------------------|---------------------------------------------------------------------------------------------|----------|---------|
@@ -61,7 +61,7 @@ The *phone* thing requires the following configuration parameters:
 
 ### Network device
 
-The *net_device* thing requires the following configuration parameters:
+The _net_device_ thing requires the following configuration parameters:
 
 | Parameter Label | Parameter ID | Description                            | Required |
 |-----------------|--------------|----------------------------------------|----------|
@@ -69,7 +69,7 @@ The *net_device* thing requires the following configuration parameters:
 
 ### Network interface
 
-The *net_interface* thing requires the following configuration parameters:
+The _net_interface_ thing requires the following configuration parameters:
 
 | Parameter Label | Parameter ID | Description                                         | Required |
 |-----------------|--------------|-----------------------------------------------------|----------|
@@ -77,7 +77,7 @@ The *net_interface* thing requires the following configuration parameters:
 
 ### AirPlay device
 
-The *airplay* thing requires the following configuration parameters:
+The _airplay_ thing requires the following configuration parameters:
 
 | Parameter Label | Parameter ID | Description                 | Required |
 |-----------------|--------------|-----------------------------|----------|
diff --git a/bundles/org.openhab.binding.fronius/README.md b/bundles/org.openhab.binding.fronius/README.md
index ceb90a71a1d4d..c768fa875b19c 100644
--- a/bundles/org.openhab.binding.fronius/README.md
+++ b/bundles/org.openhab.binding.fronius/README.md
@@ -2,12 +2,14 @@
 
 This binding uses the [Fronius Solar API V1](https://www.fronius.com/en/photovoltaics/products/all-products/system-monitoring/open-interfaces/fronius-solar-api-json-) to obtain data from Fronius devices.
 
-It supports Fronius inverters and Fronius Smart Meter. Supports:
-* Fronius Symo
-* Fronius Symo Gen24
-* Fronius Smart Meter 63A
-* Fronius Smart Meter TS 65A-3
-* Fronius Ohmpilot
+It supports Fronius inverters and Fronius Smart Meter.
+Supports:
+
+- Fronius Symo
+- Fronius Symo Gen24
+- Fronius Smart Meter 63A
+- Fronius Smart Meter TS 65A-3
+- Fronius Ohmpilot
 
 ## Supported Things
 
@@ -108,7 +110,6 @@ The binding has no configuration options, all configuration is done at `bridge`,
 | `energyrealsumconsumed` | Number:Energy            | Real Energy consumed                                                                                                                                                                                                     |
 | `energyrealsumproduced` | Number:Energy            | Real Energy produced                                                                                                                                                                                                     |
 
-
 ### Channels for `ohmpilot` Thing
 
 | Channel ID              | Item Type          | Description                                                                                                                                                              |
@@ -119,7 +120,6 @@ The binding has no configuration options, all configuration is done at `bridge`,
 | `errorcode`             | Number             | Device error code                                                                                                                                                        |
 | `statecode`             | Number             | Device state code<br />`0` up and running <br />`1` keep minimum temperature <br />`2` legionella protection <br />`3` critical fault<br />`4` fault<br />`5` boost mode |
 
-
 ## Properties
 
 ### The `meter` thing has the following properties:
@@ -140,7 +140,7 @@ The binding has no configuration options, all configuration is done at `bridge`,
 
 demo.things:
 
-```
+```java
 Bridge fronius:bridge:mybridge [hostname="192.168.66.148", refreshInterval=5] {
     Thing powerinverter myinverter [deviceId=1]
     Thing meter mymeter [deviceId=0]
@@ -150,7 +150,7 @@ Bridge fronius:bridge:mybridge [hostname="192.168.66.148", refreshInterval=5] {
 
 demo.items:
 
-```
+```java
 Number:Power AC_Power { channel="fronius:powerinverter:mybridge:myinverter:inverterdatachannelpac" }
 Number:Energy Day_Energy { channel="fronius:powerinverter:mybridge:myinverter:inverterdatachanneldayenergy" }
 Number:Energy Total_Energy { channel="fronius:powerinverter:mybridge:myinverter:inverterdatachanneltotal" }
diff --git a/bundles/org.openhab.binding.fsinternetradio/README.md b/bundles/org.openhab.binding.fsinternetradio/README.md
index a835a4b21b086..050d35a25514f 100644
--- a/bundles/org.openhab.binding.fsinternetradio/README.md
+++ b/bundles/org.openhab.binding.fsinternetradio/README.md
@@ -6,20 +6,20 @@ This binding integrates internet radios based on the [Frontier Silicon chipset](
 
 Successfully tested are internet radios:
 
- * [Hama IR100, IR110](https://de.hama.com/00054823/hama-internetradio-ir110)
- * [Hama DIR3100](https://www.conrad.com/p/hama-dir3100-internet-desk-radio-dab-fm-aux-internet-radio-usb-spotify-black-1233624)
- * [Medion MD87180, MD86988, MD86955, MD87528](http://internetradio.medion.com/)
- * [Silvercrest SMRS18A1, SMRS30A1, SMRS35A1, SIRD 14 C2, SIRD 14 D1](https://www.silvercrest-multiroom.de/en/products/stereo-internet-radio/)
- * [Roberts Stream 83i and 93i](https://www.robertsradio.com/uk/products/radio/smart-radio/)
- * [Auna Connect 150, Auna KR200, Auna Connect CD](https://www.auna.de/Radios/Internetradios/)
- * [TechniSat DIGITRADIO 350 IR and 850](https://www.technisat.com/en_XX/DAB+-Radios-with-Internetradio/352-10996/)
- * [TTMicro AS Pinell Supersound](https://www.ttmicro.no/radio)
- * [Revo SuperConnect](https://revo.co.uk/products/)
- * [Sangean WFR-28C](https://sg.sangean.com.tw/products/product_category.asp?cid=2)
- * [Roku SoundBridge M1001](https://soundbridge.roku.com/soundbridge/index.php)
- * [Dual IR 3a](https://www.dual.de/produkte/digitalradio/radio-station-ir-3a/)
- * [Teufel 3sixty](https://www.teufel.de/stereo/radio-3sixty-p16568.html)
- * [Ruark R5](https://www.ruarkaudio.com/products/r5-high-fidelity-music-system)
+- [Hama IR100, IR110](https://de.hama.com/00054823/hama-internetradio-ir110)
+- [Hama DIR3100](https://www.conrad.com/p/hama-dir3100-internet-desk-radio-dab-fm-aux-internet-radio-usb-spotify-black-1233624)
+- [Medion MD87180, MD86988, MD86955, MD87528](http://internetradio.medion.com/)
+- [Silvercrest SMRS18A1, SMRS30A1, SMRS35A1, SIRD 14 C2, SIRD 14 D1](https://www.silvercrest-multiroom.de/en/products/stereo-internet-radio/)
+- [Roberts Stream 83i and 93i](https://www.robertsradio.com/uk/products/radio/smart-radio/)
+- [Auna Connect 150, Auna KR200, Auna Connect CD](https://www.auna.de/Radios/Internetradios/)
+- [TechniSat DIGITRADIO 350 IR and 850](https://www.technisat.com/en_XX/DAB+-Radios-with-Internetradio/352-10996/)
+- [TTMicro AS Pinell Supersound](https://www.ttmicro.no/radio)
+- [Revo SuperConnect](https://revo.co.uk/products/)
+- [Sangean WFR-28C](https://sg.sangean.com.tw/products/product_category.asp?cid=2)
+- [Roku SoundBridge M1001](https://soundbridge.roku.com/soundbridge/index.php)
+- [Dual IR 3a](https://www.dual.de/produkte/digitalradio/radio-station-ir-3a/)
+- [Teufel 3sixty](https://www.teufel.de/stereo/radio-3sixty-p16568.html)
+- [Ruark R5](https://www.ruarkaudio.com/products/r5-high-fidelity-music-system)
 
 But in principle, all internet radios based on the [Frontier Silicon chipset](https://www.frontier-silicon.com/) should be supported because they share the same API.
 So it is very likely that other internet radio models of the same manufacturers do also work.
@@ -46,10 +46,10 @@ The binding itself does not need a configuration.
 
 Each radio must be configured via its ip address, port, pin, and a refresh rate.
 
-* If the ip address is not discovered automatically, it must be manually set.
-* The default port is `80` which should work for most radios.
-* The default pin is `1234` for most radios, but if it does not work or if it was changed, look it up in the on-screen menu of the radio.
-* The default refresh rate for the radio items is `60` seconds; `0` disables periodic refresh.
+- If the ip address is not discovered automatically, it must be manually set.
+- The default port is `80` which should work for most radios.
+- The default pin is `1234` for most radios, but if it does not work or if it was changed, look it up in the on-screen menu of the radio.
+- The default refresh rate for the radio items is `60` seconds; `0` disables periodic refresh.
 
 ## Channels
 
@@ -85,18 +85,17 @@ This list is just an example how the mapping looks like for some of the devices,
 | Teufel 3sixty            | Internet Radio | Spotify                 | -            | USB/Network  | DAB Radio | FM Radio | Bluetooth    | AUX in       | -          | -         | -      | - | - | - |
 | Ruark R5                 | Internet Radio | TIDAL                   | Deezer       | Amazon Music | Spotify   | Local Music | Music Player | DAB Radio | FM Radio   | Bluetooth | AUX in  | Phono | Optical | CD |
 
-
 ## Full Example
 
 demo.things:
 
-```
+```java
 fsinternetradio:radio:radioInKitchen [ ip="192.168.0.42" ]
 ```
 
 demo.items:
 
-```
+```java
 Switch RadioPower "Radio Power" { channel="fsinternetradio:radio:radioInKitchen:power" }
 Switch RadioMute "Radio Mute" { channel="fsinternetradio:radio:radioInKitchen:mute" }
 Dimmer RadioVolume "Radio Volume" { channel="fsinternetradio:radio:radioInKitchen:volume-percent" }
@@ -108,17 +107,17 @@ String RadioInfo2 "Radio Info2" { channel="fsinternetradio:radio:radioInKitchen:
 
 demo.sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu"
 {
-	Frame {
-		Switch item=RadioPower
-		Slider visibility=[RadioPower==ON] item=RadioVolume
-		Switch visibility=[RadioPower==ON] item=RadioMute
-		Selection visibility=[RadioPower==ON] item=RadioPreset mappings=[0="Favourit 1", 1="Favourit 2", 2="Favourit 3", 3="Favourit 4"]
-		Selection visibility=[RadioPower==ON] item=RadioMode mappings=[0="Internet Radio", 1="Musik Player", 2="DAB", 3="FM", 4="AUX"]
-		Text visibility=[RadioPower==ON] item=RadioInfo1
-		Text visibility=[RadioPower==ON] item=RadioInfo2
-	}
+ Frame {
+  Switch item=RadioPower
+  Slider visibility=[RadioPower==ON] item=RadioVolume
+  Switch visibility=[RadioPower==ON] item=RadioMute
+  Selection visibility=[RadioPower==ON] item=RadioPreset mappings=[0="Favourit 1", 1="Favourit 2", 2="Favourit 3", 3="Favourit 4"]
+  Selection visibility=[RadioPower==ON] item=RadioMode mappings=[0="Internet Radio", 1="Musik Player", 2="DAB", 3="FM", 4="AUX"]
+  Text visibility=[RadioPower==ON] item=RadioInfo1
+  Text visibility=[RadioPower==ON] item=RadioInfo2
+ }
 }
 ```
diff --git a/bundles/org.openhab.binding.ftpupload/README.md b/bundles/org.openhab.binding.ftpupload/README.md
index 8ee0f6ac7baaa..f3f3653946b67 100644
--- a/bundles/org.openhab.binding.ftpupload/README.md
+++ b/bundles/org.openhab.binding.ftpupload/README.md
@@ -33,7 +33,6 @@ The `ftpupload` Thing has the following configuration parameters:
 | userName                    | User name to login to the FTP server. User name is used to identify the Thing, so it should be unique per Thing.    | yes      |               |
 | password                    | Password to login to the FTP server.                                                                                | yes      |               |
 
-
 ## Channels
 
 This binding currently supports the following channels:
@@ -54,7 +53,6 @@ Image channel supports following options:
 |-------------|--------------|--------------------------------------------------------------------------|----------|---------------|
 | filename    | Filename     | Filename to match received files. Supports regular expression patterns.  | yes      | .*            |
 
-
 ### Trigger Channels
 
 | Channel Type ID | Options                | Description                                         |
@@ -64,7 +62,7 @@ Image channel supports following options:
 When an image file is uploaded to FTP server, the binding tries to find the trigger channel whose filename matches the upload image filename.
 If no match is found, no channel is updated.
 The filename parameter supports regular expression patterns.
-See more details in the Things example. 
+See more details in the Things example.
 
 Trigger channels supports following options:
 
@@ -76,7 +74,7 @@ Trigger channels supports following options:
 
 Things:
 
-```
+```java
 Thing ftpupload:imagereceiver:images1 [ userName="test1", password="12345" ] {
 
 Thing ftpupload:imagereceiver:images2 [ userName="test2", password="12345" ] {
@@ -98,14 +96,14 @@ Thing ftpupload:imagereceiver:images2 [ userName="test2", password="12345" ] {
 
 Items:
 
-```
+```java
 Image  Image1 { channel="ftpupload:imagereceiver:images1:image" }
 Image  Image2 { channel="ftpupload:imagereceiver:images2:my_image1" }
 ```
 
 Rules:
 
-```
+```java
 rule "example trigger rule 1"
 when
     Channel 'ftpupload:imagereceiver:images1:image-received' triggered IMAGE_RECEIVED 
@@ -124,7 +122,7 @@ end
 
 Sitemap:
 
-```
+```perl
 Frame label="FTP images" {
     Image item=Image1
     Image item=Image2
@@ -137,19 +135,19 @@ The binding can be used to receive images from network cameras that send images
 
 Things:
 
-```
+```java
 Thing ftpupload:imagereceiver:garagecamera [ userName="garage", password="12345" ]
 ```
 
 Items:
 
-```
+```java
 Image  Garage_NetworkCamera_Motion_Image { channel="ftpupload:imagereceiver:garagecamera:image" }
 ```
 
 Rules:
 
-```
+```java
 rule "example trigger rule"
 when
     Channel 'ftpupload:imagereceiver:garagecamera:image-received' triggered IMAGE_RECEIVED 
@@ -160,7 +158,7 @@ end
 
 Sitemap:
 
-```
+```perl
 Frame label="Garage network camera" icon="camera" {
     Image item=Garage_NetworkCamera_Motion_Image
 }
@@ -170,13 +168,13 @@ Frame label="Garage network camera" icon="camera" {
 
 For problem solving, if binding logging is not enough, Apache FTP server logging can also be enabled by the following command in the Karaf console:
 
-```
+```shell
 log:set DEBUG org.apache.ftpserver
 ```
 
 and set back to default level:
 
-```
+```shell
 log:set DEFAULT org.apache.ftpserver
 ```
 
diff --git a/bundles/org.openhab.binding.gardena/README.md b/bundles/org.openhab.binding.gardena/README.md
index e0fdf7eaa159a..bbf7b6f5501a5 100644
--- a/bundles/org.openhab.binding.gardena/README.md
+++ b/bundles/org.openhab.binding.gardena/README.md
@@ -33,10 +33,10 @@ There are several settings for an account:
 
 ### Obtaining your API Key
 
-1. Goto https://developer.husqvarnagroup.cloud/, sign in using your GARDENA smart system account and accept the terms of use
-2. Create and save a new application via the 'Create application' button. The Redirect URLs do not matter, you can enter what you want (e.g. http://localhost:8080)
-3. Connect both _Authentication API_ and _GARDENA smart system API_ to your application via the 'Connect new API' button
-4. Copy the application key to use with this binding as _apiKey_
+1. Goto <https://developer.husqvarnagroup.cloud/>, sign in using your GARDENA smart system account and accept the terms of use
+1. Create and save a new application via the 'Create application' button. The Redirect URLs do not matter, you can enter what you want (e.g. <http://localhost:8080>)
+1. Connect both _Authentication API_ and _GARDENA smart system API_ to your application via the 'Connect new API' button
+1. Copy the application key to use with this binding as _apiKey_
 
 ## Examples
 
@@ -85,7 +85,7 @@ Sensor refresh commands are not yet supported by the Gardena smart system integr
 
 ### Example configuration
 
-```
+```java
 // smart Water Control
 String  WC_Valve_Activity                 "Valve Activity" { channel="gardena:water_control:home:myWateringComputer:valve#activity" }
 Number  WC_Valve_Duration                 "Last Watering Duration [%d min]" { channel="gardena:water_control:home:myWateringComputer:valve#duration" }
@@ -100,7 +100,7 @@ openhab:status WC_Valve_Activity // returns the current valve activity  (CLOSED|
 
 All channels are read-only, except the command group and the lastUpdate timestamp
 
-```
+```shell
 openhab:send WC_Valve_cmd_Duration.sendCommand(10) // set the duration for the command to 10min
 openhab:send WC_Valve_cmd_OpenWithDuration.sendCommand(ON) // start watering
 openhab:send WC_Valve_cmd_CloseValve.sendCommand(ON) // stop any active watering
@@ -108,9 +108,11 @@ openhab:send WC_Valve_cmd_CloseValve.sendCommand(ON) // stop any active watering
 
 If you send a REFRESH command to the last update timestamp (no matter which thing), **ALL** items from **ALL** things are updated
 
-```
+```java
 DateTime LastUpdate "LastUpdate [%1$td.%1$tm.%1$tY %1$tH:%1$tM]" { channel="gardena:water_control:home:myWateringComputer:common#lastUpdate_timestamp" }
+```
 
+```shell
 // refresh ALL items
 openhab:send LastUpdate REFRESH
 ```
@@ -133,31 +135,31 @@ Attempting to force reconnect within the 24 hours causes the call rate to be exc
 
 If you want to see what's going on in the binding, switch the loglevel to TRACE in the Karaf console
 
-```
+```shell
 log:set TRACE org.openhab.binding.gardena
 ```
 
 Set the logging back to normal
 
-```
+```shell
 log:set INFO org.openhab.binding.gardena
 ```
 
-**Notes and known limitations:** 
+**Notes and known limitations:**
 When the binding sends a command to a device, it communicates only with the Gardena smart system integration API.
 It has no control over whether the command is sent from the online service via your gateway to the device.
 It is the same as if you send the command in the Gardena App.
 
 Schedules, sensor-refresh commands, irrigation control master valve configuration etc. are not supported.
 This binding relies on the GARDENA smart system integration API.
-Further API documentation: https://developer.1689.cloud/apis/GARDENA+smart+system+API
+Further API documentation: <https://developer.1689.cloud/apis/GARDENA+smart+system+API>
+
+### Troubleshooting
 
-###Troubleshooting
 Occasionally it can happen that the API key is no longer valid.
 
-```
+```text
 HTTP protocol violation: Authentication challenge without WWW-Authenticate header
 ```
 
 If this error message appears in the log file, simply renew or delete/create a new API key as described in 'Obtaining your API Key' and restart openHAB.
-
diff --git a/bundles/org.openhab.binding.gce/README.md b/bundles/org.openhab.binding.gce/README.md
index 0e57097f1cee7..42479fbe27ab2 100644
--- a/bundles/org.openhab.binding.gce/README.md
+++ b/bundles/org.openhab.binding.gce/README.md
@@ -3,30 +3,29 @@
 This binding aims to handle various GCE Electronics equipments.
 IPX800 is a 8 relay webserver from gce-electronics with a lot of possibilities:
 
-* 8 Digital Input
-* 8 Relay (250V / 10A / channel)
-* 4 Analog Input
-* 8 Counters
-* Ability to cascade up to 3 extensions for a total of 32 inputs / 32 relay
+- 8 Digital Input
+- 8 Relay (250V / 10A / channel)
+- 4 Analog Input
+- 8 Counters
+- Ability to cascade up to 3 extensions for a total of 32 inputs / 32 relay
 
 Each IPX800 connected to openHAB must be configured with the setting 'Send data on status changed' on the website in M2M > TCP client.
 
-To make it simple, IPX800 is a simple device that drives output and retrieves input. 
+To make it simple, IPX800 is a simple device that drives output and retrieves input.
 On input we generally connect push buttons (for instance house switchs), on ouputs we can connect light bulbs for instance.
 
 Features of the binding:
 
- * Multi ipx support
- * Direct TCP connection
- * Auto reconnect
- * Simple clic/Long press
- * Pulse mode support
+- Multi ipx support
+- Direct TCP connection
+- Auto reconnect
+- Simple clic/Long press
+- Pulse mode support
 
 ## Binding Configuration
 
 There is no configuration at binding level.
 
-
 ## Thing Configuration
 
 The IPX800v3 (ID : 'ipx800v3') accepts the following configuration parameters :
@@ -44,7 +43,7 @@ The thing provides four groups of channels.
 
 ### Digital Inputs
 
-This represents the inputs of the PLC. Each can be open or closed. 
+This represents the inputs of the PLC. Each can be open or closed.
 They are usually commuted by physical devices like pushbuttons, magnets...
 
 #### Digital Input Channels (contacts)
@@ -76,8 +75,7 @@ Associated events:
 | pulsePeriod     |    0(*) | ms   | Period of pulse event triggering while the entry is closed. Ignored if '0'.     |
 | pulseTimeout    |    0(*) | ms   | Period of time after pulsing will be stopped. None if '0'.                      |
 
-* Values below 100ms should be avoided as the JVM could skip them and proceed in the same time slice.
-
+- Values below 100ms should be avoided as the JVM could skip them and proceed in the same time slice.
 
 ### Digital Outputs Channels (relays)
 
@@ -123,14 +121,13 @@ Each analog port will have these associated channels:
 |------------|---------|-------------------------------------------------------------------------------------|
 | hysteresis |    0    | If set, the channel will ignore status if change (+ or -) is less than hysteresis/2 |
 
-
 ## Rule Actions
 
 Multiple actions are supported by this binding. In classic rules these are accessible as shown in the example below:
 
 Getting ipxActions variable in scripts
 
-```
+```java
  val ipxActions = getActions("gce","gce:ipx800v3:43cc8d07")
  if(null === ipxActions) {
         logInfo("actions", "ipxActions not found, check thing ID")
@@ -144,14 +141,13 @@ Getting ipxActions variable in scripts
 
 Resets the value of the given counter to 0.
 
-* `counterId` (Integer) - id of the counter.
-
+- `counterId` (Integer) - id of the counter.
 
 ### reset(placeholder)
 
 Restarts the PLC.
 
-* `placeholder` (Integer) - This parameter is not used (can be null).
+- `placeholder` (Integer) - This parameter is not used (can be null).
 
 ## Example
 
diff --git a/bundles/org.openhab.binding.generacmobilelink/README.md b/bundles/org.openhab.binding.generacmobilelink/README.md
index 5463dfd267535..4b42a9517bf9e 100644
--- a/bundles/org.openhab.binding.generacmobilelink/README.md
+++ b/bundles/org.openhab.binding.generacmobilelink/README.md
@@ -4,7 +4,6 @@ This binding communicates with the Generac MobileLink API and reports on the sta
 
 ## Supported Things
 
-
 ### MobileLink Account
 
 A MobileLink account bridge thing represents a user's MobileLink account and is responsible for authentication and polling for updates.
@@ -31,12 +30,11 @@ The MobileLink account bridge must be added manually. Once added, generator thin
 | password        | The password used to login to the MobileLink service                               |
 | refreshInterval | The frequency to poll for generator updates, minimum duration is 30 seconds        |
 
-
 ## Channels
 
 ### Generator Channels
 
-All channels are read-only. 
+All channels are read-only.
 
 | channel                 | type                 | description                               |
 |-------------------------|----------------------|-------------------------------------------|
@@ -55,12 +53,11 @@ All channels are read-only.
 | batteryVoltage          | String               | Battery voltage status                    |
 | serviceStatus           | Switch               | Service status                            |
 
-
 ## Full Example
 
 ### Things
 
-```xtend
+```java
 Bridge generacmobilelink:account:main "MobileLink Account" [ userName="foo@bar.com", password="secret",refreshInterval=60 ] {
     Thing generator 123456 "MobileLink Generator" [ generatorId="123456" ]
 }
@@ -68,7 +65,7 @@ Bridge generacmobilelink:account:main "MobileLink Account" [ userName="foo@bar.c
 
 ### Items
 
-```xtend
+```java
 Switch GeneratorConnected "Connected [%s]" {channel="generacmobilelink:generator:main:123456:connected"}
 Switch GeneratorGreenLight "Green Light [%s]" {channel="generacmobilelink:generator:main:123456:greenLight"}
 Switch GeneratorYellowLight "Yellow Light [%s]" {channel="generacmobilelink:generator:main:123456:yellowLight"}
@@ -80,7 +77,7 @@ String GeneratorAlarm "Alarm [%s]" {channel="generacmobilelink:generator:main:12
 
 ### Sitemap
 
-```xtend
+```perl
 sitemap MobileLink label="Demo Sitemap" {
   Frame label="Generator" {
     Switch item=GeneratorConnected
diff --git a/bundles/org.openhab.binding.globalcache/README.md b/bundles/org.openhab.binding.globalcache/README.md
index a32d2210c9037..4348930b93c31 100644
--- a/bundles/org.openhab.binding.globalcache/README.md
+++ b/bundles/org.openhab.binding.globalcache/README.md
@@ -112,7 +112,7 @@ parameters for **baud rate**, **flow control**, and **parity** to match the conf
 
 ### Manual Thing Creation
 
-Devices can be created in the *UI*, or by placing a *.things* file in the *conf/things* directory.
+Devices can be created in the _UI_, or by placing a _.things_ file in the _conf/things_ directory.
 See example below.
 
 ### Binding Dependencies
@@ -125,26 +125,26 @@ GlobalCache GC-100, iTach, and Zmote devices emit an **announcement beacon** eve
 The GlobalCache binding will automatically detect those devices, then add them to the inbox.
 
 Background discovery is **enabled** by default.
-To disable background discovery, add the following line to the *conf/services/runtime.cfg* file:
+To disable background discovery, add the following line to the _conf/services/runtime.cfg_ file:
 
 ```text
 discovery.globalcache:background=false
 ```
 
 Note that automatic device discovery **will not work** with GC-100's running firmware earlier than v3.0 as those versions do not emit announcement beacons on the multicast address.
-GC-100's running firmware earlier than v3.0 must be configured manually, either through the *UI* or using a *.things* file.
+GC-100's running firmware earlier than v3.0 must be configured manually, either through the _UI_ or using a _.things_ file.
 See below.
 
 ## Channels and Channel Types
 
-There are four *channel types* used across the GC-100 and iTach family of devices.
+There are four _channel types_ used across the GC-100 and iTach family of devices.
 
 - Contact Closure (CC)
 - Infrared (IR)
 - Serial (SL)
 - Serial Direct (SL)
 
-*Channels* follow a naming convention that relates to the physical configuration of the Global Cache device -- specifically the **module** and **connector** numbers.
+_Channels_ follow a naming convention that relates to the physical configuration of the Global Cache device -- specifically the **module** and **connector** numbers.
 For example, the channel name **m2c3** refers to connector 3 on module 2.
 
 For iTach Flex devices, since they can be configured to support infrared, serial, or contact closure, channels are prefixed with ir-, sl-, and cc-, respectively.
@@ -152,7 +152,7 @@ For example, the IR channel on connector 3 on module 1 is named ir-m1c2.
 
 ## Infrared (IR) Channel
 
-The *Infrared channel* sends IR codes out the IR connector on the device.
+The _Infrared channel_ sends IR codes out the IR connector on the device.
 For example, the following item links to the module 1 / connector 2 channel on an iTach IR device.
 
 ```java
@@ -192,30 +192,30 @@ There are numerous other sources of IR codes, such as iRule and RemoteCentral.
 
 #### Unsupported Features
 
-Currently, only the *IR Out* and *IR Blaster* connector configurations are supported.
-Other settings, such as *Sensor In*, *Sensor Notify*, and *LED Lighting*, may be supported in the future.
+Currently, only the _IR Out_ and _IR Blaster_ connector configurations are supported.
+Other settings, such as _Sensor In_, _Sensor Notify_, and _LED Lighting_, may be supported in the future.
 
 ## Contact Closure (CC) Channel
 
-A *Contact Closure channel* activates the contact closure (relay) on the iTach or GC-100 device.
+A _Contact Closure channel_ activates the contact closure (relay) on the iTach or GC-100 device.
 For example, the following item links to the module 1, connector 1 channel on an iTach CC device.
 
-```
+```java
 Switch MyRelay    "My Relay [%s]"  (gRelays)   { channel="globalcache:itachCC:000C1E039BCF:cc-m1#c1" }
 ```
 
 The item definition for an iTach Flex WiFi device would look like this.
 
-```
+```java
 String MyRelay     "My Relay [%s]"  (gRelays)   { channel="globalcache:itachFlex:000C01AF4990:cc-m1#c1" }
 ```
 
 ## Serial (SL) Channel
 
-An *SL channel* sends serial command strings out the serial connector on the device.
+An _SL channel_ sends serial command strings out the serial connector on the device.
 For example, the following item links to the module 1 connector 1 channel on a GC-100-6 device.
 
-```
+```java
 String RS232ME      "My RS232-controlled Device"   { channel="globalcache:gc100_6:000C459A120A:sl-m1#c1" }
 ```
 
@@ -229,7 +229,7 @@ The Serial Direct channel type enables serial commands to be sent directly to th
 This is useful in rules where the serial command might be constructed "on the fly" in the body of the rule.
 For example, the following item links to the module 1 connector 1 channel on an iTach Flex device.
 
-```
+```java
 String RUSSCAA66    "Russound CAA66"   { channel="globalcache:itachFlex:000C45D530B9:sl-m1#c1-direct" }
 ```
 
@@ -244,7 +244,7 @@ Use URL encoding for non-printable characters.
 For example, the following item links to the receive channel on module 1 connector 1 on a GC-100.
 A rule that looks for updates on this item will be able to process messages sent from the device connected to the GlobalCache's serial port.
 
-```
+```java
 String RUSSCAA66_Receive    "Russound CAA66 Receive"   { channel="globalcache:gc100_06:000C1EFFF039:sl-m1#c1-receive" }
 ```
 
@@ -256,9 +256,9 @@ Here are some examples of common **End-ofMessage** delimiters.
 %F7         Russound RNET message terminator
 ```
 
-**Example**
+### Example
 
-### MAP File
+#### MAP File
 
 ```text
 # Harmon Kardon AVR-245 Home Theater Receiver
@@ -292,9 +292,9 @@ RS232ME_VOLUME_UP   = VOLUME%20UP%0D%0A
 RS232ME_VOLUME_DOWN = VOLUME%20DOWN%0D%0A
 ```
 
-### Items File
+#### Items File
 
-```
+```java
 Switch ContactClosure1  "Relay on Connector 1"              { channel="globalcache:itachCC:000C1E017BCF:cc-m1#c1" }
 Switch ContactClosure2  "Relay on Connector 2"              { channel="globalcache:itachCC:000C1E017BCF:cc-m1#c2" }
 Switch ContactClosure3  "Relay on Connector 3"              { channel="globalcache:itachCC:000C1E017BCF:cc-m1#c3" }
@@ -313,11 +313,11 @@ String RUSSCAA66        "Russound CAA66"                    { channel="globalcac
 String ZSAMSUNGHLS      "Samsung HL-S DLP TV"               { channel="globalcache:zmote:CI00073306:ir-m1-c1#c1" }
 ```
 
-### Sitemap File
+#### Sitemap File
 
 This is an example of how to use contact closure, infrared, and serial devices in a sitemap.
 
-```
+```perl
 Frame label="Contact Closure" {
     Switch item=ContactClosure1 label="Open/Close Garage Door"
     Switch item=ContactClosure2 label="Light on Garage Door Opener"
@@ -347,11 +347,11 @@ Frame label="Garage Door" {
 }
 ```
 
-### Rule file
+#### Rule file
 
 This is an example of how to use a Contact Closure channel within a rule to implement a momentary contact switch, which could be used to trigger a garage door opener.
 
-```
+```java
 var boolean isRunning = false
 
 rule "Example Garage Door Opener"
@@ -370,7 +370,7 @@ end
 
 This is an example of how to send IR and/or serial commands from within a rule.
 
-```
+```java
 rule "AV Power On/Off"
 when
     Item AVPowerOn received command
@@ -388,7 +388,7 @@ end
 
 This is an example of how to send a serial command directly from within a rule.
 
-```
+```java
 rule "Russound Set Zone 1 Volume to 20"
 when
     Item RussoundSetVolume received command
@@ -399,10 +399,10 @@ end
 
 ### Manual Thing Creation
 
-Place a file named *globalcache.things* in the *conf/things* directory.
+Place a file named _globalcache.things_ in the _conf/things_ directory.
 The file should contain lines formatted like this.
 
-```
+```java
 globalcache:itachCC:000CFF17B106 [ ipAddress="192.168.12.62" ]
 globalcache:itachIR:000C0B1E54A0 [ ipAddress="192.168.12.63", mapFilename="ir-codes.map" ]
 globalcache:itachSL:000CF886B107 [ ipAddress="192.168.12.64", mapFilename="serial-codes.map"  ]
diff --git a/bundles/org.openhab.binding.goecharger/README.md b/bundles/org.openhab.binding.goecharger/README.md
index d777fb3d73d4b..7e10dd15074ee 100644
--- a/bundles/org.openhab.binding.goecharger/README.md
+++ b/bundles/org.openhab.binding.goecharger/README.md
@@ -23,7 +23,7 @@ The apiVersion 2 is only available for Go-eCharger with new hardware revision (C
 
 ## Channels
 
-Currently available channels are 
+Currently available channels are
 | Channel ID               | Item Type                | Description                                                   | API version       |
 |--------------------------|--------------------------|---------------------------------------------------------------|-------------------|
 | maxCurrent               | Number:ElectricCurrent   | Maximum current allowed to use for charging                   | 1 (r/w), 2 (r/w)  |
@@ -57,13 +57,13 @@ Currently available channels are
 
 demo.things
 
-```
+```java
 Thing goecharger:goe:garage [ip="192.168.1.36",refreshInterval=5]
 ```
 
 demo.items
 
-```
+```java
 Number:ElectricCurrent     GoEChargerMaxCurrent                 "Maximum current"                       {channel="goecharger:goe:garage:maxCurrent"}
 Number:ElectricCurrent     GoEChargerMaxCurrentTemp             "Maximum current temporary"             {channel="goecharger:goe:garage:maxCurrentTemp"}
 Number                     GoEChargerForceState                 "Force state"                           {channel="goecharger:goe:garage:forceState"}
@@ -96,7 +96,7 @@ String                     GoEChargerAccessConfiguration        "Access configur
 You can easily define rules to charge with PV power alone.
 Here is a simple sample how such a rule could look like:
 
-```
+```java
 rule "Set max amps for PV charging"
 when
     Item availablePVCurrent received update
@@ -108,7 +108,7 @@ end
 
 Advanced example:
 
-```
+```java
 rule "Set charging limit for go-eCharger"
 when
     Time cron "*/10 * * ? * *" // Trigger every 10 seconds
diff --git a/bundles/org.openhab.binding.gpio/README.md b/bundles/org.openhab.binding.gpio/README.md
index 861fe036a5a70..863d226d20ae6 100644
--- a/bundles/org.openhab.binding.gpio/README.md
+++ b/bundles/org.openhab.binding.gpio/README.md
@@ -1,7 +1,7 @@
 # GPIO Binding
 
 This binding adds GPIO support via the pigpio daemon to openhab.
-It requires the pigpio (http://abyz.me.uk/rpi/pigpio/) to be running on the pi that should be controlled.
+It requires the pigpio (<http://abyz.me.uk/rpi/pigpio/>) to be running on the pi that should be controlled.
 
 ## Supported Things
 
@@ -15,7 +15,7 @@ This thing represents a remote pigpio instance running as daemon on a raspberry
 
 On a raspberry (or a compatible device) you have to install pigpio:
 
-```
+```shell
 sudo apt-get install pigpiod
 sudo raspi-config 
 ```
@@ -24,22 +24,24 @@ sudo raspi-config
 
 Note: if you are setting this up on a Raspberry Pi without `raspi-config` you can create the service config file manually:
 
-```
+```shell
 sudo mkdir -p /etc/systemd/system/pigpiod.service.d/
 sudo nano /etc/systemd/system/pigpiod.service.d/public.conf
 ```
 
-    [Service]
-    ExecStart=
-    ExecStart=/usr/bin/pigpiod
-
+```text
+[Service]
+ExecStart=
+ExecStart=/usr/bin/pigpiod
 ```
+
+```shell
 sudo systemctl daemon-reload
 ```
 
 Now that Remote GPIO is enabled, get the daemon going (even if installed with apt-get):
 
-```
+```shell
 sudo systemctl enable pigpiod 
 sudo systemctl start pigpiod
 ```
@@ -71,10 +73,9 @@ If you want to invert the value, set `invert` to true.
 
 ## Full Example
 
-
 demo.things:
 
-```
+```java
 Thing gpio:pigpio-remote:sample-pi-1 "Sample-Pi 1" [host="192.168.2.36", port=8888] {
     Channels:
         Type pigpio-digital-input : sample-input-1 [ gpioId=10]
@@ -92,14 +93,14 @@ Thing gpio:pigpio-remote:sample-pi-2 "Sample-Pi 2" [host="192.168.2.37", port=88
 
 demo.items:
 
-```
+```java
 Switch SampleInput1 {channel="gpio:pigpio-remote:sample-pi-1:sample-input-1"}
 Switch SampleOutput1 {channel="gpio:pigpio-remote:sample-pi-1:sample-output-1"}
 ```
 
 demo.sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu"
 {
     Switch item=SampleInput1
diff --git a/bundles/org.openhab.binding.gpstracker/README.md b/bundles/org.openhab.binding.gpstracker/README.md
index 80e069431799d..8bc7b964bba50 100644
--- a/bundles/org.openhab.binding.gpstracker/README.md
+++ b/bundles/org.openhab.binding.gpstracker/README.md
@@ -4,8 +4,8 @@ This binding allows you to connect mobile GPS tracker applications to openHAB an
 
 Currently two applications are supported:
 
-* [OwnTracks](https://owntracks.org/booklet/) - iOS, Android
-* [GPSLogger](https://gpslogger.app/) - Android
+- [OwnTracks](https://owntracks.org/booklet/) - iOS, Android
+- [GPSLogger](https://gpslogger.app/) - Android
 
 GPS location reports are sent to openHAB using HTTP.
 Please be aware that this communication uses the public network so make sure your openHAB installation is [secured](https://www.openhab.org/docs/installation/security.html#encrypted-communication) (but accessible from public internet through myopenhab.org or using a reverse proxy) and you configured HTTP**S** access in tracking applications.
@@ -13,8 +13,8 @@ The easiest way to achieve this is to use the [openHAB Cloud Connector](https://
 
 The binding can process two message types received from trackers:
 
-* **Location** - This is a simple location report with coordinates extended with some extra information about the tracker (e.g. tracker device battery level). [OwnTracks, GPSLogger]
-* **Transition** - This report is based on regions defined in tracker application only. A message is sent every time the tracker enters or leaves a region. [OwnTracks only] See "Distance Channel and Presence Switch" how this behavior can be achieved with openHAB's on-board tools.
+- **Location** - This is a simple location report with coordinates extended with some extra information about the tracker (e.g. tracker device battery level). [OwnTracks, GPSLogger]
+- **Transition** - This report is based on regions defined in tracker application only. A message is sent every time the tracker enters or leaves a region. [OwnTracks only] See "Distance Channel and Presence Switch" how this behavior can be achieved with openHAB's on-board tools.
 
 ## Configuration
 
@@ -24,15 +24,15 @@ Install [OwnTracks for Android](https://play.google.com/store/apps/details?id=or
 
 Go to Preferences/Connection and set:
 
-* **Mode** - select Private HTTP
-* **Host**
-  * https://<your.ip.address>/gpstracker/owntracks or
-  * https://home.myopenhab.org/gpstracker/owntracks
-* **Identification**
-  * Turn Authentication ON
-  * Set username and password to be able to reach your openHAB server (myopenhab.org credential, if choosen as host)
-  * Device ID is not important. Set it to e.g. phone
-  * Tracker ID - This id identifies the tracker as a thing. This must be unique for each tracker connected to the same openHAB instance (e.g. family members).
+- **Mode** - select Private HTTP
+- **Host**
+  - `https://<your.ip.address>/gpstracker/owntracks` or
+  - `https://home.myopenhab.org/gpstracker/owntracks`
+- **Identification**
+  - Turn Authentication ON
+  - Set username and password to be able to reach your openHAB server (myopenhab.org credential, if choosen as host)
+  - Device ID is not important. Set it to e.g. phone
+  - Tracker ID - This id identifies the tracker as a thing. This must be unique for each tracker connected to the same openHAB instance (e.g. family members).
 
 ### GPSLogger
 
@@ -40,19 +40,19 @@ Install [GPSLogger for Android](https://github.com/mendhak/gpslogger/releases) o
 After the launch, go to General Options.
 Enable **Start on boot-up** and **Start on app launch**.
 
-Go to *Logging details* and enable **Log to custom URL**.
-If you only want to use GPSLogger for this binding, you can disable all other "*Log to*" entries.
-Right after enabling, the app takes you to the *Log to custom URL* settings:
+Go to _Logging details_ and enable **Log to custom URL**.
+If you only want to use GPSLogger for this binding, you can disable all other "_Log to_" entries.
+Right after enabling, the app takes you to the _Log to custom URL_ settings:
 
-* **URL**
-  * https://<your.ip.address>/gpstracker/gpslogger or
-  * https://home.myopenhab.org/gpstracker/gpslogger
-* **HTTP Body** - type in: { "_type":"location", "lat":%LAT, "lon":%LON, "tid":"XY", "acc":%ACC, "batt":%BATT, "tst":%TIMESTAMP }
-  * Note: "*tid*" is the tracker id that identifies the tracker as a thing. This must be unique for each tracker connected to the same openHAB instance (e.g. family members).
-* **HTTP Headers** - type in: *Content-Type: application/json*
-* **HTTP Method** - type in: *POST*
-* **Basic Authentication** - Set username and password to be able to reach your openHAB server (myopenhab.org credential, if choosen as URL)
-* Check if everything is ok by clicking on **Validate SSL Certificate**.
+- **URL**
+  - `https://<your.ip.address>/gpstracker/gpslogger` or
+  - `https://home.myopenhab.org/gpstracker/gpslogger`
+- **HTTP Body** - type in: { "_type":"location", "lat":%LAT, "lon":%LON, "tid":"XY", "acc":%ACC, "batt":%BATT, "tst":%TIMESTAMP }
+  - Note: "_tid_" is the tracker id that identifies the tracker as a thing. This must be unique for each tracker connected to the same openHAB instance (e.g. family members).
+- **HTTP Headers** - type in: _Content-Type: application/json_
+- **HTTP Method** - type in: _POST_
+- **Basic Authentication** - Set username and password to be able to reach your openHAB server (myopenhab.org credential, if choosen as URL)
+- Check if everything is ok by clicking on **Validate SSL Certificate**.
 
 ### Things
 
@@ -68,11 +68,11 @@ If the things are not defined in **.things** files the first time the tracker se
 
 Basic channels provided by the tracker things:
 
-* **Location** - Current location of the tracker
-* **Accuracy** - GPS accuracy
-* **Last Report** - Timestamp of the last location report
-* **Battery Level** - Battery level of the device running the tracker application
-* **Region trigger channel** - Used by regions defined in tracker application. Event is fired with payload of the region name when the binding receives a **transition** log record or a distance calculation for a **location** record indicates that the tracker is outside of the region circle. Payload is suffixed with `/enter` for entering and with `/leave` for leaving events.
+- **Location** - Current location of the tracker
+- **Accuracy** - GPS accuracy
+- **Last Report** - Timestamp of the last location report
+- **Battery Level** - Battery level of the device running the tracker application
+- **Region trigger channel** - Used by regions defined in tracker application. Event is fired with payload of the region name when the binding receives a **transition** log record or a distance calculation for a **location** record indicates that the tracker is outside of the region circle. Payload is suffixed with `/enter` for entering and with `/leave` for leaving events.
 
 #### Distance Calculation
 
@@ -90,8 +90,8 @@ Distance values will be updated each time a GPS location log record is received
 
 When this calculated distance is less than the defined geofence radius the binding also fires event on Region Trigger channel.
 
-* When the tracker is approaching (the new calculated distance is less then the previous one) the payload is <<region_name>>/enter.
-* If the tracker is distancing (the new calculated distance is greater then the previous one) payload is <<region_name>>/leave.
+- When the tracker is approaching (the new calculated distance is less then the previous one) the payload is <<region_name>>/enter.
+- If the tracker is distancing (the new calculated distance is greater then the previous one) payload is <<region_name>>/leave.
 
 If the tracker is moving inside/outside the region (both the previous and the current calculated distance value is less/greater than the radius) no events are fired.
 This means that the region events are triggered **ONLY IN CASE THE REGION BORDER IS CROSSED**.
@@ -105,8 +105,8 @@ These events are fired in case of distance channels as well when the tracker cro
 In order to have this state available in stateful switch items (e.g. for rule logic) switch type items can be linked to **regionTrigger** channel.
 There is a special profile (gpstracker:trigger-geofence) that transforms trigger enter/leave events to switch states:
 
-* **<<region_name>>/enter** will update the switch state to **ON**
-* **<<region_name>>/leave** will update the switch state to **OFF**
+- **<<region_name>>/enter** will update the switch state to **ON**
+- **<<region_name>>/leave** will update the switch state to **OFF**
 
 To link a switch item to regionTrigger channel the following parameters are required by the item link:
 
@@ -119,7 +119,7 @@ To link a switch item to regionTrigger channel the following parameters are requ
 
 ### Things
 
-```
+```java
 //tracker definition
 Thing gpstracker:tracker:1   "XY tracker" [trackerId="XY"]
 
@@ -137,12 +137,12 @@ Thing gpstracker:tracker:EX   "EX tracker" [trackerId="EX"] {
 
 ### Items
 
-```
+```java
 //items for basic channels
-Location	locationEX	"Location"		{channel="gpstracker:tracker:1:lastLocation"}
-DateTime	lastSeenEX	"Last seen"		{channel="gpstracker:tracker:1:lastReport"}
-Number		batteryEX	"Battery level"		{channel="gpstracker:tracker:1:batteryLevel"}
-Number:Length		accuracyEX	"GPS Accuracy [%d m]"		{channel="gpstracker:tracker:1:gpsAccuracy"}
+Location locationEX "Location"  {channel="gpstracker:tracker:1:lastLocation"}
+DateTime lastSeenEX "Last seen"  {channel="gpstracker:tracker:1:lastReport"}
+Number  batteryEX "Battery level"  {channel="gpstracker:tracker:1:batteryLevel"}
+Number:Length  accuracyEX "GPS Accuracy [%d m]"  {channel="gpstracker:tracker:1:gpsAccuracy"}
 
 //linking switch item to regionTrigger channel. assuming the Home distance channel is defined in the binding config (see above)
 Switch atHomeEX "Home presence" {channel="gpstracker:tracker:EX:regionTrigger" [profile="gpstracker:trigger-geofence", regionName="Home"]}
@@ -153,7 +153,7 @@ Switch atWorkEX "Work presence" {channel="gpstracker:tracker:EX:regionTrigger" [
 
 ### Sitemaps
 
-```
+```perl
 sitemap gpstracker label="GPSTracker Binding" {
     Text item=distanceEX
     Text item=atWorkEX
@@ -172,7 +172,7 @@ In order to see detailed debug information [set TRACE debug level](https://www.o
 
 ### Binding Start
 
-```
+```text
 2018-10-03 18:12:38.950 [DEBUG] [org.openhab.binding.gpstracker      ] - ServiceEvent REGISTERED - {org.openhab.core.config.discovery.DiscoveryService, org.openhab.binding.gpstracker.internal.discovery.TrackerDiscoveryService}={service.id=425, service.bundleid=183, service.scope=bundle, component.name=org.openhab.binding.gpstracker.internal.discovery.TrackerDiscoveryService, component.id=268} - org.openhab.binding.gpstracker
 2018-10-03 18:12:38.965 [DEBUG] [org.openhab.binding.gpstracker      ] - ServiceEvent REGISTERED - {org.openhab.core.thing.binding.ThingHandlerFactory, org.openhab.core.config.core.ConfigOptionProvider}={location=47.536178,19.169812, service.id=426, service.bundleid=183, service.scope=bundle, radius=100, name=Home, component.name=org.openhab.binding.gpstracker.internal.GPSTrackerHandlerFactory, component.id=267, additionalRegionsJSON=[
 ], triggerEvent=false, service.pid=binding.gpstracker} - org.openhab.binding.gpstracker
@@ -187,7 +187,7 @@ In order to see detailed debug information [set TRACE debug level](https://www.o
 
 Please note the lines about started servlets:
 
-```
+```text
 Started GPSTracker Callback servlet on /gpstracker/owntracks
 Started GPSTracker Callback servlet on /gpstracker/gpslogger
 ```
@@ -196,7 +196,7 @@ Started GPSTracker Callback servlet on /gpstracker/gpslogger
 
 In case the discovery is used the first message from a tracker registers it in the inbox:
 
-```
+```text
 2018-10-05 08:36:14.283 [DEBUG] [nal.provider.AbstractCallbackServlet] - Post message received from OwnTracks tracker: {"_type":"location","tid":"XX","acc":10.0,"lat":41.53,"lon":16.16,"tst":1527966973,"wtst":1524244195,"batt":96}
 2018-10-05 08:36:14.286 [DEBUG] [nal.provider.AbstractCallbackServlet] - There is no handler for tracker XX. Check the inbox for the new tracker.
 ```
@@ -205,7 +205,7 @@ In case the discovery is used the first message from a tracker registers it in t
 
 The next location message already calculates the distance for System location:
 
-```
+```text
 2018-10-05 08:38:33.916 [DEBUG] [nal.provider.AbstractCallbackServlet] - Post message received from OwnTracks tracker: {"_type":"location","tid":"XX","acc":10.0,"lat":41.53,"lon":16.16,"tst":1527966973,"wtst":1524244195,"batt":96}
 2018-10-05 08:38:33.917 [DEBUG] [cker.internal.handler.TrackerHandler] - Update base channels for tracker XX from message: org.openhab.binding.gpstracker.internal.message.LocationMessage@31dfed63
 2018-10-05 08:38:33.941 [TRACE] [cker.internal.handler.TrackerHandler] - batteryLevel -> 96
@@ -220,20 +220,20 @@ The next location message already calculates the distance for System location:
 
 Assumptions:
 
-* A Home distance channel is added to the tracker with parameters:
-  * Channel ID: distanceHome
-  * Region Name: Home
-  * Region Radius: 100
-  * Region Center: 42.53,16.16
-* Presence switch is linked to the regionTrigger channel with parameters:
-  * Profile: Geofence(gpstracker:trigger-geofence)
-  * Region Name: Home
+- A Home distance channel is added to the tracker with parameters:
+  - Channel ID: distanceHome
+  - Region Name: Home
+  - Region Radius: 100
+  - Region Center: 42.53,16.16
+- Presence switch is linked to the regionTrigger channel with parameters:
+  - Profile: Geofence(gpstracker:trigger-geofence)
+  - Region Name: Home
 
 ![Image](doc/example.png)
 
 After a location message received from the tracker the log should contain these lines:
 
-```
+```text
 2018-10-05 09:27:58.768 [DEBUG] [nal.provider.AbstractCallbackServlet] - Post message received from OwnTracks tracker: {"_type":"location","tid":"XX","acc":10.0,"lat":42.53,"lon":17.16,"tst":1527966973,"wtst":1524244195,"batt":96}
 2018-10-05 09:27:58.769 [DEBUG] [cker.internal.handler.TrackerHandler] - Update base channels for tracker XX from message: org.openhab.binding.gpstracker.internal.message.LocationMessage@67e5d438
 2018-10-05 09:27:58.770 [TRACE] [cker.internal.handler.TrackerHandler] - batteryLevel -> 96
@@ -253,12 +253,12 @@ After a location message received from the tracker the log should contain these
 
 Assumptions:
 
-* A **shared** region is defined in OwnTracks application. Lets call it Work.
-* Presence switch is linked to the regionTrigger channel with parameters:
-  * Profile: Geofence(gpstracker:trigger-geofence)
-  * Region Name: Work
+- A **shared** region is defined in OwnTracks application. Lets call it Work.
+- Presence switch is linked to the regionTrigger channel with parameters:
+  - Profile: Geofence(gpstracker:trigger-geofence)
+  - Region Name: Work
 
-```
+```text
 2018-10-05 09:35:27.203 [DEBUG] [nal.provider.AbstractCallbackServlet] - Post message received from OwnTracks tracker: {"_type":"transition","tid":"XX","acc":10.0,"desc":"Work","event":"enter","lat":42.53,"lon":18.22,"tst":1527966973,"wtst":1524244195,"t":"c"}
 2018-10-05 09:35:27.204 [DEBUG] [cker.internal.handler.TrackerHandler] - ConfigHelper transition event received: Work
 2018-10-05 09:35:27.204 [DEBUG] [cker.internal.handler.TrackerHandler] - Update base channels for tracker XX from message: org.openhab.binding.gpstracker.internal.message.TransitionMessage@5e5b0d59
@@ -275,5 +275,5 @@ Assumptions:
 
 **Note**:
 
-* If the binding was restarted only the second transition update will trigger event as the binding has to know the previous state.
-* The distance is not calculated for Work as the binding doesn't know the Work region center.
+- If the binding was restarted only the second transition update will trigger event as the binding has to know the previous state.
+- The distance is not calculated for Work as the binding doesn't know the Work region center.
diff --git a/bundles/org.openhab.binding.gree/README.md b/bundles/org.openhab.binding.gree/README.md
index f0c9faf2c6f8a..589198b295eb0 100644
--- a/bundles/org.openhab.binding.gree/README.md
+++ b/bundles/org.openhab.binding.gree/README.md
@@ -2,7 +2,7 @@
 
 This binding integrates Air Conditioners that use the GREE protocol (GREE, Sinclair and others).
 
-Note: The Air Conditioner must already be set-up on the WiFi network and must have a fixed IP Address.     
+Note: The Air Conditioner must already be set-up on the WiFi network and must have a fixed IP Address.
 
 ## Supported Things
 
@@ -11,7 +11,7 @@ This binding supports one Thing type `airconditioner`.
 ## Discovery
 
 Once the Air Conditioner is on the network (WiFi active) it could be discovered automatically.
-An IP broadcast message is sent and every responding unit gets added to the Inbox. 
+An IP broadcast message is sent and every responding unit gets added to the Inbox.
 
 ## Binding Configuration
 
@@ -26,7 +26,7 @@ No binding configuration is required.
 | refresh                  | Integer    | Refresh interval in seconds for polling the device status.                                    |
 | currentTemperatureOffset | Decimal    | Offset in Celsius for the current temperature value received from the device.                 |
 
-The Air Conditioner's IP address is mandatory, all other parameters are optional. 
+The Air Conditioner's IP address is mandatory, all other parameters are optional.
 If the broadcast is not set (default) it will be derived from openHAB's network setting (Check Network Settings in the openHAB UI).
 Only change this if you have a good reason to.
 
@@ -57,20 +57,19 @@ The following channels are supported for fans:
 | light              | Switch    | Enable/disable the front display on the Air Conditioner if applicable to the Air Conditioner model|
 |                    |           | Full Swing: 1, Up: 2, MidUp: 3, Mid: 4, Mid Down: 5, Down : 6                                     |
 
-
 When changing mode, the air conditioner will be turned on unless "off" is selected.
 
 ## Full Example
 
-**Things**
+### Things
 
-```
+```java
 Thing gree:airconditioner:a1234561 [ ipAddress="192.168.1.111", refresh=2 ]
 ```
 
-**Items**
+### Items
 
-```
+```java
 Switch AirconPower                  { channel="gree:airconditioner:a1234561:power" }
 String AirconMode                   { channel="gree:airconditioner:a1234561:mode" }
 Switch AirconTurbo                  { channel="gree:airconditioner:a1234561:turbo" }
@@ -86,11 +85,11 @@ Switch AirconHealth                 { channel="gree:airconditioner:a1234561:heal
 Switch AirconPowerSaving            { channel="gree:airconditioner:a1234561:powersave" }
 ```
 
-**Sitemap**
+### Sitemap
 
 This is an example of how to set up your sitemap.
 
-```
+```perl
 Frame label="Controls"
 {
    Switch item=AirconMode label="Mode" mappings=["auto"="Auto", "cool"="Cool", "eco"="Eco", "dry"="Dry", "fan"="Fan", "turbo"="Turbo", "heat"="Heat", "on"="ON", "off"="OFF"]
@@ -120,13 +119,13 @@ Frame label="Options"
 }
 ```
 
-**Example**
+## Example
 
 This example shows how to make a GREE Air Conditioner controllable by Google HA (A/C mode + temperature)
 
-**Items**
+### Items
 
-```
+```java
 Group Gree_Modechannel              "Gree"                { ga="Thermostat" } // allows mapping for Google Home Assistent
 Switch   GreeAirConditioner_Power   "Aircon"              {channel="gree:airconditioner:a1234561:power", ga="Switch"}
 String   GreeAirConditioner_Mode    "Aircon Mode"         {channel="gree:airconditioner:a1234561:mode", ga="thermostatMode"}
@@ -134,9 +133,9 @@ Number   GreeAirConditioner_Temp    "Aircon Temperature"  {channel="gree:aircond
 Switch   GreeAirConditioner_Light   "Light"               {channel="gree:airconditioner:a1234561:light"}
 ```
 
-**Rules**
+### Rules
 
-```
+```java
 rule "Mode changed"
 when
         Item GreeAirConditioner_Mode changed
diff --git a/bundles/org.openhab.binding.groheondus/README.md b/bundles/org.openhab.binding.groheondus/README.md
index ba2d078f55cc3..143e52e288c8e 100644
--- a/bundles/org.openhab.binding.groheondus/README.md
+++ b/bundles/org.openhab.binding.groheondus/README.md
@@ -75,7 +75,7 @@ Note: Be aware that the Sense reports data once a day (at most), and that the va
 
 Things file:
 
-````
+```java
 Bridge groheondus:account:account1 [ username="user@example.com", password="YourStrongPasswordHere!" ] {
     groheondus:senseguard:550e8400-e29b-11d4-a716-446655440000 [ applianceId="550e8400-e29b-11d4-a716-446655440000", roomId=456, locationId=123 ] {
         Channels:
@@ -85,11 +85,11 @@ Bridge groheondus:account:account1 [ username="user@example.com", password="Your
     }
     groheondus:sense:550e8400-e29b-11d4-a716-446655440000 [ applianceId="444e8400-e29b-11d4-a716-446655440000", roomId=456, locationId=123 ]
 }
-````
+```
 
 Items file:
 
-````
+```java
 String Name_Sense_Guard "Appliance Name" {channel="groheondus:senseguard:groheondus:appliance:550e8400-e29b-11d4-a716-446655440000:name"}
 Number:Pressure Pressure_Sense_Guard "Pressure [%.1f %unit%]" {channel="groheondus:senseguard:groheondus:appliance:550e8400-e29b-11d4-a716-446655440000:pressure"}
 Number:Temperature Temperature_Sense_Guard "Temperature [%.1f %unit%]" {channel="groheondus:senseguard:groheondus:appliance:550e8400-e29b-11d4-a716-446655440000:temperature_guard"}
@@ -98,4 +98,4 @@ Number:Volume Water_Usage_Since_Midnight_Sense_Guard "Water usage since midnight
 String Name_Sense "Temperature [%.1f %unit%]" {channel="groheondus:sense:groheondus:appliance:444e8400-e29b-11d4-a716-446655440000:name"}
 Number:Temperature Temperature_Sense "Temperature [%.1f %unit%]" {channel="groheondus:sense:groheondus:appliance:444e8400-e29b-11d4-a716-446655440000:temperature"}
 Number Humidity_Sense "Humidity [%.1f %unit%]" {channel="groheondus:sense:groheondus:appliance:444e8400-e29b-11d4-a716-446655440000:humidity"}
-````
+```
diff --git a/bundles/org.openhab.binding.groupepsa/README.md b/bundles/org.openhab.binding.groupepsa/README.md
index 60a2e426afe25..0577256e84108 100644
--- a/bundles/org.openhab.binding.groupepsa/README.md
+++ b/bundles/org.openhab.binding.groupepsa/README.md
@@ -19,7 +19,7 @@ If you need to add for multiple brands or multiple different users, add multiple
 You need to select a brand and enter the user name and password.
 The Polling Interval (in minutes) determines how often the API will be polled for new cars.
 The Client ID and Client Secret should not need to be updated.
-(However you can register your own app via https://developer.groupe-psa.com/inc/ and use this client information if you wish.)
+(However you can register your own app via <https://developer.groupe-psa.com/inc/> and use this client information if you wish.)
 
 ### parameters
 
@@ -29,8 +29,8 @@ The Client ID and Client Secret should not need to be updated.
 | userName        | None    | Yes      | The user name for the mypeugot/mycitroen/myds/myopel/myvauxhall website or app.                                                                         |
 | password        | None    | Yes      | The password for the given user.                                                                                                                        |
 | pollingInterval | 60      | No       | The Polling Interval (in minutes) determines how often the available vehicles are queried.                                                              |
-| clientId        |         | Yes      | The Client ID for API access: can normally left at the default value. (see: https://developer.groupe-psa.io/webapi/b2c/quickstart/connect/#article)     |
-| clientSecret    |         | Yes      | The Client Secret for API access: can normally left at the default value. (see: https://developer.groupe-psa.io/webapi/b2c/quickstart/connect/#article) |
+| clientId        |         | Yes      | The Client ID for API access: can normally left at the default value. (see: <https://developer.groupe-psa.io/webapi/b2c/quickstart/connect/#article>)     |
+| clientSecret    |         | Yes      | The Client Secret for API access: can normally left at the default value. (see: <https://developer.groupe-psa.io/webapi/b2c/quickstart/connect/#article>) |
 
 ## Vehicle Configuration
 
@@ -85,13 +85,13 @@ The Polling Interval and Online Timeout can be adjusted.
 | chargingRemainingTime   | Number:Time               | Time remaining till charged                      |
 | chargingNextDelayedTime | Number:Time               | Time till the next charging starts               |
 
-Further documentation can be found at: https://developer.groupe-psa.io/webapi/b2c/api-reference/specification/#article
+Further documentation can be found at: <https://developer.groupe-psa.io/webapi/b2c/api-reference/specification/#article>
 
 ## Full Example
 
 ### Things file
 
-```
+```java
 Bridge groupepsa:bridge:opel "Auto Interface" [
     pollingInterval=60,
     userName="anonymous@anonymous.email",
@@ -111,7 +111,7 @@ Bridge groupepsa:bridge:opel "Auto Interface" [
 
 ### Items file
 
-```
+```java
 Group Auto
 
 Number:ElectricCurrent Auto_Aux_Current "Auxillliary Battery Current [%.1f %unit%]" (Auto) ["Measurement","Current"] {channel="groupepsa:vehicle:opel:zafira:battery#current"}
diff --git a/bundles/org.openhab.binding.guntamatic/README.md b/bundles/org.openhab.binding.guntamatic/README.md
index 196fd11d26a69..745b6ca3def45 100644
--- a/bundles/org.openhab.binding.guntamatic/README.md
+++ b/bundles/org.openhab.binding.guntamatic/README.md
@@ -11,35 +11,35 @@ It should work for all other Guntamatic Heating Systems as well, that support th
 
 Guntamatic Heating Systems supported as Thing Types:
 
-| Name          | Thing Type ID | Heating System Type  | Binding Development Status                       |
-|---------------|---------------|----------------------|--------------------------------------------------|
-| Biostar       | `biostar`     | Pellets              | tested via 15kW, firmware 3.2d, German & English |
-| Biosmart      | `biosmart`    | Logs                 | tested via 22kW, firmware 3.2f, German           |
-| Powerchip     | `powerchip`   | WoodChips            | tested via 100kW, firmware 3.2d, French          |
-| Powercorn     | `powercorn`   | EnergyGrain          | untested                                         |
-| Biocom        | `biocom`      | Pellets              | untested                                         |
-| Pro           | `pro`         | Pellets or WoodChips | untested                                         |
-| Therm         | `therm`       | Pellets              | untested                                         |
-| Generic       | `generic`     | -                    | use, if none from above                          |
+| Name      | Thing Type ID | Heating System Type  | Binding Development Status                       |
+| --------- | ------------- | -------------------- | ------------------------------------------------ |
+| Biostar   | `biostar`     | Pellets              | tested via 15kW, firmware 3.2d, German & English |
+| Biosmart  | `biosmart`    | Logs                 | tested via 22kW, firmware 3.2f, German           |
+| Powerchip | `powerchip`   | WoodChips            | tested via 100kW, firmware 3.2d, French          |
+| Powercorn | `powercorn`   | EnergyGrain          | untested                                         |
+| Biocom    | `biocom`      | Pellets              | untested                                         |
+| Pro       | `pro`         | Pellets or WoodChips | untested                                         |
+| Therm     | `therm`       | Pellets              | untested                                         |
+| Generic   | `generic`     | -                    | use, if none from above                          |
 
 ### Thing Configuration
 
-| Parameter          | Description                                                                 | Default         |
-|--------------------|-----------------------------------------------------------------------------|-----------------|
-| `hostname`         | Hostname or IP address of the Guntamatic Heating System                     |                 |
-| `key`              | Optional, but required to read protected parameters and to control the Guntamatic Heating System.<br/>The key needs to be requested from Guntamatic support, e.g. via https://www.guntamatic.com/en/contact/.                                          |                 |
-| `refreshInterval`  | Interval the Guntamatic Heating System is polled in seconds                 | `60`            |
-| `encoding`         | Code page used by the Guntamatic Heating System                             | `windows-1252`  |
+| Parameter         | Description                                                                                                                                                                                                     | Default        |
+| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------- |
+| `hostname`        | Hostname or IP address of the Guntamatic Heating System                                                                                                                                                         |                |
+| `key`             | Optional, but required to read protected parameters and to control the Guntamatic Heating System.<br/>The key needs to be requested from Guntamatic support, e.g. via <https://www.guntamatic.com/en/contact/>. |                |
+| `refreshInterval` | Interval the Guntamatic Heating System is polled in seconds                                                                                                                                                     | `60`           |
+| `encoding`        | Code page used by the Guntamatic Heating System                                                                                                                                                                 | `windows-1252` |
 
 ### Properties
 
-| Property            | Description                                                   | Supported                                         |
-|---------------------|---------------------------------------------------------------|---------------------------------------------------|
-| `extraWwHeat`       | Parameter used by `controlExtraWwHeat` channels               | all                                               |
-| `boilerApproval`    | Parameter used by `controlBoilerApproval` channel             | Biostar, Powerchip, Powercorn, Biocom, Pro, Therm |
-| `heatCircProgram`   | Parameter used by `controlHeatCircProgram` channels           | all                                               | 
-| `program`           | Parameter used by `controlProgram` channel                    | all                                               |
-| `wwHeat`            | Parameter used by `controlWwHeat` channels                    | all                                               |
+| Property          | Description                                         | Supported                                         |
+| ----------------- | --------------------------------------------------- | ------------------------------------------------- |
+| `extraWwHeat`     | Parameter used by `controlExtraWwHeat` channels     | all                                               |
+| `boilerApproval`  | Parameter used by `controlBoilerApproval` channel   | Biostar, Powerchip, Powercorn, Biocom, Pro, Therm |
+| `heatCircProgram` | Parameter used by `controlHeatCircProgram` channels | all                                               |
+| `program`         | Parameter used by `controlProgram` channel          | all                                               |
+| `wwHeat`          | Parameter used by `controlWwHeat` channels          | all                                               |
 
 ## Channels
 
@@ -47,25 +47,25 @@ Guntamatic Heating Systems supported as Thing Types:
 
 The Guntamatic Heating System can be controlled using the following channels:
 
-|	Channel             |	Description                                                             | Type	|	Unit	|	Security Access Level	| ReadOnly | Advanced |
-|-----------------------|---------------------------------------------------------------------------|-------|:---------:|:-------------------------:|:--------:|:--------:|
-|	`controlBoilerApproval`	|	Set Boiler Approval (`AUTO`, `OFF`, `ON`)	                        |	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlProgram`	|	Set Program (`OFF`, `NORMAL`, `WARMWATER`, `MANUAL`<sup id="a1">[1](#f1)</sup>)	|	`String`	|		|	🔐 W1	|	R/W	|	false	|
-|	`controlHeatCircProgram0`	|	Set Heat Circle 0 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlHeatCircProgram1`	|	Set Heat Circle 1 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlHeatCircProgram2`	|	Set Heat Circle 2 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlHeatCircProgram3`	|	Set Heat Circle 3 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlHeatCircProgram4`	|	Set Heat Circle 4 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlHeatCircProgram5`	|	Set Heat Circle 5 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlHeatCircProgram6`	|	Set Heat Circle 6 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlHeatCircProgram7`	|	Set Heat Circle 7 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlHeatCircProgram8`	|	Set Heat Circle 8 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)	|	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlWwHeat0`	        |	Trigger Warm Water Circle 0 (`RECHARGE`)	                    |	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlWwHeat1`            |	Trigger Warm Water Circle 1 (`RECHARGE`)	                    |	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlWwHeat2`            |	Trigger Warm Water Circle 2 (`RECHARGE`)	                    |	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlExtraWwHeat0`       |	Trigger Extra Warm Water Circle 0 (`RECHARGE`)	                |	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlExtraWwHeat1`       |	Trigger Extra Warm Water Circle 1 (`RECHARGE`)	                |	`String`	|		|	🔐 W1	|	R/W	|	true	|
-|	`controlExtraWwHeat2`       |	Trigger Extra Warm Water Circle 2 (`RECHARGE`)	                |	`String`	|		|	🔐 W1	|	R/W	|	true	|
+| Channel                   | Description                                                                     | Type     | Unit | Security Access Level | ReadOnly | Advanced |
+| ------------------------- | ------------------------------------------------------------------------------- | -------- | :--: | :-------------------: | :------: | :------: |
+| `controlBoilerApproval`   | Set Boiler Approval (`AUTO`, `OFF`, `ON`)                                       | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlProgram`          | Set Program (`OFF`, `NORMAL`, `WARMWATER`, `MANUAL`<sup id="a1">[1](#f1)</sup>) | `String` |      |        🔐 W1         |   R/W    |  false   |
+| `controlHeatCircProgram0` | Set Heat Circle 0 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlHeatCircProgram1` | Set Heat Circle 1 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlHeatCircProgram2` | Set Heat Circle 2 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlHeatCircProgram3` | Set Heat Circle 3 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlHeatCircProgram4` | Set Heat Circle 4 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlHeatCircProgram5` | Set Heat Circle 5 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlHeatCircProgram6` | Set Heat Circle 6 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlHeatCircProgram7` | Set Heat Circle 7 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlHeatCircProgram8` | Set Heat Circle 8 Program (`OFF`, `NORMAL`, `HEAT`, `LOWER`)                    | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlWwHeat0`          | Trigger Warm Water Circle 0 (`RECHARGE`)                                        | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlWwHeat1`          | Trigger Warm Water Circle 1 (`RECHARGE`)                                        | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlWwHeat2`          | Trigger Warm Water Circle 2 (`RECHARGE`)                                        | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlExtraWwHeat0`     | Trigger Extra Warm Water Circle 0 (`RECHARGE`)                                  | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlExtraWwHeat1`     | Trigger Extra Warm Water Circle 1 (`RECHARGE`)                                  | `String` |      |        🔐 W1         |   R/W    |   true   |
+| `controlExtraWwHeat2`     | Trigger Extra Warm Water Circle 2 (`RECHARGE`)                                  | `String` |      |        🔐 W1         |   R/W    |   true   |
 
 - <b id="f1">1)</b> ... `MANUAL` is supported by Biostar, Powerchip, Powercorn, Biocom, Pro as well as Therm only [↩](#a1)
 
@@ -82,116 +82,116 @@ The Binding dynamically generates Channels, derived from the data provided from
 
 Example list of Channels using a Guntamatic Biostar 15kW Pellets Heating System running firmware 3.2d and Guntamatic System Language configured to English:
 
-|	Channel             |	Description                                             | Type	|	Unit	|	Security Access Level	| ReadOnly | Advanced |
-|-----------------------|-----------------------------------------------------------|-------|:---------:|:-------------------------:|:--------:|:--------:|
-|	`running`	|	Running	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`outsideTemp`	|	Outside Temp.	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`blrTargetTemp`	|	Blr.Target Temp	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`boilerTemperature`	|	Boiler Temperature	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flueGasUtilisation`	|	Flue gas utilisation	|	`Number:Dimensionless`	|	`%`	|	🔐 W1	|	R/O	|	false	|
-|	`output`	|	Output	|	`Number:Dimensionless`	|	`%`	|	🔓 W0	|	R/O	|	false	|
-|	`returnTemp`	|	Return temp	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`co2Target`	|	CO2 Target	|	`Number:Dimensionless`	|	`%`	|	🔐 W1	|	R/O	|	false	|
-|	`co2Content`	|	CO2 Content	|	`Number:Dimensionless`	|	`%`	|	🔓 W0	|	R/O	|	false	|
-|	`returnTempTarget`	|	Return temp target	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`statusCode`	|	Status code	|	`Number`	|		|	🔐 W1	|	R/O	|	false	|
-|	`efficiency`	|	Efficiency	|	`Number:Dimensionless`	|	`%`	|	🔐 W1	|	R/O	|	false	|
-|	`extractorSystem`	|	Extractor System	|	`Number:Dimensionless`	|	`%`	|	🔓 W0	|	R/O	|	false	|
-|	`feedTurbine`	|	Feed Turbine	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`dischargeMotor`	|	Discharge motor	|	`Number:Dimensionless`	|	`%`	|	🔓 W0	|	R/O	|	false	|
-|	`g1Target`	|	G1 Target	|	`Number:Dimensionless`	|	`%`	|	🔓 W0	|	R/O	|	false	|
-|	`bufferTop`	|	Buffer Top	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`bufferMid`	|	Buffer Mid	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`bufferBtm`	|	Buffer Btm	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`pumpHp0`	|	Pump HP0	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`dhw0`	|	DHW 0	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`bDhw0`	|	B DHW 0	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`dhw1`	|	DHW 1	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`bDhw1`	|	B DHW 1	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`dhw2`	|	DHW 2	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`bDhw2`	|	B DHW 2	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`roomTempHc0`	|	Room Temp:HC 0	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`heatCirc0`	|	Heat Circ. 0	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`roomTempHc1`	|	Room Temp:HC 1	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flowTarget1`	|	Flow Target 1	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`flowIs1`	|	Flow is 1	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`mixer1`	|	Mixer 1	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`heatCirc1`	|	Heat Circ. 1	|	`Switch`	|		|	🔐 W1	|	R/O	|	false	|
-|	`roomTempHc2`	|	Room Temp:HC 2	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flowTarget2`	|	Flow Target 2	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`flowIs2`	|	Flow is 2	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`mixer2`	|	Mixer 2	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`heatCirc2`	|	Heat Circ. 2	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`roomTempHc3`	|	Room Temp:HC 3	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`heatCirc3`	|	Heat Circ. 3	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`roomTempHc4`	|	Room Temp:HC 4	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flowTarget4`	|	Flow Target 4	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`flowIs4`	|	Flow is 4	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`mixer4`	|	Mixer 4	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`heatCirc4`	|	Heat Circ. 4	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`roomTempHc5`	|	Room Temp:HC 5	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flowTarget5`	|	Flow Target 5	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`flowIs5`	|	Flow is 5	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`mixer5`	|	Mixer 5	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`heatCirc5`	|	Heat Circ. 5	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`roomTempHc6`	|	Room Temp:HC 6	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`heatCirc6`	|	Heat Circ. 6	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`roomTempHc7`	|	Room Temp:HC 7	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flowTarget7`	|	Flow Target 7	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`flowIs7`	|	Flow is 7	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`mixer7`	|	Mixer 7	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`heatCirc7`	|	Heat Circ. 7	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`roomTempHc8`	|	Room Temp:HC 8	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flowTarget8`	|	Flow Target 8	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`flowIs8`	|	Flow is 8	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`mixer8`	|	Mixer 8	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`heatCirc8`	|	Heat Circ. 8	|	`Switch`	|		|	🔓 W0	|	R/O	|	false	|
-|	`fuelLevel`	|	Fuel Level	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`stb`	|	STB	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`tks`	|	TKS	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`boilerApproval`	|	Boiler approval	|	`Switch`	|		|	🔐 W1	|	R/O	|	false	|
-|	`programme`	|	Programme	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc0`	|	Program HC0	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc1`	|	Program HC1	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc2`	|	Program HC2	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc3`	|	Program HC3	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc4`	|	Program HC4	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc5`	|	Program HC5	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc6`	|	Program HC6	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc7`	|	Program HC7	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`programHc8`	|	Program HC8	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`interuption0`	|	Interuption 0	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`interuption1`	|	Interuption 1	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`serial`	|	Serial	|	`Number`	|		|	🔓 W0	|	R/O	|	false	|
-|	`version`	|	Version	|	`String`	|		|	🔓 W0	|	R/O	|	false	|
-|	`runningTime`	|	Running Time	|	`Number:Time`	|	`h`	|	🔓 W0	|	R/O	|	false	|
-|	`serviceHrs`	|	Service Hrs	|	`Number:Time`	|	`d`	|	🔓 W0	|	R/O	|	false	|
-|	`emptyAshIn`	|	Empty ash in	|	`Number:Time`	|	`h`	|	🔓 W0	|	R/O	|	false	|
-|	`flowIs0`	|	Flow is 0	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flowIs3`	|	Flow is 3	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`flowIs6`	|	Flow is 6	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`fuelCounter`	|	Fuel counter	|	`Number:Volume`	|	`m³`	|	🔐 W1	|	R/O	|	false	|
-|	`bufferLoad`	|	Buffer load.	|	`Number:Dimensionless`	|	`%`	|	🔓 W0	|	R/O	|	false	|
-|	`bufferTop0`	|	Buffer Top 0	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`bufferBtm0`	|	Buffer Btm 0	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`bufferTop1`	|	Buffer Top 1	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`bufferBtm1`	|	Buffer Btm 1	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`bufferTop2`	|	Buffer Top 2	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`bufferBtm2`	|	Buffer Btm 2	|	`Number:Temperature`	|	`°C`	|	🔐 W1	|	R/O	|	false	|
-|	`bExtraWw0`	|	B extra-WW. 0	|	`Switch`	|		|	🔐 W1	|	R/O	|	false	|
-|	`bExtraWw1`	|	B extra-WW. 1	|	`Switch`	|		|	🔐 W1	|	R/O	|	false	|
-|	`bExtraWw2`	|	B extra-WW. 2	|	`Switch`	|		|	🔐 W1	|	R/O	|	false	|
-|	`auxiliaryPump0`	|	Auxiliary pump 0	|	`Switch`	|		|	🔐 W1	|	R/O	|	false	|
-|	`auxiliaryPump1`	|	Auxiliary pump 1	|	`Switch`	|		|	🔐 W1	|	R/O	|	false	|
-|	`auxiliaryPump2`	|	Auxiliary pump 2	|	`Switch`	|		|	🔐 W1	|	R/O	|	false	|
-|	`boilersConditionNo`	|	Boiler´s condition no.	|	`String`	|		|	🔐 W1	|	R/O	|	false	|
-|	`bufferT5`	|	Buffer T5	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`bufferT6`	|	Buffer T6	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`bufferT7`	|	Buffer T7	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`extraWw0`	|	Extra-WW. 0	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`extraWw1`	|	Extra-WW. 1	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`extraWw2`	|	Extra-WW. 2	|	`Number:Temperature`	|	`°C`	|	🔓 W0	|	R/O	|	false	|
-|	`grate`	|	Grate	|	`Number:Dimensionless`	|	`%`	|	🔓 W0	|	R/O	|	false	|
+| Channel              | Description            | Type                   | Unit | Security Access Level | ReadOnly | Advanced |
+| -------------------- | ---------------------- | ---------------------- | :--: | :-------------------: | :------: | :------: |
+| `running`            | Running                | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `outsideTemp`        | Outside Temp.          | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `blrTargetTemp`      | Blr.Target Temp        | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `boilerTemperature`  | Boiler Temperature     | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flueGasUtilisation` | Flue gas utilisation   | `Number:Dimensionless` | `%`  |        🔐 W1         |   R/O    |  false   |
+| `output`             | Output                 | `Number:Dimensionless` | `%`  |        🔓 W0         |   R/O    |  false   |
+| `returnTemp`         | Return temp            | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `co2Target`          | CO2 Target             | `Number:Dimensionless` | `%`  |        🔐 W1         |   R/O    |  false   |
+| `co2Content`         | CO2 Content            | `Number:Dimensionless` | `%`  |        🔓 W0         |   R/O    |  false   |
+| `returnTempTarget`   | Return temp target     | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `statusCode`         | Status code            | `Number`               |      |        🔐 W1         |   R/O    |  false   |
+| `efficiency`         | Efficiency             | `Number:Dimensionless` | `%`  |        🔐 W1         |   R/O    |  false   |
+| `extractorSystem`    | Extractor System       | `Number:Dimensionless` | `%`  |        🔓 W0         |   R/O    |  false   |
+| `feedTurbine`        | Feed Turbine           | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `dischargeMotor`     | Discharge motor        | `Number:Dimensionless` | `%`  |        🔓 W0         |   R/O    |  false   |
+| `g1Target`           | G1 Target              | `Number:Dimensionless` | `%`  |        🔓 W0         |   R/O    |  false   |
+| `bufferTop`          | Buffer Top             | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `bufferMid`          | Buffer Mid             | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `bufferBtm`          | Buffer Btm             | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `pumpHp0`            | Pump HP0               | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `dhw0`               | DHW 0                  | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `bDhw0`              | B DHW 0                | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `dhw1`               | DHW 1                  | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `bDhw1`              | B DHW 1                | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `dhw2`               | DHW 2                  | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `bDhw2`              | B DHW 2                | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `roomTempHc0`        | Room Temp:HC 0         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `heatCirc0`          | Heat Circ. 0           | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `roomTempHc1`        | Room Temp:HC 1         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flowTarget1`        | Flow Target 1          | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `flowIs1`            | Flow is 1              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `mixer1`             | Mixer 1                | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `heatCirc1`          | Heat Circ. 1           | `Switch`               |      |        🔐 W1         |   R/O    |  false   |
+| `roomTempHc2`        | Room Temp:HC 2         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flowTarget2`        | Flow Target 2          | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `flowIs2`            | Flow is 2              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `mixer2`             | Mixer 2                | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `heatCirc2`          | Heat Circ. 2           | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `roomTempHc3`        | Room Temp:HC 3         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `heatCirc3`          | Heat Circ. 3           | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `roomTempHc4`        | Room Temp:HC 4         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flowTarget4`        | Flow Target 4          | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `flowIs4`            | Flow is 4              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `mixer4`             | Mixer 4                | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `heatCirc4`          | Heat Circ. 4           | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `roomTempHc5`        | Room Temp:HC 5         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flowTarget5`        | Flow Target 5          | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `flowIs5`            | Flow is 5              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `mixer5`             | Mixer 5                | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `heatCirc5`          | Heat Circ. 5           | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `roomTempHc6`        | Room Temp:HC 6         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `heatCirc6`          | Heat Circ. 6           | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `roomTempHc7`        | Room Temp:HC 7         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flowTarget7`        | Flow Target 7          | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `flowIs7`            | Flow is 7              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `mixer7`             | Mixer 7                | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `heatCirc7`          | Heat Circ. 7           | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `roomTempHc8`        | Room Temp:HC 8         | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flowTarget8`        | Flow Target 8          | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `flowIs8`            | Flow is 8              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `mixer8`             | Mixer 8                | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `heatCirc8`          | Heat Circ. 8           | `Switch`               |      |        🔓 W0         |   R/O    |  false   |
+| `fuelLevel`          | Fuel Level             | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `stb`                | STB                    | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `tks`                | TKS                    | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `boilerApproval`     | Boiler approval        | `Switch`               |      |        🔐 W1         |   R/O    |  false   |
+| `programme`          | Programme              | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc0`         | Program HC0            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc1`         | Program HC1            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc2`         | Program HC2            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc3`         | Program HC3            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc4`         | Program HC4            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc5`         | Program HC5            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc6`         | Program HC6            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc7`         | Program HC7            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `programHc8`         | Program HC8            | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `interuption0`       | Interuption 0          | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `interuption1`       | Interuption 1          | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `serial`             | Serial                 | `Number`               |      |        🔓 W0         |   R/O    |  false   |
+| `version`            | Version                | `String`               |      |        🔓 W0         |   R/O    |  false   |
+| `runningTime`        | Running Time           | `Number:Time`          | `h`  |        🔓 W0         |   R/O    |  false   |
+| `serviceHrs`         | Service Hrs            | `Number:Time`          | `d`  |        🔓 W0         |   R/O    |  false   |
+| `emptyAshIn`         | Empty ash in           | `Number:Time`          | `h`  |        🔓 W0         |   R/O    |  false   |
+| `flowIs0`            | Flow is 0              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flowIs3`            | Flow is 3              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `flowIs6`            | Flow is 6              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `fuelCounter`        | Fuel counter           | `Number:Volume`        | `m³` |        🔐 W1         |   R/O    |  false   |
+| `bufferLoad`         | Buffer load.           | `Number:Dimensionless` | `%`  |        🔓 W0         |   R/O    |  false   |
+| `bufferTop0`         | Buffer Top 0           | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `bufferBtm0`         | Buffer Btm 0           | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `bufferTop1`         | Buffer Top 1           | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `bufferBtm1`         | Buffer Btm 1           | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `bufferTop2`         | Buffer Top 2           | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `bufferBtm2`         | Buffer Btm 2           | `Number:Temperature`   | `°C` |        🔐 W1         |   R/O    |  false   |
+| `bExtraWw0`          | B extra-WW. 0          | `Switch`               |      |        🔐 W1         |   R/O    |  false   |
+| `bExtraWw1`          | B extra-WW. 1          | `Switch`               |      |        🔐 W1         |   R/O    |  false   |
+| `bExtraWw2`          | B extra-WW. 2          | `Switch`               |      |        🔐 W1         |   R/O    |  false   |
+| `auxiliaryPump0`     | Auxiliary pump 0       | `Switch`               |      |        🔐 W1         |   R/O    |  false   |
+| `auxiliaryPump1`     | Auxiliary pump 1       | `Switch`               |      |        🔐 W1         |   R/O    |  false   |
+| `auxiliaryPump2`     | Auxiliary pump 2       | `Switch`               |      |        🔐 W1         |   R/O    |  false   |
+| `boilersConditionNo` | Boiler´s condition no. | `String`               |      |        🔐 W1         |   R/O    |  false   |
+| `bufferT5`           | Buffer T5              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `bufferT6`           | Buffer T6              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `bufferT7`           | Buffer T7              | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `extraWw0`           | Extra-WW. 0            | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `extraWw1`           | Extra-WW. 1            | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `extraWw2`           | Extra-WW. 2            | `Number:Temperature`   | `°C` |        🔓 W0         |   R/O    |  false   |
+| `grate`              | Grate                  | `Number:Dimensionless` | `%`  |        🔓 W0         |   R/O    |  false   |
 
 #### Security Access Levels
 
@@ -201,145 +201,145 @@ Example list of Channels using a Guntamatic Biostar 15kW Pellets Heating System
 
 ## Full Example
 
-**Thing File**
+### Thing File
 
 ```java
 Thing   guntamatic:biostar:mybiostar   "Guntamatic Biostar"    [ hostname="192.168.1.100", key="0123456789ABCDEF0123456789ABCDEF0123", refreshInterval=60, encoding="windows-1252" ]
 ```
 
-**Item File**
+### Item File
 
 ```java
-String              	Biostar_ControlBoilerApproval  	"Set Boiler Approval"               	{ channel="guntamatic:biostar:mybiostar:controlBoilerApproval" }
-String              	Biostar_ControlProgram         	"Set Program"                       	{ channel="guntamatic:biostar:mybiostar:controlProgram" }
-String              	Biostar_ControlHeatCircProgram0	"Set Heat Circle 0 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram0" }
-String              	Biostar_ControlHeatCircProgram1	"Set Heat Circle 1 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram1" }
-String              	Biostar_ControlHeatCircProgram2	"Set Heat Circle 2 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram2" }
-String              	Biostar_ControlHeatCircProgram3	"Set Heat Circle 3 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram3" }
-String              	Biostar_ControlHeatCircProgram4	"Set Heat Circle 4 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram4" }
-String              	Biostar_ControlHeatCircProgram5	"Set Heat Circle 5 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram5" }
-String              	Biostar_ControlHeatCircProgram6	"Set Heat Circle 6 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram6" }
-String              	Biostar_ControlHeatCircProgram7	"Set Heat Circle 7 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram7" }
-String              	Biostar_ControlHeatCircProgram8	"Set Heat Circle 8 Program"      	{ channel="guntamatic:biostar:mybiostar:controlHeatCircProgram8" }
-String              	Biostar_ControlWwHeat0         	"Trigger Warm Water Circle 0"      	{ channel="guntamatic:biostar:mybiostar:controlWwHeat0" }
-String              	Biostar_ControlWwHeat1         	"Trigger Warm Water Circle 1"      	{ channel="guntamatic:biostar:mybiostar:controlWwHeat1" }
-String              	Biostar_ControlWwHeat2         	"Trigger Warm Water Circle 2"      	{ channel="guntamatic:biostar:mybiostar:controlWwHeat2" }
-String              	Biostar_ControlExtraWwHeat0    	"Trigger Extra Warm Water Circle 0"	{ channel="guntamatic:biostar:mybiostar:controlExtraWwHeat0" }
-String              	Biostar_ControlExtraWwHeat1    	"Trigger Extra Warm Water Circle 1"	{ channel="guntamatic:biostar:mybiostar:controlExtraWwHeat1" }
-String              	Biostar_ControlExtraWwHeat2    	"Trigger Extra Warm Water Circle 2"	{ channel="guntamatic:biostar:mybiostar:controlExtraWwHeat2" }
-String              	Biostar_Running                	"Running"                           	{ channel="guntamatic:biostar:mybiostar:running" }
-Number:Temperature  	Biostar_OutsideTemp            	"Outside Temp."                     	{ channel="guntamatic:biostar:mybiostar:outsideTemp" }
-Number:Temperature  	Biostar_BlrTargetTemp          	"Blr.Target Temp"                   	{ channel="guntamatic:biostar:mybiostar:blrTargetTemp" }
-Number:Temperature  	Biostar_BoilerTemperature      	"Boiler Temperature"                	{ channel="guntamatic:biostar:mybiostar:boilerTemperature" }
-Number:Dimensionless	Biostar_FlueGasUtilisation     	"Flue gas utilisation"              	{ channel="guntamatic:biostar:mybiostar:flueGasUtilisation" }
-Number:Dimensionless	Biostar_Output                 	"Output"                            	{ channel="guntamatic:biostar:mybiostar:output" }
-Number:Temperature  	Biostar_ReturnTemp             	"Return temp"                       	{ channel="guntamatic:biostar:mybiostar:returnTemp" }
-Number:Dimensionless	Biostar_Co2Target              	"CO2 Target"                        	{ channel="guntamatic:biostar:mybiostar:co2Target" }
-Number:Dimensionless	Biostar_Co2Content             	"CO2 Content"                       	{ channel="guntamatic:biostar:mybiostar:co2Content" }
-Number:Temperature  	Biostar_ReturnTempTarget       	"Return temp target"                	{ channel="guntamatic:biostar:mybiostar:returnTempTarget" }
-Number              	Biostar_StatusCode             	"Status code"                       	{ channel="guntamatic:biostar:mybiostar:statusCode" }
-Number:Dimensionless	Biostar_Efficiency             	"Efficiency"                        	{ channel="guntamatic:biostar:mybiostar:efficiency" }
-Number:Dimensionless	Biostar_ExtractorSystem        	"Extractor System"                  	{ channel="guntamatic:biostar:mybiostar:extractorSystem" }
-String              	Biostar_FeedTurbine            	"Feed Turbine"                      	{ channel="guntamatic:biostar:mybiostar:feedTurbine" }
-Number:Dimensionless	Biostar_DischargeMotor         	"Discharge motor"                   	{ channel="guntamatic:biostar:mybiostar:dischargeMotor" }
-Number:Dimensionless	Biostar_G1Target               	"G1 Target"                         	{ channel="guntamatic:biostar:mybiostar:g1Target" }
-Number:Temperature  	Biostar_BufferTop              	"Buffer Top"                        	{ channel="guntamatic:biostar:mybiostar:bufferTop" }
-Number:Temperature  	Biostar_BufferMid              	"Buffer Mid"                        	{ channel="guntamatic:biostar:mybiostar:bufferMid" }
-Number:Temperature  	Biostar_BufferBtm              	"Buffer Btm"                        	{ channel="guntamatic:biostar:mybiostar:bufferBtm" }
-Switch              	Biostar_PumpHp0                	"Pump HP0"                          	{ channel="guntamatic:biostar:mybiostar:pumpHp0" }
-Number:Temperature  	Biostar_Dhw0                   	"DHW 0"                             	{ channel="guntamatic:biostar:mybiostar:dhw0" }
-Switch              	Biostar_BDhw0                  	"B DHW 0"                           	{ channel="guntamatic:biostar:mybiostar:bDhw0" }
-Number:Temperature  	Biostar_Dhw1                   	"DHW 1"                             	{ channel="guntamatic:biostar:mybiostar:dhw1" }
-Switch              	Biostar_BDhw1                  	"B DHW 1"                           	{ channel="guntamatic:biostar:mybiostar:bDhw1" }
-Number:Temperature  	Biostar_Dhw2                   	"DHW 2"                             	{ channel="guntamatic:biostar:mybiostar:dhw2" }
-Switch              	Biostar_BDhw2                  	"B DHW 2"                           	{ channel="guntamatic:biostar:mybiostar:bDhw2" }
-Number:Temperature  	Biostar_RoomTempHc0            	"Room Temp:HC 0"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc0" }
-Switch              	Biostar_HeatCirc0              	"Heat Circ. 0"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc0" }
-Number:Temperature  	Biostar_RoomTempHc1            	"Room Temp:HC 1"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc1" }
-Number:Temperature  	Biostar_FlowTarget1            	"Flow Target 1"                     	{ channel="guntamatic:biostar:mybiostar:flowTarget1" }
-Number:Temperature  	Biostar_FlowIs1                	"Flow is 1"                         	{ channel="guntamatic:biostar:mybiostar:flowIs1" }
-String              	Biostar_Mixer1                 	"Mixer 1"                           	{ channel="guntamatic:biostar:mybiostar:mixer1" }
-Switch              	Biostar_HeatCirc1              	"Heat Circ. 1"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc1" }
-Number:Temperature  	Biostar_RoomTempHc2            	"Room Temp:HC 2"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc2" }
-Number:Temperature  	Biostar_FlowTarget2            	"Flow Target 2"                     	{ channel="guntamatic:biostar:mybiostar:flowTarget2" }
-Number:Temperature  	Biostar_FlowIs2                	"Flow is 2"                         	{ channel="guntamatic:biostar:mybiostar:flowIs2" }
-String              	Biostar_Mixer2                 	"Mixer 2"                           	{ channel="guntamatic:biostar:mybiostar:mixer2" }
-Switch              	Biostar_HeatCirc2              	"Heat Circ. 2"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc2" }
-Number:Temperature  	Biostar_RoomTempHc3            	"Room Temp:HC 3"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc3" }
-Switch              	Biostar_HeatCirc3              	"Heat Circ. 3"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc3" }
-Number:Temperature  	Biostar_RoomTempHc4            	"Room Temp:HC 4"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc4" }
-Number:Temperature  	Biostar_FlowTarget4            	"Flow Target 4"                     	{ channel="guntamatic:biostar:mybiostar:flowTarget4" }
-Number:Temperature  	Biostar_FlowIs4                	"Flow is 4"                         	{ channel="guntamatic:biostar:mybiostar:flowIs4" }
-String              	Biostar_Mixer4                 	"Mixer 4"                           	{ channel="guntamatic:biostar:mybiostar:mixer4" }
-Switch              	Biostar_HeatCirc4              	"Heat Circ. 4"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc4" }
-Number:Temperature  	Biostar_RoomTempHc5            	"Room Temp:HC 5"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc5" }
-Number:Temperature  	Biostar_FlowTarget5            	"Flow Target 5"                     	{ channel="guntamatic:biostar:mybiostar:flowTarget5" }
-Number:Temperature  	Biostar_FlowIs5                	"Flow is 5"                         	{ channel="guntamatic:biostar:mybiostar:flowIs5" }
-String              	Biostar_Mixer5                 	"Mixer 5"                           	{ channel="guntamatic:biostar:mybiostar:mixer5" }
-Switch              	Biostar_HeatCirc5              	"Heat Circ. 5"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc5" }
-Number:Temperature  	Biostar_RoomTempHc6            	"Room Temp:HC 6"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc6" }
-Switch              	Biostar_HeatCirc6              	"Heat Circ. 6"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc6" }
-Number:Temperature  	Biostar_RoomTempHc7            	"Room Temp:HC 7"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc7" }
-Number:Temperature  	Biostar_FlowTarget7            	"Flow Target 7"                     	{ channel="guntamatic:biostar:mybiostar:flowTarget7" }
-Number:Temperature  	Biostar_FlowIs7                	"Flow is 7"                         	{ channel="guntamatic:biostar:mybiostar:flowIs7" }
-String              	Biostar_Mixer7                 	"Mixer 7"                           	{ channel="guntamatic:biostar:mybiostar:mixer7" }
-Switch              	Biostar_HeatCirc7              	"Heat Circ. 7"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc7" }
-Number:Temperature  	Biostar_RoomTempHc8            	"Room Temp:HC 8"                    	{ channel="guntamatic:biostar:mybiostar:roomTempHc8" }
-Number:Temperature  	Biostar_FlowTarget8            	"Flow Target 8"                     	{ channel="guntamatic:biostar:mybiostar:flowTarget8" }
-Number:Temperature  	Biostar_FlowIs8                	"Flow is 8"                         	{ channel="guntamatic:biostar:mybiostar:flowIs8" }
-String              	Biostar_Mixer8                 	"Mixer 8"                           	{ channel="guntamatic:biostar:mybiostar:mixer8" }
-Switch              	Biostar_HeatCirc8              	"Heat Circ. 8"                      	{ channel="guntamatic:biostar:mybiostar:heatCirc8" }
-String              	Biostar_FuelLevel              	"Fuel Level"                        	{ channel="guntamatic:biostar:mybiostar:fuelLevel" }
-String              	Biostar_Stb                    	"STB"                               	{ channel="guntamatic:biostar:mybiostar:stb" }
-String              	Biostar_Tks                    	"TKS"                               	{ channel="guntamatic:biostar:mybiostar:tks" }
-Switch              	Biostar_BoilerApproval         	"Boiler approval"                   	{ channel="guntamatic:biostar:mybiostar:boilerApproval" }
-String              	Biostar_Programme              	"Programme"                         	{ channel="guntamatic:biostar:mybiostar:programme" }
-String              	Biostar_ProgramHc0             	"Program HC0"                       	{ channel="guntamatic:biostar:mybiostar:programHc0" }
-String              	Biostar_ProgramHc1             	"Program HC1"                       	{ channel="guntamatic:biostar:mybiostar:programHc1" }
-String              	Biostar_ProgramHc2             	"Program HC2"                       	{ channel="guntamatic:biostar:mybiostar:programHc2" }
-String              	Biostar_ProgramHc3             	"Program HC3"                       	{ channel="guntamatic:biostar:mybiostar:programHc3" }
-String              	Biostar_ProgramHc4             	"Program HC4"                       	{ channel="guntamatic:biostar:mybiostar:programHc4" }
-String              	Biostar_ProgramHc5             	"Program HC5"                       	{ channel="guntamatic:biostar:mybiostar:programHc5" }
-String              	Biostar_ProgramHc6             	"Program HC6"                       	{ channel="guntamatic:biostar:mybiostar:programHc6" }
-String              	Biostar_ProgramHc7             	"Program HC7"                       	{ channel="guntamatic:biostar:mybiostar:programHc7" }
-String              	Biostar_ProgramHc8             	"Program HC8"                       	{ channel="guntamatic:biostar:mybiostar:programHc8" }
-String              	Biostar_Interuption0           	"Interuption 0"                     	{ channel="guntamatic:biostar:mybiostar:interuption0" }
-String              	Biostar_Interuption1           	"Interuption 1"                     	{ channel="guntamatic:biostar:mybiostar:interuption1" }
-Number              	Biostar_Serial                 	"Serial"                            	{ channel="guntamatic:biostar:mybiostar:serial" }
-String              	Biostar_Version                	"Version"                           	{ channel="guntamatic:biostar:mybiostar:version" }
-Number:Time         	Biostar_RunningTime            	"Running Time"                      	{ channel="guntamatic:biostar:mybiostar:runningTime" }
-Number:Time         	Biostar_ServiceHrs             	"Service Hrs"                       	{ channel="guntamatic:biostar:mybiostar:serviceHrs" }
-Number:Time         	Biostar_EmptyAshIn             	"Empty ash in"                      	{ channel="guntamatic:biostar:mybiostar:emptyAshIn" }
-Number:Temperature  	Biostar_FlowIs0                	"Flow is 0"                         	{ channel="guntamatic:biostar:mybiostar:flowIs0" }
-Number:Temperature  	Biostar_FlowIs3                	"Flow is 3"                         	{ channel="guntamatic:biostar:mybiostar:flowIs3" }
-Number:Temperature  	Biostar_FlowIs6                	"Flow is 6"                         	{ channel="guntamatic:biostar:mybiostar:flowIs6" }
-Number:Volume       	Biostar_FuelCounter            	"Fuel counter"                      	{ channel="guntamatic:biostar:mybiostar:fuelCounter" }
-Number:Dimensionless	Biostar_BufferLoad             	"Buffer load."                      	{ channel="guntamatic:biostar:mybiostar:bufferLoad" }
-Number:Temperature  	Biostar_BufferTop0             	"Buffer Top 0"                      	{ channel="guntamatic:biostar:mybiostar:bufferTop0" }
-Number:Temperature  	Biostar_BufferBtm0             	"Buffer Btm 0"                      	{ channel="guntamatic:biostar:mybiostar:bufferBtm0" }
-Number:Temperature  	Biostar_BufferTop1             	"Buffer Top 1"                      	{ channel="guntamatic:biostar:mybiostar:bufferTop1" }
-Number:Temperature  	Biostar_BufferBtm1             	"Buffer Btm 1"                      	{ channel="guntamatic:biostar:mybiostar:bufferBtm1" }
-Number:Temperature  	Biostar_BufferTop2             	"Buffer Top 2"                      	{ channel="guntamatic:biostar:mybiostar:bufferTop2" }
-Number:Temperature  	Biostar_BufferBtm2             	"Buffer Btm 2"                      	{ channel="guntamatic:biostar:mybiostar:bufferBtm2" }
-Switch              	Biostar_BExtraWw0              	"B extra-WW. 0"                     	{ channel="guntamatic:biostar:mybiostar:bExtraWw0" }
-Switch              	Biostar_BExtraWw1              	"B extra-WW. 1"                     	{ channel="guntamatic:biostar:mybiostar:bExtraWw1" }
-Switch              	Biostar_BExtraWw2              	"B extra-WW. 2"                     	{ channel="guntamatic:biostar:mybiostar:bExtraWw2" }
-Switch              	Biostar_AuxiliaryPump0         	"Auxiliary pump 0"                  	{ channel="guntamatic:biostar:mybiostar:auxiliaryPump0" }
-Switch              	Biostar_AuxiliaryPump1         	"Auxiliary pump 1"                  	{ channel="guntamatic:biostar:mybiostar:auxiliaryPump1" }
-Switch              	Biostar_AuxiliaryPump2         	"Auxiliary pump 2"                  	{ channel="guntamatic:biostar:mybiostar:auxiliaryPump2" }
-String              	Biostar_BoilersConditionNo     	"Boiler´s condition no."            	{ channel="guntamatic:biostar:mybiostar:boilersConditionNo" }
-Number:Temperature  	Biostar_BufferT5               	"Buffer T5"                         	{ channel="guntamatic:biostar:mybiostar:bufferT5" }
-Number:Temperature  	Biostar_BufferT6               	"Buffer T6"                         	{ channel="guntamatic:biostar:mybiostar:bufferT6" }
-Number:Temperature  	Biostar_BufferT7               	"Buffer T7"                         	{ channel="guntamatic:biostar:mybiostar:bufferT7" }
-Number:Temperature  	Biostar_ExtraWw0               	"Extra-WW. 0"                       	{ channel="guntamatic:biostar:mybiostar:extraWw0" }
-Number:Temperature  	Biostar_ExtraWw1               	"Extra-WW. 1"                       	{ channel="guntamatic:biostar:mybiostar:extraWw1" }
-Number:Temperature  	Biostar_ExtraWw2               	"Extra-WW. 2"                       	{ channel="guntamatic:biostar:mybiostar:extraWw2" }
-Number:Dimensionless	Biostar_Grate                  	"Grate"                             	{ channel="guntamatic:biostar:mybiostar:grate" }
+String               Biostar_ControlBoilerApproval   "Set Boiler Approval"                { channel="guntamatic:biostar:mybiostar:controlBoilerApproval" }
+String               Biostar_ControlProgram          "Set Program"                        { channel="guntamatic:biostar:mybiostar:controlProgram" }
+String               Biostar_ControlHeatCircProgram0 "Set Heat Circle 0 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram0" }
+String               Biostar_ControlHeatCircProgram1 "Set Heat Circle 1 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram1" }
+String               Biostar_ControlHeatCircProgram2 "Set Heat Circle 2 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram2" }
+String               Biostar_ControlHeatCircProgram3 "Set Heat Circle 3 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram3" }
+String               Biostar_ControlHeatCircProgram4 "Set Heat Circle 4 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram4" }
+String               Biostar_ControlHeatCircProgram5 "Set Heat Circle 5 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram5" }
+String               Biostar_ControlHeatCircProgram6 "Set Heat Circle 6 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram6" }
+String               Biostar_ControlHeatCircProgram7 "Set Heat Circle 7 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram7" }
+String               Biostar_ControlHeatCircProgram8 "Set Heat Circle 8 Program"          { channel="guntamatic:biostar:mybiostar:controlHeatCircProgram8" }
+String               Biostar_ControlWwHeat0          "Trigger Warm Water Circle 0"        { channel="guntamatic:biostar:mybiostar:controlWwHeat0" }
+String               Biostar_ControlWwHeat1          "Trigger Warm Water Circle 1"        { channel="guntamatic:biostar:mybiostar:controlWwHeat1" }
+String               Biostar_ControlWwHeat2          "Trigger Warm Water Circle 2"        { channel="guntamatic:biostar:mybiostar:controlWwHeat2" }
+String               Biostar_ControlExtraWwHeat0     "Trigger Extra Warm Water Circle 0"  { channel="guntamatic:biostar:mybiostar:controlExtraWwHeat0" }
+String               Biostar_ControlExtraWwHeat1     "Trigger Extra Warm Water Circle 1"  { channel="guntamatic:biostar:mybiostar:controlExtraWwHeat1" }
+String               Biostar_ControlExtraWwHeat2     "Trigger Extra Warm Water Circle 2"  { channel="guntamatic:biostar:mybiostar:controlExtraWwHeat2" }
+String               Biostar_Running                 "Running"                            { channel="guntamatic:biostar:mybiostar:running" }
+Number:Temperature   Biostar_OutsideTemp             "Outside Temp."                      { channel="guntamatic:biostar:mybiostar:outsideTemp" }
+Number:Temperature   Biostar_BlrTargetTemp           "Blr.Target Temp"                    { channel="guntamatic:biostar:mybiostar:blrTargetTemp" }
+Number:Temperature   Biostar_BoilerTemperature       "Boiler Temperature"                 { channel="guntamatic:biostar:mybiostar:boilerTemperature" }
+Number:Dimensionless Biostar_FlueGasUtilisation      "Flue gas utilisation"               { channel="guntamatic:biostar:mybiostar:flueGasUtilisation" }
+Number:Dimensionless Biostar_Output                  "Output"                             { channel="guntamatic:biostar:mybiostar:output" }
+Number:Temperature   Biostar_ReturnTemp              "Return temp"                        { channel="guntamatic:biostar:mybiostar:returnTemp" }
+Number:Dimensionless Biostar_Co2Target               "CO2 Target"                         { channel="guntamatic:biostar:mybiostar:co2Target" }
+Number:Dimensionless Biostar_Co2Content              "CO2 Content"                        { channel="guntamatic:biostar:mybiostar:co2Content" }
+Number:Temperature   Biostar_ReturnTempTarget        "Return temp target"                 { channel="guntamatic:biostar:mybiostar:returnTempTarget" }
+Number               Biostar_StatusCode              "Status code"                        { channel="guntamatic:biostar:mybiostar:statusCode" }
+Number:Dimensionless Biostar_Efficiency              "Efficiency"                         { channel="guntamatic:biostar:mybiostar:efficiency" }
+Number:Dimensionless Biostar_ExtractorSystem         "Extractor System"                   { channel="guntamatic:biostar:mybiostar:extractorSystem" }
+String               Biostar_FeedTurbine             "Feed Turbine"                       { channel="guntamatic:biostar:mybiostar:feedTurbine" }
+Number:Dimensionless Biostar_DischargeMotor          "Discharge motor"                    { channel="guntamatic:biostar:mybiostar:dischargeMotor" }
+Number:Dimensionless Biostar_G1Target                "G1 Target"                          { channel="guntamatic:biostar:mybiostar:g1Target" }
+Number:Temperature   Biostar_BufferTop               "Buffer Top"                         { channel="guntamatic:biostar:mybiostar:bufferTop" }
+Number:Temperature   Biostar_BufferMid               "Buffer Mid"                         { channel="guntamatic:biostar:mybiostar:bufferMid" }
+Number:Temperature   Biostar_BufferBtm               "Buffer Btm"                         { channel="guntamatic:biostar:mybiostar:bufferBtm" }
+Switch               Biostar_PumpHp0                 "Pump HP0"                           { channel="guntamatic:biostar:mybiostar:pumpHp0" }
+Number:Temperature   Biostar_Dhw0                    "DHW 0"                              { channel="guntamatic:biostar:mybiostar:dhw0" }
+Switch               Biostar_BDhw0                   "B DHW 0"                            { channel="guntamatic:biostar:mybiostar:bDhw0" }
+Number:Temperature   Biostar_Dhw1                    "DHW 1"                              { channel="guntamatic:biostar:mybiostar:dhw1" }
+Switch               Biostar_BDhw1                   "B DHW 1"                            { channel="guntamatic:biostar:mybiostar:bDhw1" }
+Number:Temperature   Biostar_Dhw2                    "DHW 2"                              { channel="guntamatic:biostar:mybiostar:dhw2" }
+Switch               Biostar_BDhw2                   "B DHW 2"                            { channel="guntamatic:biostar:mybiostar:bDhw2" }
+Number:Temperature   Biostar_RoomTempHc0             "Room Temp:HC 0"                     { channel="guntamatic:biostar:mybiostar:roomTempHc0" }
+Switch               Biostar_HeatCirc0               "Heat Circ. 0"                       { channel="guntamatic:biostar:mybiostar:heatCirc0" }
+Number:Temperature   Biostar_RoomTempHc1             "Room Temp:HC 1"                     { channel="guntamatic:biostar:mybiostar:roomTempHc1" }
+Number:Temperature   Biostar_FlowTarget1             "Flow Target 1"                      { channel="guntamatic:biostar:mybiostar:flowTarget1" }
+Number:Temperature   Biostar_FlowIs1                 "Flow is 1"                          { channel="guntamatic:biostar:mybiostar:flowIs1" }
+String               Biostar_Mixer1                  "Mixer 1"                            { channel="guntamatic:biostar:mybiostar:mixer1" }
+Switch               Biostar_HeatCirc1               "Heat Circ. 1"                       { channel="guntamatic:biostar:mybiostar:heatCirc1" }
+Number:Temperature   Biostar_RoomTempHc2             "Room Temp:HC 2"                     { channel="guntamatic:biostar:mybiostar:roomTempHc2" }
+Number:Temperature   Biostar_FlowTarget2             "Flow Target 2"                      { channel="guntamatic:biostar:mybiostar:flowTarget2" }
+Number:Temperature   Biostar_FlowIs2                 "Flow is 2"                          { channel="guntamatic:biostar:mybiostar:flowIs2" }
+String               Biostar_Mixer2                  "Mixer 2"                            { channel="guntamatic:biostar:mybiostar:mixer2" }
+Switch               Biostar_HeatCirc2               "Heat Circ. 2"                       { channel="guntamatic:biostar:mybiostar:heatCirc2" }
+Number:Temperature   Biostar_RoomTempHc3             "Room Temp:HC 3"                     { channel="guntamatic:biostar:mybiostar:roomTempHc3" }
+Switch               Biostar_HeatCirc3               "Heat Circ. 3"                       { channel="guntamatic:biostar:mybiostar:heatCirc3" }
+Number:Temperature   Biostar_RoomTempHc4             "Room Temp:HC 4"                     { channel="guntamatic:biostar:mybiostar:roomTempHc4" }
+Number:Temperature   Biostar_FlowTarget4             "Flow Target 4"                      { channel="guntamatic:biostar:mybiostar:flowTarget4" }
+Number:Temperature   Biostar_FlowIs4                 "Flow is 4"                          { channel="guntamatic:biostar:mybiostar:flowIs4" }
+String               Biostar_Mixer4                  "Mixer 4"                            { channel="guntamatic:biostar:mybiostar:mixer4" }
+Switch               Biostar_HeatCirc4               "Heat Circ. 4"                       { channel="guntamatic:biostar:mybiostar:heatCirc4" }
+Number:Temperature   Biostar_RoomTempHc5             "Room Temp:HC 5"                     { channel="guntamatic:biostar:mybiostar:roomTempHc5" }
+Number:Temperature   Biostar_FlowTarget5             "Flow Target 5"                      { channel="guntamatic:biostar:mybiostar:flowTarget5" }
+Number:Temperature   Biostar_FlowIs5                 "Flow is 5"                          { channel="guntamatic:biostar:mybiostar:flowIs5" }
+String               Biostar_Mixer5                  "Mixer 5"                            { channel="guntamatic:biostar:mybiostar:mixer5" }
+Switch               Biostar_HeatCirc5               "Heat Circ. 5"                       { channel="guntamatic:biostar:mybiostar:heatCirc5" }
+Number:Temperature   Biostar_RoomTempHc6             "Room Temp:HC 6"                     { channel="guntamatic:biostar:mybiostar:roomTempHc6" }
+Switch               Biostar_HeatCirc6               "Heat Circ. 6"                       { channel="guntamatic:biostar:mybiostar:heatCirc6" }
+Number:Temperature   Biostar_RoomTempHc7             "Room Temp:HC 7"                     { channel="guntamatic:biostar:mybiostar:roomTempHc7" }
+Number:Temperature   Biostar_FlowTarget7             "Flow Target 7"                      { channel="guntamatic:biostar:mybiostar:flowTarget7" }
+Number:Temperature   Biostar_FlowIs7                 "Flow is 7"                          { channel="guntamatic:biostar:mybiostar:flowIs7" }
+String               Biostar_Mixer7                  "Mixer 7"                            { channel="guntamatic:biostar:mybiostar:mixer7" }
+Switch               Biostar_HeatCirc7               "Heat Circ. 7"                       { channel="guntamatic:biostar:mybiostar:heatCirc7" }
+Number:Temperature   Biostar_RoomTempHc8             "Room Temp:HC 8"                     { channel="guntamatic:biostar:mybiostar:roomTempHc8" }
+Number:Temperature   Biostar_FlowTarget8             "Flow Target 8"                      { channel="guntamatic:biostar:mybiostar:flowTarget8" }
+Number:Temperature   Biostar_FlowIs8                 "Flow is 8"                          { channel="guntamatic:biostar:mybiostar:flowIs8" }
+String               Biostar_Mixer8                  "Mixer 8"                            { channel="guntamatic:biostar:mybiostar:mixer8" }
+Switch               Biostar_HeatCirc8               "Heat Circ. 8"                       { channel="guntamatic:biostar:mybiostar:heatCirc8" }
+String               Biostar_FuelLevel               "Fuel Level"                         { channel="guntamatic:biostar:mybiostar:fuelLevel" }
+String               Biostar_Stb                     "STB"                                { channel="guntamatic:biostar:mybiostar:stb" }
+String               Biostar_Tks                     "TKS"                                { channel="guntamatic:biostar:mybiostar:tks" }
+Switch               Biostar_BoilerApproval          "Boiler approval"                    { channel="guntamatic:biostar:mybiostar:boilerApproval" }
+String               Biostar_Programme               "Programme"                          { channel="guntamatic:biostar:mybiostar:programme" }
+String               Biostar_ProgramHc0              "Program HC0"                        { channel="guntamatic:biostar:mybiostar:programHc0" }
+String               Biostar_ProgramHc1              "Program HC1"                        { channel="guntamatic:biostar:mybiostar:programHc1" }
+String               Biostar_ProgramHc2              "Program HC2"                        { channel="guntamatic:biostar:mybiostar:programHc2" }
+String               Biostar_ProgramHc3              "Program HC3"                        { channel="guntamatic:biostar:mybiostar:programHc3" }
+String               Biostar_ProgramHc4              "Program HC4"                        { channel="guntamatic:biostar:mybiostar:programHc4" }
+String               Biostar_ProgramHc5              "Program HC5"                        { channel="guntamatic:biostar:mybiostar:programHc5" }
+String               Biostar_ProgramHc6              "Program HC6"                        { channel="guntamatic:biostar:mybiostar:programHc6" }
+String               Biostar_ProgramHc7              "Program HC7"                        { channel="guntamatic:biostar:mybiostar:programHc7" }
+String               Biostar_ProgramHc8              "Program HC8"                        { channel="guntamatic:biostar:mybiostar:programHc8" }
+String               Biostar_Interuption0            "Interuption 0"                      { channel="guntamatic:biostar:mybiostar:interuption0" }
+String               Biostar_Interuption1            "Interuption 1"                      { channel="guntamatic:biostar:mybiostar:interuption1" }
+Number               Biostar_Serial                  "Serial"                             { channel="guntamatic:biostar:mybiostar:serial" }
+String               Biostar_Version                 "Version"                            { channel="guntamatic:biostar:mybiostar:version" }
+Number:Time          Biostar_RunningTime             "Running Time"                       { channel="guntamatic:biostar:mybiostar:runningTime" }
+Number:Time          Biostar_ServiceHrs              "Service Hrs"                        { channel="guntamatic:biostar:mybiostar:serviceHrs" }
+Number:Time          Biostar_EmptyAshIn              "Empty ash in"                       { channel="guntamatic:biostar:mybiostar:emptyAshIn" }
+Number:Temperature   Biostar_FlowIs0                 "Flow is 0"                          { channel="guntamatic:biostar:mybiostar:flowIs0" }
+Number:Temperature   Biostar_FlowIs3                 "Flow is 3"                          { channel="guntamatic:biostar:mybiostar:flowIs3" }
+Number:Temperature   Biostar_FlowIs6                 "Flow is 6"                          { channel="guntamatic:biostar:mybiostar:flowIs6" }
+Number:Volume        Biostar_FuelCounter             "Fuel counter"                       { channel="guntamatic:biostar:mybiostar:fuelCounter" }
+Number:Dimensionless Biostar_BufferLoad              "Buffer load."                       { channel="guntamatic:biostar:mybiostar:bufferLoad" }
+Number:Temperature   Biostar_BufferTop0              "Buffer Top 0"                       { channel="guntamatic:biostar:mybiostar:bufferTop0" }
+Number:Temperature   Biostar_BufferBtm0              "Buffer Btm 0"                       { channel="guntamatic:biostar:mybiostar:bufferBtm0" }
+Number:Temperature   Biostar_BufferTop1              "Buffer Top 1"                       { channel="guntamatic:biostar:mybiostar:bufferTop1" }
+Number:Temperature   Biostar_BufferBtm1              "Buffer Btm 1"                       { channel="guntamatic:biostar:mybiostar:bufferBtm1" }
+Number:Temperature   Biostar_BufferTop2              "Buffer Top 2"                       { channel="guntamatic:biostar:mybiostar:bufferTop2" }
+Number:Temperature   Biostar_BufferBtm2              "Buffer Btm 2"                       { channel="guntamatic:biostar:mybiostar:bufferBtm2" }
+Switch               Biostar_BExtraWw0               "B extra-WW. 0"                      { channel="guntamatic:biostar:mybiostar:bExtraWw0" }
+Switch               Biostar_BExtraWw1               "B extra-WW. 1"                      { channel="guntamatic:biostar:mybiostar:bExtraWw1" }
+Switch               Biostar_BExtraWw2               "B extra-WW. 2"                      { channel="guntamatic:biostar:mybiostar:bExtraWw2" }
+Switch               Biostar_AuxiliaryPump0          "Auxiliary pump 0"                   { channel="guntamatic:biostar:mybiostar:auxiliaryPump0" }
+Switch               Biostar_AuxiliaryPump1          "Auxiliary pump 1"                   { channel="guntamatic:biostar:mybiostar:auxiliaryPump1" }
+Switch               Biostar_AuxiliaryPump2          "Auxiliary pump 2"                   { channel="guntamatic:biostar:mybiostar:auxiliaryPump2" }
+String               Biostar_BoilersConditionNo      "Boiler´s condition no."             { channel="guntamatic:biostar:mybiostar:boilersConditionNo" }
+Number:Temperature   Biostar_BufferT5                "Buffer T5"                          { channel="guntamatic:biostar:mybiostar:bufferT5" }
+Number:Temperature   Biostar_BufferT6                "Buffer T6"                          { channel="guntamatic:biostar:mybiostar:bufferT6" }
+Number:Temperature   Biostar_BufferT7                "Buffer T7"                          { channel="guntamatic:biostar:mybiostar:bufferT7" }
+Number:Temperature   Biostar_ExtraWw0                "Extra-WW. 0"                        { channel="guntamatic:biostar:mybiostar:extraWw0" }
+Number:Temperature   Biostar_ExtraWw1                "Extra-WW. 1"                        { channel="guntamatic:biostar:mybiostar:extraWw1" }
+Number:Temperature   Biostar_ExtraWw2                "Extra-WW. 2"                        { channel="guntamatic:biostar:mybiostar:extraWw2" }
+Number:Dimensionless Biostar_Grate                   "Grate"                              { channel="guntamatic:biostar:mybiostar:grate" }
 ```
 
-**Rule**
+### Rule
 
-```javascript
+```java
 rule "Example Guntamatic Rule"
 when
     Item Season changed
@@ -365,4 +365,4 @@ Please provide feedback (👍 as well as 👎) when using the Binding for other
 
 Forum topic for feedback:
 
- - [openHAB community #128451](https://community.openhab.org/t/guntamatic-new-binding-for-guntamatic-heating-systems-biostar-powerchip-powercorn-biocom-pro-therm/128451 "openHAB community #128451")
+- [openHAB community #128451](https://community.openhab.org/t/guntamatic-new-binding-for-guntamatic-heating-systems-biostar-powerchip-powercorn-biocom-pro-therm/128451 "openHAB community #128451")
diff --git a/bundles/org.openhab.binding.haassohnpelletstove/README.md b/bundles/org.openhab.binding.haassohnpelletstove/README.md
index 2d053f4815255..c682122fec539 100644
--- a/bundles/org.openhab.binding.haassohnpelletstove/README.md
+++ b/bundles/org.openhab.binding.haassohnpelletstove/README.md
@@ -1,7 +1,7 @@
 # Haas Sohn Pellet Stove Binding
 
 The binding for Haassohnpelletstove communicates with a Haas and Sohn Pelletstove through the optional
-WIFI module. More information about the WIFI module can be found here: https://www.haassohn.com/de/ihr-plus/WLAN-Funktion
+WIFI module. More information about the WIFI module can be found here: <https://www.haassohn.com/de/ihr-plus/WLAN-Funktion>
 
 ## Supported Things
 
@@ -9,13 +9,12 @@ WIFI module. More information about the WIFI module can be found here: https://w
 |--------|--------------|------------|
 | haassohnpelletstove | Control of a Haas & Sohn Pellet Stove| oven|
 
-
 ## Thing Configuration
 
 In general two parameters are required. The IP-Address of the WIFI-Modul of the Stove in the local Network and the Access PIN of the Stove.
 The PIN can be found directly at the stove under the Menue/Network/WLAN-PIN
 
-```
+```java
 Thing haassohnpelletstove:oven:myOven "Pelletstove"  [ hostIP="192.168.0.23", hostPIN="1234"]
 ```
 
@@ -23,7 +22,6 @@ Thing haassohnpelletstove:oven:myOven "Pelletstove"  [ hostIP="192.168.0.23", ho
 
 The following channels are yet supported:
 
-
 | Channel | Type  | Access| Description|
 |---------|-------|-------|------------|
 | power| Switch | read/write|Turn the stove on/off|
@@ -41,7 +39,7 @@ The following channels are yet supported:
 
 demo.items:
 
-```
+```java
 Number:Temperature isTemp { channel="oven:channelIsTemp" }
 Number:Temperature spTemp { channel="oven:channelSpTemp" }
 String mode { channel="oven:channelMode" }
@@ -50,11 +48,11 @@ Switch power { channel="oven:power" }
 
 ## Google Assistant configuration
 
-See also: https://www.openhab.org/docs/ecosystem/google-assistant/
+See also: <https://www.openhab.org/docs/ecosystem/google-assistant/>
 
 googleassistantdemo.items
 
-```
+```java
 Group g_FeuerThermostat "FeuerThermostat" {ga="Thermostat" }
 Number StatusFeuer "Status Feuer" (g_FeuerThermostat) { ga="thermostatMode" }
 Number ZieltemperaturFeuer "ZieltemperaturFeuer" (g_FeuerThermostat) {ga="thermostatTemperatureSetpoint"}
diff --git a/bundles/org.openhab.binding.harmonyhub/README.md b/bundles/org.openhab.binding.harmonyhub/README.md
index e1891cfc5bfb4..adfa3dd56e443 100644
--- a/bundles/org.openhab.binding.harmonyhub/README.md
+++ b/bundles/org.openhab.binding.harmonyhub/README.md
@@ -73,10 +73,9 @@ String HarmonyGreatRoomActivity              "Current Activity [%s]"  (gMain) {
 ```
 
 Hubs can also send a button press to a device associated with the current activity.
-A String item can be used to send any button name/label or a Player item can be used to send Play/Pause/FastForward/Rewind/SkipForward/SkipBackward. 
+A String item can be used to send any button name/label or a Player item can be used to send Play/Pause/FastForward/Rewind/SkipForward/SkipBackward.
 This mimics the physical remote where buttons are mapped differently depending on which activity is running.
-For example the play button may be sent to a DVD player when running a "Watch DVD" activity, or it may be sent to an Apple TV when running a "Watch Movie" activity. 
-
+For example the play button may be sent to a DVD player when running a "Watch DVD" activity, or it may be sent to an Apple TV when running a "Watch Movie" activity.
 
 ```java
 String HarmonyHubGreatButton            { channel="harmonyhub:hub:GreatRoom:buttonPress" }
@@ -142,50 +141,52 @@ sitemap demo label="Main Menu" {
 
 ## ButtonPress values
 
-Example subset of values for the current activity "buttonPress" channels 
+Example subset of values for the current activity "buttonPress" channels
 
-```
+```text
 Mute,VolumeDown,VolumeUp,DirectionDown,DirectionLeft,DirectionRight,DirectionUp,Select,Stop,Play,Rewind,Pause,FastForward,SkipBackward,SkipForward,Menu,Back,Home,SelectGame,PageDown,PageUp,Aspect,Display,Search,Cross,Circle,Square,Triangle,PS,Info,NumberEnter,Hyphen,Number0,Number1,Number2,Number3,Number4,Number5,Number6,Number7,Number8,Number9,PrevChannel,ChannelDown,ChannelUp,Record,FrameAdvance,C,B,D,A,Live,ThumbsDown,ThumbsUp,TiVo,WiiA,WiiB,Guide,Clear,Green,Red,Blue,Yellow,Dot,Return,Favorite,Exit,Sleep
 ```
 
 A complete list of names for device buttons values can be determined via the REST API for channel-types. The easiest way to do this is through the API explorer:
 
 1. Go to the main UI page for your installation
-    * This is usually at <http://your-openhab-ip:8080> or, in the case of openhabian, <http://openhabian:8080>
-2. Login if you are not already logged in
-3. Using the left panel (or three bars on the upper left corner) go to Developer Tools -> API Explorer -> channel-types
-4. Click `GET` next to `/channel-types`
-5. Click `Try it out`
-6. Click `Execute`
-7. Search the `Response Body` "harmonyhub:device" and find your device in the JSON output
+    - This is usually at <http://your-openhab-ip:8080> or, in the case of openhabian, <http://openhabian:8080>
+1. Login if you are not already logged in
+1. Using the left panel (or three bars on the upper left corner) go to Developer Tools -> API Explorer -> channel-types
+1. Click `GET` next to `/channel-types`
+1. Click `Try it out`
+1. Click `Execute`
+1. Search the `Response Body` "harmonyhub:device" and find your device in the JSON output
 
 The valid commands (read: values) will be listed with the device. For example, the response body might show that for `harmonyhub:device:HarmonyHub:lasko_fan` the valid commands are `PowerToggle, Speed, Timer`
 
-     {
-        "parameters": [],
-        "parameterGroups": [],
-        "description": "Send a button press to device Harmony Device",
-        "label": "Send Button Press",
-        "itemType": "String",
-        "kind": "STATE",
-        "stateDescription": {
-          "readOnly": false,
-          "options": [
-            {
-              "value": "PowerToggle",
-              "label": "Power Toggle"
-            },
-            {
-              "value": "Speed",
-              "label": "Speed"
-            },
-            {
-              "value": "Timer",
-              "label": "Timer"
-            }
-          ]
-        },
-        "tags": [],
-        "UID": "harmonyhub:device:GreatRoom:lasko_fan:buttonPress",
-        "advanced": false
+```json
+{
+  "parameters": [],
+  "parameterGroups": [],
+  "description": "Send a button press to device Harmony Device",
+  "label": "Send Button Press",
+  "itemType": "String",
+  "kind": "STATE",
+  "stateDescription": {
+    "readOnly": false,
+    "options": [
+      {
+        "value": "PowerToggle",
+        "label": "Power Toggle"
+      },
+      {
+        "value": "Speed",
+        "label": "Speed"
+      },
+      {
+        "value": "Timer",
+        "label": "Timer"
       }
+    ]
+  },
+  "tags": [],
+  "UID": "harmonyhub:device:GreatRoom:lasko_fan:buttonPress",
+  "advanced": false
+}
+```
diff --git a/bundles/org.openhab.binding.haywardomnilogic/README.md b/bundles/org.openhab.binding.haywardomnilogic/README.md
index 24090354ca3e8..6e51c98e043cf 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/README.md
+++ b/bundles/org.openhab.binding.haywardomnilogic/README.md
@@ -31,7 +31,7 @@ Hayward OmniLogic Connection Parameters:
 
 | Property             | Default                                                        | Required | Description                                  |
 |----------------------|----------------------------------------------------------------|----------|----------------------------------------------|
-| Host Name            | https://app1.haywardomnilogic.com/HAAPI/HomeAutomation/API.ash | Yes      | Host name of the Hayward API server          |
+| Host Name            | <https://app1.haywardomnilogic.com/HAAPI/HomeAutomation/API.ash> | Yes      | Host name of the Hayward API server          |
 | User Name            | None                                                           | Yes      | Your Hayward User Name (not email address)   |
 | Password             | None                                                           | Yes      | Your Hayward User Password                   |
 | Telemetry Poll Delay | 12                                                             | Yes      | Telemetry Poll Delay (10-60 seconds)         |
diff --git a/bundles/org.openhab.binding.hccrubbishcollection/README.md b/bundles/org.openhab.binding.hccrubbishcollection/README.md
index 8a6b4c232f196..08d6dd0e94b6e 100644
--- a/bundles/org.openhab.binding.hccrubbishcollection/README.md
+++ b/bundles/org.openhab.binding.hccrubbishcollection/README.md
@@ -10,12 +10,12 @@ A single supported thing called `collection`.
 ## Thing Configuration
 
 The thing supports one setting labelled `address` which is your street number and name as it appears on Google.  
-*For Example:
-1 Victoria Street*
+_For Example:
+1 Victoria Street_
 
 > Note: The above address example is not valid as it is a business address.
 
-*__If the address is not valid or rubbish collection service does not apply (for example, a business address) then a `CONFIGURATION_ERROR` will occur.__*
+_If the address is not valid or rubbish collection service does not apply (for example, a business address) then a `CONFIGURATION_ERROR` will occur._
 
 ## Channels
 
@@ -39,8 +39,8 @@ The collection event `collection-event` triggers on the day of rubbish collectio
 
 #### Configuration
 
-You can set an `offset` in minutes. 
+You can set an `offset` in minutes.
 This can then trigger the collection event before or after the normal time of 12:00am on the day of the collection.
 
-*For Example:
-If you want the event to trigger at 7pm the day before, to remind you to take out the bins, then set the `offset` to `-300` (5 hours x 60 minutes).*
+_For Example:
+If you want the event to trigger at 7pm the day before, to remind you to take out the bins, then set the `offset` to `-300` (5 hours x 60 minutes)._
diff --git a/bundles/org.openhab.binding.hdanywhere/README.md b/bundles/org.openhab.binding.hdanywhere/README.md
index 8c425eeac55a0..93aa890fb14b9 100644
--- a/bundles/org.openhab.binding.hdanywhere/README.md
+++ b/bundles/org.openhab.binding.hdanywhere/README.md
@@ -14,8 +14,8 @@ but due to the lack of feedback on the actual state of the HDMI matrix when usin
 
 This binding currently supports the following thing types:
 
-- *multiroomplus* : Multiroom+ V3 (**Note:** This product is no longer sold by HDanywhere)
-- *mhub4k431* : MHUB 4K (4X3+1)
+- _multiroomplus_ : Multiroom+ V3 (**Note:** This product is no longer sold by HDanywhere)
+- _mhub4k431_ : MHUB 4K (4X3+1)
 
 ## Discovery
 
@@ -28,7 +28,7 @@ This binding does not require any special configuration.
 ## Thing Configuration
 
 Each thing requires the IP address of the matrix, and the interval in between status updates that are fetched from the matrix.
-Additionally, the *multiroomplus* has an additional required parameter 'ports' to specify the number of physical ports (e.g. 4x4, 8x8,...) of the matrix.
+Additionally, the _multiroomplus_ has an additional required parameter 'ports' to specify the number of physical ports (e.g. 4x4, 8x8,...) of the matrix.
 
 ```java
 Thing hdanywhere:mhub4k431:m1 [ipAddress="192.168.0.89",interval=15]
diff --git a/bundles/org.openhab.binding.hdpowerview/README.md b/bundles/org.openhab.binding.hdpowerview/README.md
index 41e1d5ffe1ff5..ab6881c1cc4e5 100644
--- a/bundles/org.openhab.binding.hdpowerview/README.md
+++ b/bundles/org.openhab.binding.hdpowerview/README.md
@@ -27,7 +27,7 @@ The binding can automatically discover the PowerView hub.
 The discovery process can be started by pressing the refresh button in the Main Configuration UI Inbox.
 However you can also manually create a (bridge) thing for the hub, and enter the required configuration parameters (see Thing Configuration below).
 If the configuration parameters are all valid, the binding will then automatically attempt to connect to the hub.
-If the connection succeeds, the hub will indicate its status as Online, otherwise it will show an error status. 
+If the connection succeeds, the hub will indicate its status as Online, otherwise it will show an error status.
 
 Once the hub thing has been created and successfully connected, the binding will automatically discover all shades and scenes that are in it.
 
@@ -47,8 +47,8 @@ If in the future, you add additional shades, repeaters, scenes, scene groups or
 |-------------------------|---------------|
 | host                    | The host name or IP address of the hub on your network. |
 | refresh                 | The number of milli-seconds between fetches of the PowerView hub's shade state (default 60'000 one minute). |
-| hardRefresh             | The number of minutes between hard refreshes of the PowerView hub's shade state (default 180 three hours). See [Refreshing the PowerView Hub Cache](#Refreshing-the-PowerView-Hub-Cache). |
-| hardRefreshBatteryLevel | The number of hours between hard refreshes of battery levels from the PowerView Hub (or 0 to disable, defaulting to weekly). See [Refreshing the PowerView Hub Cache](#Refreshing-the-PowerView-Hub-Cache). |
+| hardRefresh             | The number of minutes between hard refreshes of the PowerView hub's shade state (default 180 three hours). See [Refreshing the PowerView Hub Cache](#refreshing-the-powerview-hub-cache). |
+| hardRefreshBatteryLevel | The number of hours between hard refreshes of battery levels from the PowerView Hub (or 0 to disable, defaulting to weekly). See [Refreshing the PowerView Hub Cache](#refreshing-the-powerview-hub-cache). |
 
 ### Thing Configuration for PowerView Shades and Accessories
 
@@ -91,9 +91,9 @@ All of these channels appear in the binding, but only those which have a physica
 
 | Channel        | Item Type                | Description |
 |----------------|--------------------------|-------------|
-| position       | Rollershutter            | The vertical position of the shade's rail (if any). -- See [next chapter](#Roller-Shutter-Up/Down-Position-vs.-Open/Close-State). Up/Down commands will move the rail completely up or completely down. Percentage commands will move the rail to an intermediate position. Stop commands will halt any current movement of the rail. |
-| secondary      | Rollershutter            | The vertical position of the secondary rail (if any). Its function is similar to the `position` channel above. -- But see [next chapter](#Roller-Shutter-Up/Down-Position-vs.-Open/Close-State). |
-| vane           | Dimmer                   | The degree of opening of the slats or vanes (if any). On some shade types, setting this to a non-zero value might first move the shade `position` fully down, since the slats or vanes can only have a defined state if the shade is in its down position. See [Interdependency between Channel positions](#Interdependency-between-Channel-positions). |
+| position       | Rollershutter            | The vertical position of the shade's rail (if any). -- See [next chapter](#roller-shutter-updown-position-vs-openclose-state). Up/Down commands will move the rail completely up or completely down. Percentage commands will move the rail to an intermediate position. Stop commands will halt any current movement of the rail. |
+| secondary      | Rollershutter            | The vertical position of the secondary rail (if any). Its function is similar to the `position` channel above. -- But see [next chapter](#roller-shutter-updown-position-vs-openclose-state). |
+| vane           | Dimmer                   | The degree of opening of the slats or vanes (if any). On some shade types, setting this to a non-zero value might first move the shade `position` fully down, since the slats or vanes can only have a defined state if the shade is in its down position. See [Interdependency between Channel positions](#interdependency-between-channel-positions). |
 | command        | String                   | Send a command to the shade. Valid values are: `CALIBRATE`, `IDENTIFY` |
 | lowBattery     | Switch                   | Indicates ON when the battery level of the shade is low, as determined by the hub's internal rules. |
 | batteryLevel   | Number                   | Battery level (10% = low, 50% = medium, 100% = high) |
@@ -130,25 +130,25 @@ Depending on whether the shade is a top-down, bottom-up, left-right, right-left,
 |-----------------------------|-------------------|-----------------------|------------------|----------------|-------------------|----------------------|
 | Single action<br>bottom-up  | `position`        | ▲                     | Up               | `OPEN`         | 0%                | ▲                    |
 |                             |                   | ▼                     | Down             | `CLOSED`       | 100%              | ▼                    |
-| Single action<br>top-down   | `position`        | ▲                     | Up               | ***`CLOSED`*** | 0%                | ▲                    |
-|                             |                   | ▼                     | Down             | ***`OPEN`***   | 100%              | ▼                    |
-| Single action<br>right-left | `position`        | ▲                     | ***Left***       | `OPEN`         | 0%                | ▲                    |
-|                             |                   | ▼                     | ***Right***      | `CLOSED`       | 100%              | ▼                    |
-| Single action<br>left-right | `position`        | ▲                     | ***Right***      | `OPEN`         | 0%                | ▲                    |
-|                             |                   | ▼                     | ***Left***       | `CLOSED`       | 100%              | ▼                    |
+| Single action<br>top-down   | `position`        | ▲                     | Up               | **`CLOSED`** | 0%                | ▲                    |
+|                             |                   | ▼                     | Down             | **`OPEN`**   | 100%              | ▼                    |
+| Single action<br>right-left | `position`        | ▲                     | _**Left**_       | `OPEN`         | 0%                | ▲                    |
+|                             |                   | ▼                     | _**Right**_      | `CLOSED`       | 100%              | ▼                    |
+| Single action<br>left-right | `position`        | ▲                     | _**Right**_      | `OPEN`         | 0%                | ▲                    |
+|                             |                   | ▼                     | _**Left**_       | `CLOSED`       | 100%              | ▼                    |
 | Dual action<br>(lower rail) | `position`        | ▲                     | Up               | `OPEN`         | 0%                | ▲                    |
 |                             |                   | ▼                     | Down             | `CLOSED`       | 100%              | ▼                    |
-| Dual action<br>(upper rail) | ***`secondary`*** | ▲                     | Up               | ***`CLOSED`*** | 0%<sup>1)</sup>   | ![](doc/right.png)   |
-|                             |                   | ▼                     | Down             | ***`OPEN`***   | 100%<sup>1)</sup> | ![](doc/left.png)    |
-| Blackout panel ('DuoLite')  | ***`secondary`*** | ▲                     | Up               | `OPEN`         | 0%                | ▲                    |
+| Dual action<br>(upper rail) | _**`secondary`**_ | ▲                     | Up               | **`CLOSED`** | 0%<sup>1)</sup>   | ![dual_action arrow_right](doc/right.png)   |
+|                             |                   | ▼                     | Down             | **`OPEN`**   | 100%<sup>1)</sup> | ![dual_action arrow_left](doc/left.png)    |
+| Blackout panel ('DuoLite')  | _**`secondary`**_ | ▲                     | Up               | `OPEN`         | 0%                | ▲                    |
 |                             |                   | ▼                     | Down             | `CLOSED`       | 100%              | ▼                    |
 
-***<sup>1)</sup> BUG NOTE***: In openHAB versions v3.1.x and earlier, there was a bug in the handling of the position percent value of the `secondary` shade.
+_**<sup>1)</sup> BUG NOTE**_: In openHAB versions v3.1.x and earlier, there was a bug in the handling of the position percent value of the `secondary` shade.
 Although the RollerShutter Up/Down commands functioned properly as described in the table above, the percent state values (e.g. displayed on a slider control), did not.
 After moving the shade, the percent value would initially display the correct value, but on the next refresh it would 'flip' to the **inverse** of the correct value.
 The details are shown in the following table.
 This bug has been fixed from openHAB v3.2.x (or later) —
-***so if you have rules that depend on the percent value, and you update from an earlier openHAB version to v3.2.x (or later), you will need to modify them!***
+_so if you have rules that depend on the percent value, and you update from an earlier openHAB version to v3.2.x (or later), you will need to modify them!_
 
 | Channel     | UI Control Element | UI Control Command  | Immediate Action<br>on Shade State | Dimmer Percent Display<br>(Initial => Final) |
 |-------------|--------------------|---------------------|------------------------------------|----------------------------------------------|
@@ -196,7 +196,7 @@ To use default hub behavior (weekly updates), set `hardRefreshBatteryLevel` to z
 
 Note: You can also force the hub to refresh itself by sending a `REFRESH` command in a rule to an item that is connected to a channel in the hub as follows:
 
-```
+```java
 rule "Hub Refresh (every 20 minutes)"
 when
     Time cron "0 1/20 0 ? * * *"
@@ -225,7 +225,7 @@ For single shades the refresh takes the item's channel into consideration:
 
 ### `demo.things` File
 
-```
+```java
 Bridge hdpowerview:hub:home "Luxaflex Hub" @ "Living Room" [host="192.168.1.123"] {
     Thing shade s50150 "Living Room Shade" @ "Living Room" [id="50150"]
     Thing repeater r16384 "Bedroom Repeater" @ "Bedroom" [id="16384"]
@@ -236,7 +236,7 @@ Bridge hdpowerview:hub:home "Luxaflex Hub" @ "Living Room" [host="192.168.1.123"
 
 Shade items:
 
-```
+```java
 Rollershutter Living_Room_Shade_Position "Living Room Shade Position [%.0f %%]" {channel="hdpowerview:shade:home:s50150:position"}
 Rollershutter Living_Room_Shade_Secondary "Living Room Shade Secondary Position [%.0f %%]" {channel="hdpowerview:shade:home:s50150:secondary"}
 Dimmer Living_Room_Shade_Vane "Living Room Shade Vane [%.0f %%]" {channel="hdpowerview:shade:home:s50150:vane"}
@@ -249,7 +249,7 @@ Number Living_Room_Shade_SignalStrength "Living Room Shade Signal Strength" {cha
 
 Repeater items:
 
-```
+```java
 Color Bedroom_Repeater_Color "Bedroom Repeater Color" {channel="hdpowerview:repeater:home:r16384:color"}
 Dimmer Bedroom_Repeater_Brightness "Bedroom Repeater Brightness" {channel="hdpowerview:repeater:home:r16384:brightness"}
 String Bedroom_Repeater_Identify "Bedroom Repeater Identify" {channel="hdpowerview:repeater:home:r16384:identify"}
@@ -258,26 +258,26 @@ Switch Bedroom_Repeater_BlinkingEnabled "Bedroom Repeater Blinking Enabled [%s]"
 
 Scene items:
 
-```
+```java
 Switch Living_Room_Shades_Scene_Heart "Living Room Shades Scene Heart" <blinds> (g_Shades_Scene_Trigger) {channel="hdpowerview:hub:home:scenes#22663"}
 ```
 
 Scene Group items:
 
-```
+```java
 Switch Children_Rooms_Shades_Up "Good Morning Children" {channel="hdpowerview:hub:home:sceneGroups#27119"}
 ```
 
 Automation items:
 
-```
+```java
 Switch Automation_Children_Up_Sun "Children Up At Sunrise" {channel="hdpowerview:hub:home:automations#1262"}
 Switch Automation_Children_Up_Time "Children Up At 6:30" {channel="hdpowerview:hub:home:automations#49023"}
 ```
 
 ### `demo.sitemap` File
 
-```
+```perl
 Frame label="Living Room" {
     Switch item=Living_Room_Shades_Scene_Open
     Slider item=Living_Room_Shade_Position
diff --git a/bundles/org.openhab.binding.helios/README.md b/bundles/org.openhab.binding.helios/README.md
index 14847b522f2e4..7e87e865c381c 100644
--- a/bundles/org.openhab.binding.helios/README.md
+++ b/bundles/org.openhab.binding.helios/README.md
@@ -1,24 +1,22 @@
 # Helios Binding
 
-This binding integrates the Heliop door/videophone system (https://www.2n.cz).
+This binding integrates the Heliop door/videophone system (<https://www.2n.cz>).
 
 ## Supported Things
 
 Currently, the Helios IP Vario is supported by this binding, running the 2.21 version of the firmware
 
-
 ## Binding Configuration
 
 There is no specific binding configuration
 
-
 ## Thing Configuration
 
 The ipvario221 Thing requires the IP address of the videophone, and the username and password as a configuration value in order for the binding to log into the videophone.
 
 In the thing file, this looks e.g. like
 
-```
+```java
 Thing helios:ipvario213:gate [ipAddress="192.168.0.14", username="admin", password="mypassword"]
 ```
 
@@ -54,13 +52,13 @@ For switchstate, there are as well the switchstateswitch and switchstateoriginat
 
 demo.Things:
 
-```
+```java
 Thing helios:ipvario221:gate [ipAddress="192.168.0.14", username="admin", password="mypassword"]
 ```
 
 demo.items:
 
-```
+```java
 String GateKeyStamp "[%s]" (helios) {channel="helios:ipvario221:gate:keypressedstamp"}
 String GateCardSwiped "[%s]" (helios) {channel="helios:ipvario221:gate:card"}
 String GateCardStamp "[%s]" (helios) {channel="helios:ipvario221:gate:cardstamp"}
@@ -72,7 +70,7 @@ String GateCodeValid "[%s]" (helios) {channel="helios:ipvario221:gate:codevalid"
 
 demo.rules:
 
-```
+```java
 rule SomeRule
 when
     Channel "helios:ipvario221:gate:keypressed" triggered 
diff --git a/bundles/org.openhab.binding.heliosventilation/README.md b/bundles/org.openhab.binding.heliosventilation/README.md
index 13a9529ba0eb8..b57e989767364 100644
--- a/bundles/org.openhab.binding.heliosventilation/README.md
+++ b/bundles/org.openhab.binding.heliosventilation/README.md
@@ -4,7 +4,7 @@ This is the binding for Helios Ventilation Systems KWL EC 200/300/500 Pro.
 It requires a connection to the RS485 bus used by the original remote controls KWL-FB (9417) and does not use the Modbus/TCP interface of the newer EasyControl devices.
 
 For electrical connection it is recommended to use an USB-RS485 interface, but any RS485 interface that shows up as a serial port will do.
-Setup the device as described in https://www.openhab.org/docs/administration/serial.html.
+Setup the device as described in <https://www.openhab.org/docs/administration/serial.html>.
 
 The binding will use the remote control address 15 for communication, so make sure that this is not assigned to a physically present remote control.
 
@@ -17,7 +17,7 @@ The binding was developed and test on a KWL EC 200 Pro device.
 
 ## Binding Configuration
 
-The binding requires access to the serial device connecting to the RS485 bus as described in https://www.openhab.org/docs/administration/serial.html.
+The binding requires access to the serial device connecting to the RS485 bus as described in <https://www.openhab.org/docs/administration/serial.html>.
 Otherwise only thing configuration is needed.
 
 ## Thing Configuration
@@ -67,13 +67,13 @@ Note: the configuration channels are not intended to be written regularly.
 
 Things:
 
-```
+```java
 heliosventilation:ventilation:MyKWL  [ serialPort="/dev/ttyUSB0" ]
 ```
 
 Items:
 
-```
+```java
 Switch KWLOnOff { channel="heliosventilation:ventilation:MyKWL:powerState" }
 Switch KWLWinter { channel="heliosventilation:ventilation:MyKWL:winterMode" }
 
@@ -92,7 +92,7 @@ Number Max_Fan_Speed "Max Fan Speed" <fan> { channel="heliosventilation:ventilat
 
 Sitemap:
 
-```
+```perl
 sitemap helios_kwl label="Helios Ventilation" {
         Frame label="Temperatures" {
               Text item=Outside_Temperature
diff --git a/bundles/org.openhab.binding.heos/README.md b/bundles/org.openhab.binding.heos/README.md
index ae4e46ea6d19e..62663e3ebf5b4 100644
--- a/bundles/org.openhab.binding.heos/README.md
+++ b/bundles/org.openhab.binding.heos/README.md
@@ -14,7 +14,6 @@ Bridge:
 The binding supports a bridge to connect to the HEOS-Network.
 A bridge uses the thing ID "bridge".
 
-
 Player:
 A generic player is supported via this binding.
 Currently no differences are made between the players.
@@ -24,13 +23,12 @@ Groups:
 The binding supports HEOS groups.
 A group uses the Thing ID "group"
 
-
 ## Discovery
 
 This binding supports full automatic discovery of available players to be used as a bridge, players and groups.
 You need to add a Bridge device first (which is also auto-discovered by the binding) which can be any HEOS device in your network (preferably which has wired connection).
 
-__Important!__
+**Important!**
 Please note that only one bridge is required to establish a connection.
 Adding a second bridge can cause trouble with the connection.
 
@@ -59,9 +57,9 @@ The password and the user name are used to login to the HEOS account.
 This is required to load the favorites, playlists and so on from personal settings.
 If no login information is provided these features can't be used.
 
-````
+```java
 Bridge heos:bridge:main "name" [ipAddress="192.168.0.1", unsername="xxx", password="123456"]
-````
+```
 
 ### Player Configuration
 
@@ -73,9 +71,9 @@ Player have the following configuration parameter
 
 For manual configuration a player can be defined as followed:
 
-````
+```java
 Thing heos:player:player1 "name" [pid="123456789"]
-````
+```
 
 PID behind the heos:player:--- should be changed as required.
 It is recommended to use the Player PID.
@@ -94,7 +92,7 @@ Player have the following configuration parameter
 Groups will automatically appear in the Inbox if that Group is active.
 To do this, build your Group from the HEOS app, then the group will appear in the Inbox.
 
-```
+```java
 Thing heos:group:group1 "name" [members="45345634;35534567"]
 ```
 
@@ -103,11 +101,11 @@ Thing heos:group:group1 "name" [members="45345634;35534567"]
 Defining Player and Bridge together.
 To ensure that the players and groups are attached to the bridge the definition can be like:
 
-```
+```java
 Bridge heos:bridge:main "Bridge" [ipAddress="192.168.0.1", username="userName", password="123456"] {
-	player Kitchen "Kitchen"[pid="434523813"]
-	player LivingRoom "Living Room"[pid="918797451"]
-	group 813793755 "Ground Level"[members="434523813;918797451"]
+ player Kitchen "Kitchen"[pid="434523813"]
+ player LivingRoom "Living Room"[pid="918797451"]
+ group 813793755 "Ground Level"[members="434523813;918797451"]
 }
 ```
 
@@ -143,7 +141,7 @@ You can send commands to these channels from rules by sending the name of the se
 
 #### Example
 
-```
+```java
 Player LivingRoom_Control "Control" {channel="heos:player:main:LivingRoom:Control"}
 Selection item=LivingRoom_Playlists     label="Playlist" icon="music"
 ```
@@ -224,7 +222,7 @@ A current list can be found within the HEOS CLI protocol which can be found [her
 
 For a list of the commands please refer to the [HEOS CLI protocol](https://rn.dmglobal.com/euheos/HEOS_CLI_ProtocolSpecification_2021.pdf).
 
-## *Dynamic Channels*
+## _Dynamic Channels_
 
 Also the bridge supports dynamic channels which represent the players of the network.
 They are added dynamically if a player is found. The player and group channels are only shown on the bridge.
@@ -237,7 +235,7 @@ They are added dynamically if a player is found. The player and group channels a
 
 Example
 
- ```
+ ```java
  Switch Player_1 "Player [%s]" {channel="heos:bridge:main:P123456789"}
  ```
 
@@ -247,7 +245,7 @@ Example
 
 ### demo.things:
 
-```
+```java
 Bridge heos:bridge:main "Bridge" [ipAddress="192.168.0.1", username="userName", password="123456"] {
     player Kitchen "Kitchen"[pid="434523813"]
     player LivingRoom "Living Room"[pid="918797451"]
@@ -257,7 +255,7 @@ Bridge heos:bridge:main "Bridge" [ipAddress="192.168.0.1", username="userName",
 
 ### demo.items:
 
-```
+```java
 Player LivingRoom_Control "Control" {channel="heos:player:main:LivingRoom:Control"}
 Switch LivingRoom_Mute "Mute"{channel="heos:player:main:LivingRoom:Mute"}
 Dimmer LivingRoom_Volume "Volume" {channel="heos:player:main:LivingRoom:Volume"}
@@ -270,14 +268,14 @@ String LivingRoom_Playlists {channel="heos:player:main:LivingRoom:Playlists"}
 
 ### demo.sitemap
 
-```
+```perl
    Frame label="LivingRoom" {
-    	Default item=LivingRoom_Control
-    	Default item=LivingRoom_Mute
-    	Default item=LivingRoom_Volume
-    	Default item=LivingRoom_Title
-    	Default item=LivingRoom_Interpret
-    	Default item=LivingRoom_Album
+     Default item=LivingRoom_Control
+     Default item=LivingRoom_Mute
+     Default item=LivingRoom_Volume
+     Default item=LivingRoom_Title
+     Default item=LivingRoom_Interpret
+     Default item=LivingRoom_Album
         Selection item=LivingRoom_Favorites     label="Favorite" icon="music"
         Selection item=LivingRoom_Playlists     label="Playlist" icon="music"
     }
@@ -310,33 +308,33 @@ Player B = Living Room (source)
 
 Items:
 
-```
-Switch HeosBridge_Play_Living	"Living Room"	(gHeos)	{channel="heos:bridge:ed0ac1ff-0193-65c6-c1b8-506137456a50:P918797451"}
-String HeosKitchen_Input			(gHeos) {channel="heos:player:918797451:Inputs"}
-String HeosKitchen_InputSelect	"Input"		(gHeos)
+```java
+Switch HeosBridge_Play_Living "Living Room" (gHeos) {channel="heos:bridge:ed0ac1ff-0193-65c6-c1b8-506137456a50:P918797451"}
+String HeosKitchen_Input   (gHeos) {channel="heos:player:918797451:Inputs"}
+String HeosKitchen_InputSelect "Input"  (gHeos)
 ```
 
 Rule for kitchen:
 
-```
+```java
 rule "Play AuxIn from Living Room"
-	when
-		Item HeosKitchen_InputSelect received command
-	then
-		if (receivedCommand.toString == "aux_in_1") {
-			sendCommand(HeosKitchen_Input, "aux_in_1")
-
-		} if (receivedCommand.toString == "LivingRoom") {
-			sendCommand(HeosBridge_Play_Living, ON)
-			sendCommand(HeosKitchen_Input, "aux_in_1")
-			sendCommand(HeosBridge_Play_Living, OFF)	//Switch player channel off again to be sure that it is OFF
-		}
+ when
+  Item HeosKitchen_InputSelect received command
+ then
+  if (receivedCommand.toString == "aux_in_1") {
+   sendCommand(HeosKitchen_Input, "aux_in_1")
+
+  } if (receivedCommand.toString == "LivingRoom") {
+   sendCommand(HeosBridge_Play_Living, ON)
+   sendCommand(HeosKitchen_Input, "aux_in_1")
+   sendCommand(HeosBridge_Play_Living, OFF) //Switch player channel off again to be sure that it is OFF
+  }
 ```
 
 Sitemap:
 
-```
-Switch item=HeosKitchen_InputSelect	mappings=[aux_in_1 = "Aux In" , LivingRoom = "Living Room"]
+```java
+Switch item=HeosKitchen_InputSelect mappings=[aux_in_1 = "Aux In" , LivingRoom = "Living Room"]
 ```
 
 ### The Online status of Groups and Players
@@ -350,16 +348,15 @@ First you have to define a new Item within the Item section which is used later
 
 Items:
 
-```
+```java
 String HeosGroup_Status
-
 ```
 
 Then we need a rule which triggers the state if an Item goes Online or Offline.
 
 Rules:
 
-```
+```java
 rule "Online State Heos Group"
 
 when
@@ -373,21 +370,21 @@ end
 
 Sitemap:
 
-```
+```perl
 Frame label="Heos Group" visibility=[HeosGroup_Status==ONLINE] {
 
-	Default item=HeosGroup1_Player
-	Default item=HeosGroup1_Volume
-	Default item=HeosGroup1_Mute
-	Default item=HeosGroup1_Favorites
-	Default item=HeosGroup1_Playlist
-
-	Text item=HeosGroup1_Song {
-		Default item=HeosGroup1_Song
-		Default item=HeosGroup1_Artist
-		Default item=HeosGroup1_Album
-		Image item=HeosGroup1_Cover url=""
-	}
+ Default item=HeosGroup1_Player
+ Default item=HeosGroup1_Volume
+ Default item=HeosGroup1_Mute
+ Default item=HeosGroup1_Favorites
+ Default item=HeosGroup1_Playlist
+
+ Text item=HeosGroup1_Song {
+  Default item=HeosGroup1_Song
+  Default item=HeosGroup1_Artist
+  Default item=HeosGroup1_Album
+  Image item=HeosGroup1_Cover url=""
+ }
 
 }
 ```
@@ -396,7 +393,7 @@ Frame label="Heos Group" visibility=[HeosGroup_Status==ONLINE] {
 
 Multiple actions are supported by this binding. In classic rules these are accessible as shown in the example below:
 
-```
+```java
  val actions = getActions("heos","heos:bridge:bridgeId")
  if(null === actions) {
         logInfo("actions", "Actions not found, check thing ID")
@@ -408,4 +405,4 @@ Multiple actions are supported by this binding. In classic rules these are acces
 
 ### playInputFromPlayer(sourcePlayer, sourceInput, destination)
 
-Allows to play a source from a player to another player. 
+Allows to play a source from a player to another player.
diff --git a/bundles/org.openhab.binding.herzborg/README.md b/bundles/org.openhab.binding.herzborg/README.md
index e3eff366d836e..2088cdb7dc681 100644
--- a/bundles/org.openhab.binding.herzborg/README.md
+++ b/bundles/org.openhab.binding.herzborg/README.md
@@ -1,6 +1,6 @@
 # Herzborg Binding
 
-This binding supports smart curtain motors by Herzborg (http://www.herzborg.com/pro_list.aspx?TypeID=1)
+This binding supports smart curtain motors by Herzborg (<http://www.herzborg.com/pro_list.aspx?TypeID=1>)
 
 ## Supported Things
 
@@ -58,7 +58,7 @@ All the channels are read-write
 
 herzborg.things:
 
-```
+```java
 Bridge herzborg:serial_bus:my_herzborg_bus [ port="/dev/ttyAMA1" ]
 {
     Thing herzborg:curtain:livingroom [ address=1234, poll_interval=1 ]
@@ -67,13 +67,13 @@ Bridge herzborg:serial_bus:my_herzborg_bus [ port="/dev/ttyAMA1" ]
 
 herzborg.items:
 
-```
+```java
 Rollershutter LivingRoom_Window {channel="herzborg:curtain:livingroom:position"}
 ```
 
 herzborg.sitemap:
 
-```
+```perl
 Frame label="Living room curtain"
 {
     Switch item=LivingRoom_Window label="Control" mappings=["DOWN"="Close", "STOP"="Stop", "UP"="Open"]
diff --git a/bundles/org.openhab.binding.homeconnect/README.md b/bundles/org.openhab.binding.homeconnect/README.md
index a03c8a9dcba64..6d8bdf70f7e99 100644
--- a/bundles/org.openhab.binding.homeconnect/README.md
+++ b/bundles/org.openhab.binding.homeconnect/README.md
@@ -1,7 +1,7 @@
 # Home Connect Binding
 
 The binding integrates the [Home Connect](https://www.home-connect.com/) system into openHAB.
-By using the Home Connect API it connects to household devices from brands like Bosch and Siemens. 
+By using the Home Connect API it connects to household devices from brands like Bosch and Siemens.
 
 Because all status updates and commands have to go through the API, a permanent internet connection is required.
 
@@ -9,140 +9,130 @@ Because all status updates and commands have to go through the API, a permanent
 
 ### Bridge
 
-The __Home Connect API__ (Bridge Type ID: api_bridge) is responsible for the communication with the Home Connect API. All devices use a bridge to execute commands and listen for updates. Without a working bridge the devices cannot communicate.
+The **Home Connect API** (Bridge Type ID: api_bridge) is responsible for the communication with the Home Connect API. All devices use a bridge to execute commands and listen for updates. Without a working bridge the devices cannot communicate.
 
 ### Devices
 
 Supported devices: dishwasher, washer, washer / dryer combination, dryer, oven, refrigerator freezer, coffee machine, hood, cooktop*
 
-*\* experimental support*
+#### experimental support
 
-| Home appliance | Thing Type ID    | 
+| Home appliance | Thing Type ID    |
 | --------------- | ------------ |
-| Dishwasher | dishwasher | 
-| Washer | washer | 
-| Washer / Dryer combination | washerdryer | 
-| Dryer | dryer | 
-| Oven | oven | 
-| Hood | hood | 
-| Cooktop | hob | 
-| Refrigerator Freezer | fridgefreezer | 
-| Coffee Machine | coffeemaker | 
-
-> **INFO**: Currently the Home Connect API does not support all appliance programs. Please check if your desired program is available (e.g. https://developer.home-connect.com/docs/washing-machine/supported_programs_and_options).
-
+| Dishwasher | dishwasher |
+| Washer | washer |
+| Washer / Dryer combination | washerdryer |
+| Dryer | dryer |
+| Oven | oven |
+| Hood | hood |
+| Cooktop | hob |
+| Refrigerator Freezer | fridgefreezer |
+| Coffee Machine | coffeemaker |
+
+> **INFO:** Currently the Home Connect API does not support all appliance programs. Please check if your desired program is available (e.g. <https://developer.home-connect.com/docs/washing-machine/supported_programs_and_options>).
 
 ## Discovery
 
 After the bridge has been added and authorized, devices are discovered automatically.
 
-
 ## Channels
 
 | Channel Type ID | Item Type | Read only | Description | Available on thing |
 | --------------- | --------- | --------- | ----------- | ------------------ |
-| power_state | Switch | false | This setting describes the current power state of the home appliance. | dishwasher, oven, coffeemaker, hood, hob  | 
-| door_state | Contact | true | This status describes the door state of a home appliance. A status change is either triggered by the user operating the home appliance locally (i.e. opening/closing door) or automatically by the home appliance (i.e. locking the door). | dishwasher, washer, washerdryer, dryer, oven, fridgefreezer | 
-| operation_state | String | true | This status describes the operation state of the home appliance. | dishwasher, washer, washerdryer, dryer, oven, hood, hob, coffeemaker | 
-| remote_start_allowance_state | Switch | true  | This status indicates whether the remote program start is enabled. This can happen due to a programmatic change (only disabling), or manually by the user changing the flag locally on the home appliance, or automatically after a certain duration - usually in 24 hours. | dishwasher, washer, washerdryer, dryer, oven, hood, coffeemaker | 
-| remote_control_active_state | Switch | true  | This status indicates whether the allowance for remote controlling is enabled. | dishwasher, washer, washerdryer, dryer, oven, hood, hob | 
-| active_program_state | String | true  | This status describes the active program of the home appliance. | dishwasher, washer, washerdryer, dryer, oven, hood, hob, coffeemaker  | 
-| selected_program_state | String | false | This state describes the selected program of the home appliance. | dishwasher, washer, washerdryer, dryer, oven, hob, coffeemaker | 
-| remaining_program_time_state | Number:Time | true | This status indicates the remaining program time of the home appliance. | dishwasher, washer, washerdryer, dryer, oven | 
-| elapsed_program_time | Number:Time | true | This status indicates the elapsed program time of the home appliance. | oven | 
-| program_progress_state | Number:Dimensionless | true | This status describes the program progress of the home appliance in percent. | dishwasher, washer, washerdryer, dryer, oven, coffeemaker | 
-| duration | Number:Time | true | This status describes the duration of the program of the home appliance. | oven | 
-| oven_current_cavity_temperature | Number:Temperature | true | This status describes the current cavity temperature of the home appliance. | oven | 
-| setpoint_temperature | Number:Temperature | false | This status describes the setpoint/target temperature of the home appliance. | oven | 
-| laundry_care_washer_temperature | String | false | This status describes the temperature of the washing program of the home appliance. | washer, washerdryer | 
-| laundry_care_washer_spin_speed | String | false | This status defines the spin speed of a washer program of the home appliance. | washer, washerdryer | 
-| laundry_care_washer_idos1_level | String | false | This status defines the i-Dos 1 dosing level of a washer program of the home appliance (if appliance supports i-Dos). | washer | 
-| laundry_care_washer_idos2_level | String | false | This status defines the i-Dos 2 dosing level of a washer program of the home appliance (if appliance supports i-Dos). | washer | 
-| laundry_care_washer_idos1 | Switch | true | This status indicates whether i-Dos 1 is activated for a washer program of the home appliance. (If appliance supports i-Dos) | washer | 
-| laundry_care_washer_idos2 | Switch | true | This status indicates whether i-Dos 2 is activated for a washer program of the home appliance. (If appliance supports i-Dos) | washer | 
-| laundry_care_washer_vario_perfect | String | true | This status defines the vario perfect mode of a washer program of the home appliance. | washer, washerdryer | 
-| laundry_care_washer_less_ironing | Switch | true | This status indicates whether less ironing is activated for a washer program of the home appliance. | washer, washerdryer | 
-| laundry_care_washer_pre_wash | Switch | true | This status indicates whether the pre-wash is activated for a washer program of the home appliance. | washer, washerdryer | 
-| laundry_care_washer_rinse_plus | String | true | This status defines the number of additional rinses of a washer program of the home appliance. | washer, washerdryer | 
-| laundry_care_washer_rinse_hold | Switch | true | This status indicates whether the spin function is deactivated for a washer program of the home appliance (washing will remain in the water after the last rinse cycle). | washer, washerdryer | 
-| laundry_care_washer_soak | Switch | true | This status indicates whether the soaking is activated for a washer program of the home appliance. | washer, washerdryer | 
-| laundry_care_washer_load_recommendation | Number:Mass | true | This channel indicates the maximum laundry load recommended for a program of the home appliance. | washer, washerdryer | 
-| program_energy | Number:Dimensionless | true | This channel provides the estimated energy required in percentage for a program of the home appliance. | washer, washerdryer | 
-| program_water | Number:Dimensionless | true | This channel provides the estimated water required in percentage for a program of the home appliance. | washer, washerdryer | 
-| dryer_drying_target | String | false | This status defines the desired dryness of a program of the home appliance. | dryer, washerdryer | 
-| setpoint_temperature_refrigerator | Number:Temperature | false | Target temperature of the refrigerator compartment (range depends on appliance - common range 2 to 8°C). | fridgefreezer | 
-| setpoint_temperature_freezer | Number:Temperature | false | Target temperature of the freezer compartment (range depends on appliance - common range -16 to -24°C). | fridgefreezer | 
-| super_mode_refrigerator | Switch | false | The setting has no impact on setpoint temperatures but will make the fridge compartment cool to the lowest possible temperature until it is disabled manually by the customer or by the HA because of a timeout. | fridgefreezer | 
-| super_mode_freezer | Switch | false | This setting has no impact on setpoint temperatures but will make the freezer compartment cool to the lowest possible temperature until it is disabled manually by the customer or by the home appliance because of a timeout. | fridgefreezer | 
-| coffeemaker_drip_tray_full_state | Switch | true | Is coffee maker drip tray full? | coffeemaker | 
-| coffeemaker_water_tank_empty_state | Switch | true | Is coffee maker water tank empty? | coffeemaker | 
-| coffeemaker_bean_container_empty_state | Switch | true | Is coffee maker bean container empty? | coffeemaker | 
-| hood_venting_level | String | true | This option defines the required fan setting of the hood. | hood | 
-| hood_intensive_level | String | true | This option defines the intensive setting of the hood. | hood | 
-| hood_program_state | String | false | Adds hood controller actions to the appliance. The following commands are supported: `stop`, `venting1`, `venting2`, `venting3`, `venting4`, `venting5`, `ventingIntensive1`, `ventingIntensive1`, `automatic` and `delayed`. Furthermore it is possible to send raw (Home Connect JSON payload) to the home appliance. | hood | 
-| basic_actions_state | String | false | Adds basic controller actions to the appliance. The following basic commands are supported: `start` (start current selected program), `stop` (stop current program) and `selected` (show current program information). Furthermore it is possible to send raw (Home Connect JSON payload) to the home appliance. | dishwasher, oven, washer, washerdryer, dryer, coffeemaker | 
-| functional_light_state | Switch | false | This setting describes the current functional light state of the home appliance. | hood | 
-| functional_light_brightness_state | Dimmer | false | This setting describes the brightness state of the functional light. | hood | 
-| ambient_light_state | Switch | false | This setting describes the current ambient light state of the home appliance. | dishwasher, hood | 
-| ambient_light_brightness_state | Dimmer | false | This setting describes the brightness state of the ambient light. *INFO: Please note that the brightness can't be set if the ambient light color is set to `CustomColor`.* | dishwasher, hood | 
-| ambient_light_color_state | String | false | This setting describes the current ambient light color state of the home appliance. | dishwasher, hood | 
-| ambient_light_custom_color_state | Color | false | This setting describes the custom color state of the ambient light. HSB color commands are supported as well as hex color string e.g. `#11ff00`. *INFO: Please note that the brightness can't be set.* | dishwasher, hood | 
-
-            
-## Thing Configuration
+| power_state | Switch | false | This setting describes the current power state of the home appliance. | dishwasher, oven, coffeemaker, hood, hob  |
+| door_state | Contact | true | This status describes the door state of a home appliance. A status change is either triggered by the user operating the home appliance locally (i.e. opening/closing door) or automatically by the home appliance (i.e. locking the door). | dishwasher, washer, washerdryer, dryer, oven, fridgefreezer |
+| operation_state | String | true | This status describes the operation state of the home appliance. | dishwasher, washer, washerdryer, dryer, oven, hood, hob, coffeemaker |
+| remote_start_allowance_state | Switch | true  | This status indicates whether the remote program start is enabled. This can happen due to a programmatic change (only disabling), or manually by the user changing the flag locally on the home appliance, or automatically after a certain duration - usually in 24 hours. | dishwasher, washer, washerdryer, dryer, oven, hood, coffeemaker |
+| remote_control_active_state | Switch | true  | This status indicates whether the allowance for remote controlling is enabled. | dishwasher, washer, washerdryer, dryer, oven, hood, hob |
+| active_program_state | String | true  | This status describes the active program of the home appliance. | dishwasher, washer, washerdryer, dryer, oven, hood, hob, coffeemaker  |
+| selected_program_state | String | false | This state describes the selected program of the home appliance. | dishwasher, washer, washerdryer, dryer, oven, hob, coffeemaker |
+| remaining_program_time_state | Number:Time | true | This status indicates the remaining program time of the home appliance. | dishwasher, washer, washerdryer, dryer, oven |
+| elapsed_program_time | Number:Time | true | This status indicates the elapsed program time of the home appliance. | oven |
+| program_progress_state | Number:Dimensionless | true | This status describes the program progress of the home appliance in percent. | dishwasher, washer, washerdryer, dryer, oven, coffeemaker |
+| duration | Number:Time | true | This status describes the duration of the program of the home appliance. | oven |
+| oven_current_cavity_temperature | Number:Temperature | true | This status describes the current cavity temperature of the home appliance. | oven |
+| setpoint_temperature | Number:Temperature | false | This status describes the setpoint/target temperature of the home appliance. | oven |
+| laundry_care_washer_temperature | String | false | This status describes the temperature of the washing program of the home appliance. | washer, washerdryer |
+| laundry_care_washer_spin_speed | String | false | This status defines the spin speed of a washer program of the home appliance. | washer, washerdryer |
+| laundry_care_washer_idos1_level | String | false | This status defines the i-Dos 1 dosing level of a washer program of the home appliance (if appliance supports i-Dos). | washer |
+| laundry_care_washer_idos2_level | String | false | This status defines the i-Dos 2 dosing level of a washer program of the home appliance (if appliance supports i-Dos). | washer |
+| laundry_care_washer_idos1 | Switch | true | This status indicates whether i-Dos 1 is activated for a washer program of the home appliance. (If appliance supports i-Dos) | washer |
+| laundry_care_washer_idos2 | Switch | true | This status indicates whether i-Dos 2 is activated for a washer program of the home appliance. (If appliance supports i-Dos) | washer |
+| laundry_care_washer_vario_perfect | String | true | This status defines the vario perfect mode of a washer program of the home appliance. | washer, washerdryer |
+| laundry_care_washer_less_ironing | Switch | true | This status indicates whether less ironing is activated for a washer program of the home appliance. | washer, washerdryer |
+| laundry_care_washer_pre_wash | Switch | true | This status indicates whether the pre-wash is activated for a washer program of the home appliance. | washer, washerdryer |
+| laundry_care_washer_rinse_plus | String | true | This status defines the number of additional rinses of a washer program of the home appliance. | washer, washerdryer |
+| laundry_care_washer_rinse_hold | Switch | true | This status indicates whether the spin function is deactivated for a washer program of the home appliance (washing will remain in the water after the last rinse cycle). | washer, washerdryer |
+| laundry_care_washer_soak | Switch | true | This status indicates whether the soaking is activated for a washer program of the home appliance. | washer, washerdryer |
+| laundry_care_washer_load_recommendation | Number:Mass | true | This channel indicates the maximum laundry load recommended for a program of the home appliance. | washer, washerdryer |
+| program_energy | Number:Dimensionless | true | This channel provides the estimated energy required in percentage for a program of the home appliance. | washer, washerdryer |
+| program_water | Number:Dimensionless | true | This channel provides the estimated water required in percentage for a program of the home appliance. | washer, washerdryer |
+| dryer_drying_target | String | false | This status defines the desired dryness of a program of the home appliance. | dryer, washerdryer |
+| setpoint_temperature_refrigerator | Number:Temperature | false | Target temperature of the refrigerator compartment (range depends on appliance - common range 2 to 8°C). | fridgefreezer |
+| setpoint_temperature_freezer | Number:Temperature | false | Target temperature of the freezer compartment (range depends on appliance - common range -16 to -24°C). | fridgefreezer |
+| super_mode_refrigerator | Switch | false | The setting has no impact on setpoint temperatures but will make the fridge compartment cool to the lowest possible temperature until it is disabled manually by the customer or by the HA because of a timeout. | fridgefreezer |
+| super_mode_freezer | Switch | false | This setting has no impact on setpoint temperatures but will make the freezer compartment cool to the lowest possible temperature until it is disabled manually by the customer or by the home appliance because of a timeout. | fridgefreezer |
+| coffeemaker_drip_tray_full_state | Switch | true | Is coffee maker drip tray full? | coffeemaker |
+| coffeemaker_water_tank_empty_state | Switch | true | Is coffee maker water tank empty? | coffeemaker |
+| coffeemaker_bean_container_empty_state | Switch | true | Is coffee maker bean container empty? | coffeemaker |
+| hood_venting_level | String | true | This option defines the required fan setting of the hood. | hood |
+| hood_intensive_level | String | true | This option defines the intensive setting of the hood. | hood |
+| hood_program_state | String | false | Adds hood controller actions to the appliance. The following commands are supported: `stop`, `venting1`, `venting2`, `venting3`, `venting4`, `venting5`, `ventingIntensive1`, `ventingIntensive1`, `automatic` and `delayed`. Furthermore it is possible to send raw (Home Connect JSON payload) to the home appliance. | hood |
+| basic_actions_state | String | false | Adds basic controller actions to the appliance. The following basic commands are supported: `start` (start current selected program), `stop` (stop current program) and `selected` (show current program information). Furthermore it is possible to send raw (Home Connect JSON payload) to the home appliance. | dishwasher, oven, washer, washerdryer, dryer, coffeemaker |
+| functional_light_state | Switch | false | This setting describes the current functional light state of the home appliance. | hood |
+| functional_light_brightness_state | Dimmer | false | This setting describes the brightness state of the functional light. | hood |
+| ambient_light_state | Switch | false | This setting describes the current ambient light state of the home appliance. | dishwasher, hood |
+| ambient_light_brightness_state | Dimmer | false | This setting describes the brightness state of the ambient light. _INFO: Please note that the brightness can't be set if the ambient light color is set to `CustomColor`._ | dishwasher, hood |
+| ambient_light_color_state | String | false | This setting describes the current ambient light color state of the home appliance. | dishwasher, hood |
+| ambient_light_custom_color_state | Color | false | This setting describes the custom color state of the ambient light. HSB color commands are supported as well as hex color string e.g. `#11ff00`. _INFO: Please note that the brightness can't be set._ | dishwasher, hood |
 
-### Configuring the __Home Connect API__ Bridge
+## Thing Configuration
 
+### Configuring the **Home Connect API** Bridge
 
 #### 1. Preconditions
 
 1. Please create an account at [Home Connect](https://www.home-connect.com/) and add your physical appliance to your account.
-2. Test the connection to your physical appliance via mobile app ([Apple App Store (iOS)](https://itunes.apple.com/de/app/home-connect-app/id901397789?mt=8) or [Google Play Store (Android)](https://play.google.com/store/apps/details?id=com.bshg.homeconnect.android.release)).
+1. Test the connection to your physical appliance via mobile app ([Apple App Store (iOS)](https://itunes.apple.com/de/app/home-connect-app/id901397789?mt=8) or [Google Play Store (Android)](https://play.google.com/store/apps/details?id=com.bshg.homeconnect.android.release)).
 
 #### 2. Create Home Connect developer account
 
 1. Create an account at [https://developer.home-connect.com](https://developer.home-connect.com) and login.
-2. Please make sure you've added your associated Home Connect account email at <https://developer.home-connect.com/user/me/edit>. You should fill in your email address, which you use for the official Android or iOS app, at `Default Home Connect User Account for Testing`.  
+1. Please make sure you've added your associated Home Connect account email at <https://developer.home-connect.com/user/me/edit>. You should fill in your email address, which you use for the official Android or iOS app, at `Default Home Connect User Account for Testing`.  
 ![Screenshot Home Connect profile page](doc/home_connect_profile.png "Screenshot Home Connect profile page")
-
-3. Register / Create an application at [https://developer.home-connect.com/applications](https://developer.home-connect.com/applications)
-    * _Application ID_: e.g. `openhab-binding`
-    * _OAuth Flow_: Authorization Code Grant Flow
-    * _Home Connect User Account for Testing_: the associated user account email from [Home Connect](https://www.home-connect.com/)  
+1. Register / Create an application at [https://developer.home-connect.com/applications](https://developer.home-connect.com/applications)
+    - _Application ID_: e.g. `openhab-binding`
+    - _OAuth Flow_: Authorization Code Grant Flow
+    - _Home Connect User Account for Testing_: the associated user account email from [Home Connect](https://www.home-connect.com/)  
        > **WARNING**: Please don't use your developer account username  
 
      **_Please don't use your developer account username_**
-    * _Redirect URIs_: add your openHAB URL followed by `/homeconnect`  
+    - _Redirect URIs_: add your openHAB URL followed by `/homeconnect`  
     for example: `http://192.168.178.34:8080/homeconnect` or `https://myhome.domain.com/homeconnect`
-    * _One Time Token Mode_: keep unchecked 
-    * _Proof Key for Code Exchange_: keep unchecked
-4. After your application has been created, you should see the _Client ID_ and _Client Secret_ of the application. Please save these for later.  
+    - _One Time Token Mode_: keep unchecked
+    - _Proof Key for Code Exchange_: keep unchecked
+1. After your application has been created, you should see the _Client ID_ and _Client Secret_ of the application. Please save these for later.  
 
 ![Screenshot Home Connect application page](doc/home_connect_application.png "Screenshot Home Connect application page")
 
-
-
 #### 3. Setup bridge (openHAB UI)
 
 The Home Connect bridge can be configured in the openHAB UI as follows:
 
 1. Go to the Inbox and press the add button
-2. Choose `Home Connect Binding`
-3. Select `Home Connect API`
-4. Setup and save thing
-    * __client id:__ your application client id
-    * __client secret:__ your application client secret
-    * __simulator:__ false
-5. Now navigate to the URL (`Redirct URI`) you've added to your Home Connect application in the previous step (2.3). For example `http://192.168.178.80:8080/homeconnect`.
-6. Please follow the steps shown to authenticate your binding. You can redo this step every time. For example if you have authentication problems, just start wizard again.  
+1. Choose `Home Connect Binding`
+1. Select `Home Connect API`
+1. Setup and save thing
+    - **client id:** your application client id
+    - **client secret:** your application client secret
+    - **simulator:** false
+1. Now navigate to the URL (`Redirct URI`) you've added to your Home Connect application in the previous step (2.3). For example `http://192.168.178.80:8080/homeconnect`.
+1. Please follow the steps shown to authenticate your binding. You can redo this step every time. For example if you have authentication problems, just start wizard again.  
 ![Screenshot Home Connect wizard page 1](doc/homeconnect_setup_1.png "Screenshot Home Connect wizard page 1")  
 ![Screenshot Home Connect wizard page 2](doc/homeconnect_setup_2.png "Screenshot Home Connect wizard page 2")  
 ![Screenshot Home Connect wizard page 3](doc/homeconnect_setup_3.png "Screenshot Home Connect wizard page 3")  
 ![Screenshot Home Connect wizard page 4](doc/homeconnect_setup_4.png "Screenshot Home Connect wizard page 4")  
-
-7. That's it! Now you can use autodiscovery to add devices. Your devices should show up if you start a device scan in the openHAB UI.
-
-
+1. That's it! Now you can use autodiscovery to add devices. Your devices should show up if you start a device scan in the openHAB UI.
 
 ## Examples: File based configuration
 
@@ -150,7 +140,7 @@ If you prefer to configure everything via file instead of openHAB UI, here are s
 
 ### things/homeconnect.things
 
-```
+```java
 Bridge homeconnect:api_bridge:api_bridge_at_home "Home Connect API" [ clientId="1234", clientSecret="1234", simulator=false] {
     // Thing configurations
     Thing dishwasher dishwasher1 "Dishwasher"  [ haId="SIEMENS-HCS02DWH1-6F2FC400C1EA4A" ]
@@ -170,7 +160,7 @@ Bridge homeconnect:api_bridge:api_bridge_at_home "Home Connect API" [ clientId="
 
 The channel parameter uses the following syntax: `homeconnect:<thing type id>:<bridge id>:<thing id>:<channel type id>`. For example: `homeconnect:dishwasher:api_bridge_at_home:dishwasher1:power_state`
 
-```
+```java
 // dishwasher
 Switch                 Dishwasher_PowerState                  "Power State"                       {channel="homeconnect:dishwasher:api_bridge_at_home:dishwasher1:power_state"}
 Contact                Dishwasher_DoorState                   "Door State"                        {channel="homeconnect:dishwasher:api_bridge_at_home:dishwasher1:door_state"}
@@ -185,15 +175,15 @@ Number:Dimensionless   Dishwasher_ProgramProgressState        "Progress State"
 
 ## Home Connect Console
 
-The binding comes with a separate user interface, which is reachable through the web browser http(s)://[YOUROPENHAB]:[YOURPORT]/homeconnect (e.g. http://192.168.178.100:8080/homeconnect). 
+The binding comes with a separate user interface, which is reachable through the web browser http(s)://[YOUROPENHAB]:[YOURPORT]/homeconnect (e.g. `http://192.168.178.100:8080/homeconnect`).
 
 Features:
 
-* overview of your bridges and appliances
-* send commands to your appliances
-* see latest API requests
-* see received events from the Home Connect backend
-* API request counts
+- overview of your bridges and appliances
+- send commands to your appliances
+- see latest API requests
+- see received events from the Home Connect backend
+- API request counts
 
 > **INFO**: If you have a problems with your installation, please always provide request and event exports. ![Screenshot Home Connect wizard page 4](doc/export_button.png "Export button")
 
@@ -201,13 +191,13 @@ Features:
 
 ### Notification on credential error
 
-To get notified when your Home Connect credentials have been revoked or expired you can use the following rule to get notified. 
+To get notified when your Home Connect credentials have been revoked or expired you can use the following rule to get notified.
 
-This can happen if 
+This can happen if
 
-* your openHAB instance was offline for a longer period or
-* new terms weren't accepted or
-* a technical problem occurred.
+- your openHAB instance was offline for a longer period or
+- new terms weren't accepted or
+- a technical problem occurred.
 
 ```java
 rule "Offline check - Home Connect bridge"
@@ -236,17 +226,16 @@ Currently, not all program options of a device are available as items in openHAB
 
 #### 1. Retrieve "special command" payload
 
-You have a couple options to get the program settings payload. 
+You have a couple options to get the program settings payload.
 
-a) You could have a look at the Home Connect developer documentation (https://developer.home-connect.com/docs/) and create the payload on your own. 
+a) You could have a look at the Home Connect developer documentation (<https://developer.home-connect.com/docs/>) and create the payload on your own.
 
-b) You could have a look at the request logs and extract the payload from there. 
+b) You could have a look at the request logs and extract the payload from there.
 
 1. On the physical device, select your desired program with the appropriate options.
-2. Open the appliance section of the binding UI (http(s)://[YOUROPENHAB]:[YOURPORT]/appliances) and click the 'Selected Program' button.
+1. Open the appliance section of the binding UI (http(s)://[YOUROPENHAB]:[YOURPORT]/appliances) and click the 'Selected Program' button.
 ![Screenshot Home Connect wizard page 4](doc/selected_program_1.png "Get selected program")
-3. ![Screenshot Home Connect wizard page 4](doc/selected_program_2.png "Get selected program") Copy the JSON payload. In a further step, this payload will be used to start the program.
-
+1. ![Screenshot Home Connect wizard page 4](doc/selected_program_2.png "Get selected program") Copy the JSON payload. In a further step, this payload will be used to start the program.
 
 #### 2. Start program
 
@@ -254,7 +243,7 @@ After you've extracted the desired program command, you can start your program v
 
 ##### in rule
 
-*Example rule:*
+_Example rule:_
 
 ```java
 rule "trigger program"
@@ -269,9 +258,9 @@ Please replace `homeconnect_CoffeeMaker_BOSCH_HCS06COM1_B95E5103934D_basic_actio
 
 ##### via curl
 
-*Example command:*
+_Example command:_
 
-```bash
+```shell
 curl -X POST --header "Content-Type: text/plain" --header "Accept: application/json" -d '{"data":{"key":"ConsumerProducts.CoffeeMaker.Program.Beverage.EspressoMacchiato","options":[{"key":"ConsumerProducts.CoffeeMaker.Option.CoffeeTemperature","value":"ConsumerProducts.CoffeeMaker.EnumType.CoffeeTemperature.94C","unit":"enum"},{"key":"ConsumerProducts.CoffeeMaker.Option.BeanAmount","value":"ConsumerProducts.CoffeeMaker.EnumType.BeanAmount.Mild","unit":"enum"},{"key":"ConsumerProducts.CoffeeMaker.Option.FillQuantity","value":60,"unit":"ml"}]}}' "http://localhost:8080/rest/items/homeconnect_CoffeeMaker_BOSCH_HCS06COM1_B95E5103934D_basic_actions_state"
 ```
 
@@ -298,7 +287,6 @@ Please check log UI (http(s)://[YOUROPENHAB]:[YOURPORT]/homeconnect) and ask for
 
 The Home Connect API enforces rate [limits](https://developer.home-connect.com/docs/general/ratelimiting). If you have a lot of `429` response codes in your request log section (http(s)://[YOUROPENHAB]:[YOURPORT]/log/requests), please check the error response.
 
-
 ### Error message 'Program not supported', 'Unsupported operation' or 'SDK.Error.UnsupportedOption'
 
 Not all appliance programs and program options are supported by the Home Connect API. Unfortunately you can't use them. You will see error messages like the following in the binding UI (request log):
@@ -326,4 +314,4 @@ Not all appliance programs and program options are supported by the Home Connect
 You have two options to find the right HaID of your device.
 
 1. You can use the openHAB UI and start a scan. ![Screenshot openHAB UI Scan for new devices](doc/ui-scan-for-haid.png "Scan")
-2. You can use Home Connect binding UI. Please have a look at the first API request. ![Screenshot Home Connect Binding UI](doc/binding-ui-haid.png "First request")
+1. You can use Home Connect binding UI. Please have a look at the first API request. ![Screenshot Home Connect Binding UI](doc/binding-ui-haid.png "First request")
diff --git a/bundles/org.openhab.binding.homematic/README.md b/bundles/org.openhab.binding.homematic/README.md
index b27a6987a94fb..965a9cc59b93f 100644
--- a/bundles/org.openhab.binding.homematic/README.md
+++ b/bundles/org.openhab.binding.homematic/README.md
@@ -10,7 +10,7 @@ The CCU has to be configured to have "XML-RPC" set to "Full Access" or "Restrict
 Also the "Remote Homematic-Script API" has to be set to "Full Access" or "Restricted access".
 When the option "Restricted access" is used, some ports have to be added to the "Port opening" list.
 
-```
+```text
 2000;
 2001;
 2010;
@@ -24,7 +24,7 @@ Also under `Home page > Settings > Control panel` with the menu `Security` the o
 
 If this is not done the binding will not be able to connect to the CCU and the CCU Thing will stay uninitialized and sets a timeout exception:
 
-```
+```text
 xxx-xx-xx xx:xx:xx.xxx [hingStatusInfoChangedEvent] - - 'homematic:bridge:xxx' changed from INITIALIZING to OFFLINE (COMMUNICATION_ERROR): java.net.SocketTimeoutException: Connect Timeout
 ```
 
@@ -175,9 +175,9 @@ If set to true, devices are automatically unpaired from the gateway when their c
 If set to true, devices are automatically factory reset when their corresponding things are removed.
 Due to the factory reset, the device will also be unpaired from the gateway, even if "unpairOnDeletion" is set to false! (default = false)
 
-- **bufferSize** 
-If a large number of devices are connected to the gateway, the default buffersize of 2048 kB may be too small for communication with the gateway. 
-In this case, e.g. the discovery fails. 
+- **bufferSize**
+If a large number of devices are connected to the gateway, the default buffersize of 2048 kB may be too small for communication with the gateway.
+In this case, e.g. the discovery fails.
 With this setting the buffer size can be adjusted. The value is specified in kB.
 
 The syntax for a bridge is:
@@ -192,19 +192,19 @@ homematic:bridge:NAME
 
 ### Example
 
-**Minimum configuration**
+#### Minimum configuration
 
 ```java
 Bridge homematic:bridge:ccu [ gatewayAddress="..."]
 ```
 
-**With callback settings**
+#### With callback settings
 
 ```java
 Bridge homematic:bridge:ccu [ gatewayAddress="...", callbackHost="...", callbackPort=... ]
 ```
 
-**Multiple bridges**
+#### Multiple bridges
 
 ```java
 Bridge homematic:bridge:lxccu [ gatewayAddress="..."]
@@ -374,10 +374,10 @@ The remote control display is limited to five characters, a longer text is trunc
 
 You have several additional options to control the display.
 
-- BEEP *(TONE1, TONE2, TONE3)* - let the remote control beep
-- BACKLIGHT *(BACKLIGHT_ON, BLINK_SLOW, BLINK_FAST)* - control the display backlight
-- UNIT *(PERCENT, WATT, CELSIUS, FAHRENHEIT)* - display one of these units
-- SYMBOL *(BULB, SWITCH, WINDOW, DOOR, BLIND, SCENE, PHONE, BELL, CLOCK, ARROW_UP, ARROW_DOWN)* - display symbols, multiple symbols possible
+- BEEP _(TONE1, TONE2, TONE3)_ - let the remote control beep
+- BACKLIGHT _(BACKLIGHT_ON, BLINK_SLOW, BLINK_FAST)_ - control the display backlight
+- UNIT _(PERCENT, WATT, CELSIUS, FAHRENHEIT)_ - display one of these units
+- SYMBOL _(BULB, SWITCH, WINDOW, DOOR, BLIND, SCENE, PHONE, BELL, CLOCK, ARROW_UP, ARROW_DOWN)_ - display symbols, multiple symbols possible
 
 You can combine any option, they must be separated by a comma.
 If you specify more than one option for BEEP, BACKLIGHT and UNIT, only the first one is taken into account and all others are ignored. For SYMBOL you can specify multiple options.
@@ -426,11 +426,11 @@ Adds multiple virtual datapoints to the HM-Dis-WM55 and HM-Dis-EP-WM55 devices t
 
 **Note:** The HM-Dis-EP-WM55 has only a black and white display and therefore does not support datapoints for colored lines. In addition, only lines 1-3 can be set.
 
-#### Example ####
+#### Example
 
 Display text at line 1,3 and 5 when the bottom button on the display is pressed
 
-**Items**
+##### Items
 
 ```java
 String Display_line_1   "Line 1"    { channel="homematic:HM-Dis-WM55:ccu:NEQ0123456:1#DISPLAY_LINE_1" }
@@ -449,7 +449,7 @@ Switch Button_bottom    "Button"    { channel="homematic:HM-Dis-WM55:ccu:NEQ0123
 Switch Display_submit   "Submit"    { channel="homematic:HM-Dis-WM55:ccu:NEQ0123456:1#DISPLAY_SUBMIT" }
 ```
 
-**Rule**
+##### Rule
 
 ```javascript
 rule "Display Test"
@@ -473,6 +473,7 @@ end
 ```
 
 **Available icons:**
+
 - NONE
 - OFF
 - ON
@@ -488,6 +489,7 @@ end
 - SIGNAL_RED
 
 **Available colors (only HM-Dis-WM55):**
+
 - NONE(=WHITE)
 - WHITE
 - RED
@@ -503,6 +505,7 @@ The HmIP-WRCD display lines can be set via a combined parameter:
 ```java
 String Display_CombinedParam "Combined Parameter" {channel="homematic:HmIP-WRCD:ccu:123456:3#COMBINED_PARAMETER"}
 ```
+
 #### Set Display Lines
 
 The combined parameter can be used in a rule file like this:
@@ -518,17 +521,18 @@ openhab:send Display_CombinedParam '{DDBC=WHITE,DDTC=BLACK,DDI=0,DDA=CENTER,DDS=
 ```
 
 **Key translation:**
-- DDBC: Background color of this line. (*WHITE*, *BLACK*)
-- DDTC: Text color of this line. (*WHITE*, *BLACK*)
+
+- DDBC: Background color of this line. (_WHITE_, _BLACK_)
+- DDTC: Text color of this line. (_WHITE_, _BLACK_)
 - DDI: Icon to be shown after text. (see icon listing below)
-- DDA: Alignment of this line. (*LEFT*, *CENTER*, *RIGHT*)
+- DDA: Alignment of this line. (_LEFT_, _CENTER_, _RIGHT_)
 - DDS: Text of this line. (String, but see special character listing below)
-- DDID: Line number. (*1-5*)
-- DDC: Commit, should be set in the last line, otherwise leave unset. (*true*)
+- DDID: Line number. (_1-5_)
+- DDC: Commit, should be set in the last line, otherwise leave unset. (_true_)
 
 Each line can be updated separately without changing the other lines.
 
-Multiple lines can be updated within one command, use comma to separate each line. 
+Multiple lines can be updated within one command, use comma to separate each line.
 Here an example for a rule file:
 
 ```java
@@ -536,6 +540,7 @@ Display_CombinedParam.sendCommand("{DDBC=WHITE,DDTC=BLACK,DDI=24,DDA=LEFT,DDS=Wi
 ```
 
 **Special Characters:**
+
 - [ -> Ä
 - \# -> Ö
 - $ -> Ü
@@ -552,6 +557,7 @@ Display_CombinedParam.sendCommand("{DDBC=WHITE,DDTC=BLACK,DDI=24,DDA=LEFT,DDS=Wi
 - @ -> Arrow Down Right
 
 **Icons:**
+
 - 0 - No Icon
 - 1 - Light off
 - 2 - Light on
@@ -592,17 +598,21 @@ The display can also make short beep alarms:
 ```java
 Display_CombinedParam.sendCommand("{R=0,IN=10,ANS=0}")
 ```
-Note, that a commit (`DDC`) is not necessary for sounds. 
+
+Note, that a commit (`DDC`) is not necessary for sounds.
 
 As with line configuration, this can be combined with other line updates, separated with a comma.
 
-**Key translations**
-- R: Repetitions (*0 to 15*, 15=infinite)
-- IN: Interval (*5 to 80* in steps of five)
-- ANS: Beep sound (*-1 to 7*, see beep table)
+##### Key translations
+
+- R: Repetitions (_0 to 15_, 15=infinite)
+- IN: Interval (_5 to 80_ in steps of five)
+- ANS: Beep sound (_-1 to 7_, see beep table)
+
+##### Beep Sounds
 
-**Beep Sounds**
 This is the official mapping for the beep sounds
+
 - -1 - No Sound
 - 0 - Empty Battery
 - 1 - Alarm Off
@@ -615,7 +625,7 @@ This is the official mapping for the beep sounds
 
 ## Troubleshooting
 
-**SHORT & LONG_PRESS events of push buttons do not occur on the event bus**
+### SHORT & LONG_PRESS events of push buttons do not occur on the event bus
 
 It seems buttons like the HM-PB-2-WM55 do just send these kind of events to the CCU if they are mentioned in a CCU program.
 A simple workaround to make them send these events is, to create a program (rule inside the CCU) that does just have a "When" part and no "Then" part, in this "When" part each channel needs to be mentioned at least once.
@@ -623,13 +633,13 @@ As the HM-PB-2-WM55 for instance has two channels, it is enough to mention the S
 The LONG_PRESS events will work automatically as they are part of the same channels.
 After the creation of this program, the button device will receive configuration data from the CCU which have to be accepted by pressing the config-button at the back of the device.
 
-**INSTALL_TEST**
+### INSTALL_TEST
 
 If a button is still not working and you do not see any PRESS_LONG / SHORT in your log file (log level DEBUG), it could be because of enabled security.
 Try to disable security of your buttons in the HomeMatic Web GUI and try again.
 If you can't disable security try to use key INSTALL_TEST which gets updated to ON for each key press
 
-**-1 Failure**
+### -1 Failure
 
 A device may return this failure while fetching the datapoint values.
 I have tested pretty much but I did not find the reason.
@@ -640,12 +650,12 @@ Fetching values is only done at startup or if you trigger a REFRESH.
 I hope this will be fixed in one of the next CCU firmwares.
 With [Homegear](https://www.homegear.eu) everything works as expected.
 
-**No variables and scripts in GATEWAY-EXTRAS**
+### No variables and scripts in GATEWAY-EXTRAS
 
 The gateway autodetection of the binding can not clearly identify the gateway and falls back to the default implementation.
 Use the ```gatewayType=ccu``` config to force the binding to use the CCU implementation.
 
-**Variables out of sync**
+### Variables out of sync
 
 The CCU only sends an event if a datapoint of a device has changed.
 There is (currently) no way to receive an event automatically when a variable has changed.
@@ -663,7 +673,7 @@ In scripts:
 :::: tabs
 
 ::: tab JavaScript
- 
+
 ``` javascript
 import org.openhab.core.types.RefreshType
 ...
@@ -677,6 +687,7 @@ Var_1.sendCommand(RefreshType.REFRESH)
 ``` php
 Var_1.sendCommand(REFRESH)
 ```
+
 :::
 
 ::::
@@ -689,7 +700,7 @@ You have to delete the thing, start a scan and add it again.
 In case of problems in the discovery or if above mentioned error message appears in `openhab.log`, the size for the transmission buffer for the communication with the gateway is too small.
 The problem can be solved by increasing the `bufferSize` value in the bridge configuration.
 
-**Rollershutters are inverted**
+### Rollershutters are inverted
 
 openHAB and the CCU are using different values for the same state of a rollershutter.
 Examples: HmIP-BROLL, HmIP-FROLL, HmIP-BBL, HmIP-FBL and HmIP-DRBLI4
@@ -698,7 +709,7 @@ Examples: HmIP-BROLL, HmIP-FROLL, HmIP-BBL, HmIP-FBL and HmIP-DRBLI4
 | openHAB | 0%   | 100%   |
 | CCU     | 100% | 0%     |
 
-** The binding does not receive any status changes from the Homematic gateway**
+### The binding does not receive any status changes from the Homematic gateway
 
 First of all, make sure that none of the ports needed to receive status changes from the gateway are blocked by firewall settings.
 
diff --git a/bundles/org.openhab.binding.homewizard/README.md b/bundles/org.openhab.binding.homewizard/README.md
index 2c848b5961ec4..092ddb2bfe866 100644
--- a/bundles/org.openhab.binding.homewizard/README.md
+++ b/bundles/org.openhab.binding.homewizard/README.md
@@ -1,7 +1,7 @@
 # HomeWizard Binding
 
 The HomeWizard binding retrieves measurements from the HomeWizard Wi-Fi P1 meter.
-The meter itself is attached to a DSMR Smart Meter and reads out the telegrams, which it will forward to cloud storage. 
+The meter itself is attached to a DSMR Smart Meter and reads out the telegrams, which it will forward to cloud storage.
 However, recently HomeWizard also added an interface that can be queried locally.
 
 This binding uses that local interface to make the measurements available.
@@ -28,7 +28,7 @@ For DSMR5 meters this is generally once per second, for older versions the frequ
 
 Example of configuration through a .thing file:
 
-```
+```java
 Thing homewizard:p1_wifi_meter:my_meter [ ipAddress="192.178.1.67", refreshDelay=5 ]
 ```
 
@@ -47,10 +47,9 @@ Thing homewizard:p1_wifi_meter:my_meter [ ipAddress="192.178.1.67", refreshDelay
 | total_gas              | Number:Volume | The most recently reported total imported gas in m^3.                                      |
 | gas_timestamp          | DateTime      | The time stamp of the total_gas measurement.                                               |
 
-
 Example of configuration through a .items file:
 
-```
+```java
 Number:Energy Energy_Import_T1 "Imported Energy T1 [%.0f kWh]" {channel="homewizard:p1_wifi_meter:my_meter:total_energy_import_t1" }
 Number:Power  Active_Power_L1  "Active Power Phase 1 [%.1f W]" {channel="homewizard:p1_wifi_meter:my_meter:active_power_l1" }
 DateTime      Gas_Update       "Gas Update Time [%1$tH:%1$tM]" {channel="homewizard:p1_wifi_meter:my_meter:gas_timestamp" }
diff --git a/bundles/org.openhab.binding.hpprinter/README.md b/bundles/org.openhab.binding.hpprinter/README.md
index ffbe60b69e7f8..2518a50b31111 100644
--- a/bundles/org.openhab.binding.hpprinter/README.md
+++ b/bundles/org.openhab.binding.hpprinter/README.md
@@ -9,7 +9,7 @@ All channels are added dynamically depending on the type of printer and its capa
 
 ## Discovery
 
-This binding uses mDNS for discovering HP Printers on the local network. 
+This binding uses mDNS for discovering HP Printers on the local network.
 
 ## Thing Configuration
 
@@ -75,23 +75,23 @@ The configuration parameters are:
 
 Notes:
 
-* All channels are dynamically added at runtime.
-* The word color in channel names follows American spelling ("color").
-* The `colorLevel`, `colorMarkingUsed` and `colorPagesRemaining` channels are used on printers that have only a single color cartridge instead of separate Ccyan, magenta and yellow cartridges.
-* The `scanner` group is for the scanning engine which consists of scan, copy and other operations; the `scan` group is for scanner operations only.
-* If no `status` group channels are selected, then those relevant data endpoints on the *Embedded Web Server* are not polled for status information.
+- All channels are dynamically added at runtime.
+- The word color in channel names follows American spelling ("color").
+- The `colorLevel`, `colorMarkingUsed` and `colorPagesRemaining` channels are used on printers that have only a single color cartridge instead of separate Ccyan, magenta and yellow cartridges.
+- The `scanner` group is for the scanning engine which consists of scan, copy and other operations; the `scan` group is for scanner operations only.
+- If no `status` group channels are selected, then those relevant data endpoints on the _Embedded Web Server_ are not polled for status information.
 
 ## Full Textual Example
 
 ### Thing File
 
-```
+```java
 Thing hpprinter:printer:djprinter "Printer" @ "Office" [ ipAddress="192.168.1.1", usageInterval="30", statusInterval="4" ]
 ```
 
 ### Item File
 
-```
+```java
 String PrinterStatus "Status" { channel="hpprinter:printer:djprinter:status#status" }
 
 Number:Dimensionless PrinterBlackLevel "Black Level" { channel="hpprinter:printer:djprinter:ink#blackLevel" }
@@ -108,31 +108,31 @@ Number PrinterTotalMonochromePages "Total Monochrome Pages" { channel="hpprinter
 
 Black Ink displayed as a whole percentage - `60 %`
 
-```
+```perl
 Text item=hpprinter_printer_djprinter_ink_blackLevel label="Black [%.0f %unit%]"
 ```
 
 Black Marker displayed in millilitres - `21 ml`  
-*Default*
+_Default_
 
-```
+```perl
 Text item=hpprinter_printer_djprinter_usage_blackMarker label="Black Marker [%.0f %unit%]"
 ```
 
 Black Marker displayed in litres - `0.021 l`
 
-```
+```perl
 Text item=hpprinter_printer_djprinter_usage_blackMarker label="Black Marker [%.3f l]"
 ```
 
 Black Marker displayed in microlitres - `21000 µl`
 
-```
+```perl
 Text item=hpprinter_printer_djprinter_usage_blackMarker label="Black Marker [%.0f µl]"
 ```
 
 Scanner Document Feeder loaded with text status display - `ON` or `OFF`
 
-```
+```perl
 Text item=hpprinter_printer_djprinter_status_scannerAdfLoaded label="ADF Loaded [%s]"
 ```
diff --git a/bundles/org.openhab.binding.http/README.md b/bundles/org.openhab.binding.http/README.md
index deacc2fe16a4b..b0e4e79ea7ff7 100644
--- a/bundles/org.openhab.binding.http/README.md
+++ b/bundles/org.openhab.binding.http/README.md
@@ -26,14 +26,14 @@ It can be extended with different channels.
 | `headers`         | yes      |    -    | Additional headers that are sent along with the request. Format is "header=value". Multiple values can be stored as `headers="key1=value1", "key2=value2", "key3=value3",`. When using text based configuration include at minimum 2 headers to avoid parsing errors.|
 | `ignoreSSLErrors` | no       |  false  | If set to true ignores invalid SSL certificate errors. This is potentially dangerous.|
 
-*Note:* Optional "no" means that you have to configure a value unless a default is provided and you are ok with that setting.
+_Note:_ Optional "no" means that you have to configure a value unless a default is provided and you are ok with that setting.
 
-*Note:* The `BASIC_PREEMPTIVE` mode adds basic authentication headers even if the server did not request authentication.
+_Note:_ The `BASIC_PREEMPTIVE` mode adds basic authentication headers even if the server did not request authentication.
 This is dangerous and might be misused.
 The option exists to be able to authenticate when the server is not sending the proper 401/Unauthorized code.
 Authentication might fail if redirections are involved as headers are stripper prior to redirection.
 
-*Note:* If you rate-limit requests by using the `delay` parameter you have to make sure that the time between two refreshes is larger than the time needed for one refresh cycle.
+_Note:_ If you rate-limit requests by using the `delay` parameter you have to make sure that the time between two refreshes is larger than the time needed for one refresh cycle.
 
 **Attention:** `baseUrl` (and `stateExtension`/`commandExtension`) should not normally use escaping (e.g. `%22` instead of `"` or `%2c` instead of `,`).
 URLs are properly escaped by the binding itself before the request is sent.
@@ -52,7 +52,7 @@ The `image` channel-type supports `stateExtension`, `stateContent` and `escapedU
 |-------------------------|----------|-------------|-------------|
 | `stateExtension`        | yes      |      -      | Appended to the `baseURL` for requesting states. |
 | `commandExtension`      | yes      |      -      | Appended to the `baseURL` for sending commands. If empty, same as `stateExtension`. |
-| `stateTransformation  ` | yes      |      -      | One or more transformation applied to received values before updating channel. |
+| `stateTransformation`   | yes      |      -      | One or more transformation applied to received values before updating channel. |
 | `commandTransformation` | yes      |      -      | One or more transformation applied to channel value before sending to a remote. |
 | `escapedUrl`            | yes      |      -      | This specifies whether the URL is already escaped. |
 | `stateContent`          | yes      |      -      | Content for state requests (if method is `PUT` or `POST`) |
@@ -163,13 +163,13 @@ After the parameter reference the format needs to be appended.
 See the link above for more information about the available format parameters (e.g. to use the string representation, you need to append `s` to the reference, for a timestamp `t`).
 When sending an OFF command on 2020-07-06, the URL
 
-```
+```text
 http://www.domain.org/home/lights/23871/?status=%2$s&date=%1$tY-%1$tm-%1$td
 ```
 
 is transformed to
 
-```
+```text
 http://www.domain.org/home/lights/23871/?status=OFF&date=2020-07-06
 ```
 
@@ -177,12 +177,12 @@ http://www.domain.org/home/lights/23871/?status=OFF&date=2020-07-06
 
 ### `demo.things`
 
-```
+```java
 Thing http:url:foo "Foo" [
-	baseURL="https://example.com/api/v1/metadata-api/web/metadata",
-	headers="key1=value1", "key2=value2", "key3=value3",
-	refresh=15] {
-		Channels:
-			Type string : text "Text" [ stateTransformation="JSONPATH:$.metadata.data" ]
+ baseURL="https://example.com/api/v1/metadata-api/web/metadata",
+ headers="key1=value1", "key2=value2", "key3=value3",
+ refresh=15] {
+  Channels:
+   Type string : text "Text" [ stateTransformation="JSONPATH:$.metadata.data" ]
 }
 ```
diff --git a/bundles/org.openhab.binding.http/xtend_examples.md b/bundles/org.openhab.binding.http/xtend_examples.md
index 50b492fceb58f..513be4c73f82c 100644
--- a/bundles/org.openhab.binding.http/xtend_examples.md
+++ b/bundles/org.openhab.binding.http/xtend_examples.md
@@ -1,7 +1,10 @@
-## Vito WIFI (https://github.com/openhab/openhab-addons/issues/9480#issuecomment-751335696)
+# Xtend Examples
+
+## Vito WIFI (<https://github.com/openhab/openhab-addons/issues/9480#issuecomment-751335696>)
 
 ### .things
-```
+
+```java
 Thing http:url:vitowifi "VitoWifi" @ "1stfloor" [baseURL="http://192.168.1.61/", commandMethod="POST", delay="1000", refresh="90", timeout="900"]   {
 
     Channels:
@@ -13,21 +16,21 @@ Thing http:url:vitowifi "VitoWifi" @ "1stfloor" [baseURL="http://192.168.1.61/",
 
 ### .items
 
-``` 
+```java
 Number Vito_ID                   "Vito_ID"           <switch>                (gHeating)                                              {channel="http:url:vitowifi:Channel_Vito_ID" ,   expire="5m"  }
 Number Vito_Mode                 "Vito_Mode"         <switch>                (gHeating)                                              {channel="http:url:vitowifi:Channel_Vito_Mode" ,   expire="5m"  }// 0= Off 1= WW 2= WW+heat 0x42 (66)=party
 Number Vito_OnOff                "ONOFF Switch"      <switch>                (gHeating)                                              {channel="http:url:vitowifi:Channel_Vito_OnOff" ,   expire="5m"  }   
 ```
 
-## Feinstaubsensor (https://community.openhab.org/t/http-binding-openhab-3-version/101851/235)
+## Feinstaubsensor (<https://community.openhab.org/t/http-binding-openhab-3-version/101851/235>)
 
-The http request http://feinstaubsensor-14255834/data.json is answering with a JSON string.
+The http request `http://feinstaubsensor-14255834/data.json` is answering with a JSON string.
 So I need some simple JSONPATH transformation and one java script transformation.
 Data is polled every 10 seconds.
 
 ### .things
 
-```
+```java
 Thing http:url:feinstaub "Feinstaub" [ baseURL="http://feinstaubsensor-14255834/data.json", refresh=10] {        
    Channels:            
       Type number : SDS_PM10 [ stateTransformation="JSONPATH:$.sensordatavalues[0].value" ]
@@ -40,7 +43,7 @@ Thing http:url:feinstaub "Feinstaub" [ baseURL="http://feinstaubsensor-14255834/
 
 ### .items
 
-```
+```java
 /* **************************
  * Feinstaub sensor data
  * ************************** */
@@ -55,9 +58,9 @@ Thing http:url:feinstaub "Feinstaub" [ baseURL="http://feinstaubsensor-14255834/
 
 I have a BME2080 sensor connected. The Humidity must be diveded by 100 to show hPa.
 
-```
+```javascript
 (function(x) {
     var json = JSON.parse(x);
     return json.sensordatavalues[3].value/100;
 })(input)
-```
\ No newline at end of file
+```
diff --git a/bundles/org.openhab.binding.hue/README.md b/bundles/org.openhab.binding.hue/README.md
index c33c61f4e843e..9901dabb28f56 100644
--- a/bundles/org.openhab.binding.hue/README.md
+++ b/bundles/org.openhab.binding.hue/README.md
@@ -15,7 +15,7 @@ Both bridges are fully supported by this binding.
 
 Almost all available Hue devices are supported by this binding.
 This includes not only the "Friends of Hue", but also products like the LivingWhites adapter.
-Additionally, it is possible to use OSRAM Lightify devices as well as other ZigBee LightLink compatible products, including the IKEA TRÅDFRI lights (when updated). 
+Additionally, it is possible to use OSRAM Lightify devices as well as other ZigBee LightLink compatible products, including the IKEA TRÅDFRI lights (when updated).
 Beside bulbs and luminaires the Hue binding also supports some ZigBee sensors. Currently only Hue specific sensors are tested successfully (Hue Motion Sensor and Hue Dimmer Switch).
 Please note that the devices need to be registered with the Hue Bridge before it is possible for this binding to use them.
 
@@ -49,7 +49,7 @@ The following matrix lists the capabilities (channels) for each type:
 Beside bulbs and luminaires the Hue binding supports some ZigBee sensors.
 Currently only Hue specific sensors are tested successfully (e.g. Hue Motion Sensor, Hue Dimmer Switch, Hue Tap, CLIP Sensor).
 The Hue Motion Sensor registers a `ZLLLightLevel` sensor (0106), a `ZLLPresence` sensor (0107) and a `ZLLTemperature` sensor (0302) in one device.
-The Hue CLIP Sensor saves scene states with status or flag for HUE rules. 
+The Hue CLIP Sensor saves scene states with status or flag for HUE rules.
 They are presented by the following ZigBee Device ID and _Thing type_:
 
 | Device type                 | ZigBee Device ID | Thing type     |
@@ -77,7 +77,7 @@ The Hue Bridge is discovered through mDNS in the local network.
 Auto-discovery is enabled by default.
 To disable it, you can add the following line to `<openHAB-conf>/services/runtime.cfg`:
 
-```
+```text
 discovery.hue:background=false
 ```
 
@@ -89,7 +89,7 @@ Once the binding is authorized, it automatically reads all devices and groups th
 The Hue Bridge requires the IP address as a configuration value in order for the binding to know where to access it.
 In the thing file, this looks e.g. like
 
-```
+```java
 Bridge hue:bridge:1 [ ipAddress="192.168.0.64" ]
 ```
 
@@ -98,7 +98,7 @@ Please note that the generated user name cannot be written automatically to the
 The generated user name can be found, after pressing the authentication button on the bridge, with the following console command: `hue <bridgeUID> username`.
 The user name can be set using the `userName` configuration value, e.g.:
 
-```
+```java
 Bridge hue:bridge:1 [ ipAddress="192.168.0.64", userName="qwertzuiopasdfghjklyxcvbnm1234" ]
 ```
 
@@ -117,13 +117,13 @@ Bridge hue:bridge:1 [ ipAddress="192.168.0.64", userName="qwertzuiopasdfghjklyxc
 The devices are identified by the number that the Hue Bridge assigns to them (also shown in the Hue App as an identifier).
 Thus, all it needs for manual configuration is this single value like
 
-```
+```java
 0210 bulb1 "Lamp 1" @ "Office" [ lightId="1" ]
 ```
 
 or
 
-```
+```java
 0107 motion-sensor "Motion Sensor" @ "Entrance" [ sensorId="4" ]
 ```
 
@@ -131,24 +131,23 @@ You can freely choose the thing identifier (such as motion-sensor), its name (su
 
 The following device types also have an optional configuration value to specify the fade time in milliseconds for the transition to a new state:
 
-* Dimmable Light
-* Dimmable Plug-in Unit
-* Colour Light
-* Extended Colour Light
-* Colour Temperature Light
+- Dimmable Light
+- Dimmable Plug-in Unit
+- Colour Light
+- Extended Colour Light
+- Colour Temperature Light
 
 | Parameter | Description                                                                   |
 |-----------|-------------------------------------------------------------------------------|
 | lightId   | Number of the device provided by the Hue Bridge. **Mandatory**                |
 | fadetime  | Fade time in Milliseconds to a new state (min="0", step="100", default="400") |
 
-
 ### Groups
 
 The groups are identified by the number that the Hue Bridge assigns to them.
 Thus, all it needs for manual configuration is this single value like
 
-```
+```java
 group kitchen-bulbs "Kitchen Lamps" @ "Kitchen" [ groupId="1" ]
 ```
 
@@ -161,7 +160,6 @@ The group type also have an optional configuration value to specify the fade tim
 | groupId   | Number of the group provided by the Hue Bridge. **Mandatory**                 |
 | fadetime  | Fade time in Milliseconds to a new state (min="0", step="100", default="400") |
 
-
 ## Channels
 
 The devices support some of the following channels:
@@ -232,7 +230,6 @@ The `tap_switch_event` can trigger one of the following events:
 | Button 3 | Button 3 | 17    |
 | Button 4 | Button 4 | 18    |
 
-
 ## Rule Actions
 
 This binding includes a rule action, which allows to change a light channel with a specific fading time from within rules.
@@ -264,7 +261,7 @@ And there is one Hue Motion Sensor (represented by three devices) and a Hue Dimm
 
 ### demo.things:
 
-```
+```java
 Bridge hue:bridge:1         "Hue Bridge"                    [ ipAddress="192.168.0.64" ] {
     0210  bulb1              "Lamp 1"        @ "Kitchen"    [ lightId="1" ]
     0220  bulb2              "Lamp 2"        @ "Kitchen"    [ lightId="2" ]
@@ -278,7 +275,7 @@ Bridge hue:bridge:1         "Hue Bridge"                    [ ipAddress="192.168
 
 ### demo.items:
 
-```
+```java
 // Bulb1
 Switch  Light1_Toggle       { channel="hue:0210:1:bulb1:color" }
 Dimmer  Light1_Dimmer       { channel="hue:0210:1:bulb1:color" }
@@ -319,7 +316,7 @@ Also, if you are doing all your configuration through files, you may add the ful
 
 ### demo.sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu"
 {
     Frame {
diff --git a/bundles/org.openhab.binding.hydrawise/README.md b/bundles/org.openhab.binding.hydrawise/README.md
index 8a0986a6afa09..64f6d8388eb7f 100644
--- a/bundles/org.openhab.binding.hydrawise/README.md
+++ b/bundles/org.openhab.binding.hydrawise/README.md
@@ -6,52 +6,51 @@ The Hydrawise binding allows monitoring and control of [Hunter Industries's](htt
 
 ## Supported Things
 
-
 ### Account Bridge Thing
-    
-The Account Bridge Thing type represents the user's account on the Hydrawise cloud service. The bridge can have one or more child [Controllers](#Controller-Thing) linked.
+
+The Account Bridge Thing type represents the user's account on the Hydrawise cloud service. The bridge can have one or more child [Controllers](#controller-thing) linked.
 
 An account must be manually added and configured.
 
 ### Controller Thing
 
-Controller Things are automatically discovered once an [Account Bridge](#Account-Bridge-Thing) has be properly configured.
+Controller Things are automatically discovered once an [Account Bridge](#account-bridge-thing) has be properly configured.
 
 The Controller Thing type is the primary way most users will control and monitor their irrigation system.
 This allows full control over zones, sensors and weather forecasts.  
-Changes made through this Thing type will be reflected in the Hydrawise mobile and web applications as well as in their reporting modules. 
+Changes made through this Thing type will be reflected in the Hydrawise mobile and web applications as well as in their reporting modules.
 
-Controller Things require a parent [Account Bridge](#Account-Bridge-Thing)
+Controller Things require a parent [Account Bridge](#account-bridge-thing)
 
 #### Controller Thing Supported Channel Groups
 
 | channel group ID                              |
 |-----------------------------------------------|
-| [Controller](#Cloud-Controller-Channel-Group) |
-| [Zones](#Zone-Channel-Group)                  |
-| [All Zones](#All-Zones-Channel-Group)         |
-| [Sensor](#Sensor-Channel-Group)               |
-| [Forecast](#Sensor-Channel-Group)             |
-     
+| [Controller](#controller-thing-1) |
+| [Zones](#zone-channel-group)                  |
+| [All Zones](#all-zones-channel-group)         |
+| [Sensor](#sensor-channel-group)               |
+| [Forecast](#forecast-channel-group)             |
+
 ### Local Thing
 
 The Local Thing type uses an undocumented API that allows direct HTTP access to an irrigation controller on the user's network.  
 This provides a subset of features compared to the Cloud Thing type limited to basic zone control.  
-Controlling zones through the local API will not be reported back to the cloud service or the Hydrawise mobile/web applications, and reporting functionality will not reflect the locally controlled state. 
+Controlling zones through the local API will not be reported back to the cloud service or the Hydrawise mobile/web applications, and reporting functionality will not reflect the locally controlled state.
 
 Local control may not be available on later Hydrawise controller firmware versions.
 
-Use Cases    
+Use Cases
 
-* The Local thing can be useful when testing zones, as there is no delay when starting/stopping zones as compared to the cloud API which can take anywhere between 5-15 seconds.  
-* This is also useful if you wish to not use the cloud scheduling  at all and use openHAB as the irrigation scheduling system.
+- The Local thing can be useful when testing zones, as there is no delay when starting/stopping zones as compared to the cloud API which can take anywhere between 5-15 seconds.  
+- This is also useful if you wish to not use the cloud scheduling  at all and use openHAB as the irrigation scheduling system.
 
 #### Local Thing Supported Channel Groups
 
 | channel group ID                      |
 |---------------------------------------|
-| [Zones](#Zone-Channel-Group)          |
-| [All Zones](#All-Zones-Channel-Group) |
+| [Zones](#zone-channel-group)          |
+| [All Zones](#all-zones-channel-group) |
 
 ## Thing Configuration
 
@@ -71,7 +70,6 @@ Use Cases
 |--------------------|---------|----------|----------------------|
 | controllerId       | Integer | True     | ID of the controller |
 
-
 ### Local Thing
 
 | Configuration Name | type    | required | Comments                                                                                                        |
@@ -131,10 +129,10 @@ A single all zone group are supported per Cloud or Local Thing
 |------------------|------------------------|
 | allzones         | commands for all zones |
 
-
 ### Channels
 
 Channels uses across zones, sensors and forecasts
+
 | channel ID                 | type               | Groups         | description                                   | Read Write |
 |----------------------------|--------------------|----------------|-----------------------------------------------|------------|
 | name                       | String             | zone, sensor   | Descriptive name                              | R          |
@@ -161,10 +159,9 @@ Channels uses across zones, sensors and forecasts
 | precipitation              | Number             | forecast       | Daily precipitation amount                    | R          |
 | probabilityofprecipitation | Number             | forecast       | Daily probability of precipitation percentage | R          |
 
-
 ## Full Example
 
-```
+```java
 Group Sprinkler             "Sprinkler"
 Group SprinklerController   "Controller"    (Sprinkler)
 Group SprinklerZones        "Zones"         (Sprinkler)
@@ -211,4 +208,3 @@ DateTime SprinklerZone3StartTime "3 Left of Drive Lawn Start Time" (SprinklerZon
 Number SprinklerZone3TimeLeft "3 Left of Drive Lawn Time Left" (SprinklerZone3) {channel="hydrawise:controller:myaccount:123456:zone3#timeleft"}
 String SprinklerZone3Icon "3 Left of Drive Lawn Icon" (SprinklerZone3) {channel="hydrawise:controller:myaccount:123456:zone3#icon"}
 ```
-
diff --git a/bundles/org.openhab.binding.hyperion/README.md b/bundles/org.openhab.binding.hyperion/README.md
index eb335795ef3f2..343a1f06d8419 100644
--- a/bundles/org.openhab.binding.hyperion/README.md
+++ b/bundles/org.openhab.binding.hyperion/README.md
@@ -5,8 +5,8 @@ Further details on the Hyperion project can be found [here.](https://hyperion-pr
 
 ## Supported Things
 
-* Hyperion Server (may be referred to as V1)
-* Hyperion.ng Server
+- Hyperion Server (may be referred to as V1)
+- Hyperion.ng Server
 
 ## Binding Configuration
 
@@ -28,12 +28,12 @@ In order to use a Hyperion Server it must be properly configured.  You can do th
 | port           | Integer   | Y        | 19444          |
 | priority       | Integer   | Y        | 50             |
 | poll_frequency | Integer   | Y        | 15             |
- 
-To manually configure a Hyperion Server you must specify the following parameters: host, port, priority and polling frequency. 
- 
+
+To manually configure a Hyperion Server you must specify the following parameters: host, port, priority and polling frequency.
+
 In the thing file, this looks for e.g. like
 
-```
+```java
 Thing hyperion:serverV1:myServer [ host="192.168.0.10", port=19444, priority=50, poll_frequency=15]
 ```
 
@@ -48,12 +48,12 @@ In order to use a Hyperion.ng Server it must be properly configured.  You can do
 | priority       | Integer   | Y        | 50             |
 | poll_frequency | Integer   | Y        | 15             |
 | origin         | String    | Y        | "openHAB"      |
- 
+
 To manually configure a Hyperion.ng Server you must specify the following parameters: host, port, priority, polling frequency and origin.
- 
+
 In the .things file, this looks for e.g. like
 
-```
+```java
 Thing hyperion:serverNG:myServer [ host="192.168.0.10", port=19444, priority=50, poll_frequency=15, origin="openHAB"]
 ```
 
@@ -91,7 +91,7 @@ Thing hyperion:serverNG:myServer [ host="192.168.0.10", port=19444, priority=50,
 
 ### Hyperion Server (V1):
 
-```
+```java
 Dimmer Brightness "Brightness [%s]" {channel="hyperion:serverV1:myServer:brightness"}
 Color MyColor "Color" {channel="hyperion:serverV1:myServer:color"}
 String Effect "Current effect [%s]" {channel="hyperion:serverV1:myServer:effect"}
@@ -100,7 +100,7 @@ String Clear "Clear priority" {channel="hyperion:serverV1:myServer:clear"}
 
 ### Hyperion.ng Server
 
-```
+```java
 Dimmer Brightness "Brightness [%s]" {channel="hyperion:serverNG:myServer:brightness"}
 Color MyColor "Color" {channel="hyperion:serverNG:myServer:color"}
 String Effect "Current effect [%s]" {channel="hyperion:serverNG:myServer:effect"}
@@ -114,15 +114,15 @@ Switch UdpListenerEnabled "UDP Listener" {channel="hyperion:serverNG:myServer:ud
 Switch BoblightEnabled "Boblight" {channel="hyperion:serverNG:myServer:boblightserver"}
 Switch GrabberEnabled "Grabber" {channel="hyperion:serverNG:myServer:grabber"}
 Switch V4lEnabled "V4L" {channel="hyperion:serverNG:myServer:v4l"}
-Switch LedDeviceEnabled	"LED Device" {channel="hyperion:serverNG:myServer:leddevice"}
+Switch LedDeviceEnabled "LED Device" {channel="hyperion:serverNG:myServer:leddevice"}
 ```
 
 ## Example Sitemap
 
-Using the above things channels and items 
+Using the above things channels and items
 Sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu" {
  Frame  {
   // serverV1 & serverNG
diff --git a/bundles/org.openhab.binding.iammeter/README.md b/bundles/org.openhab.binding.iammeter/README.md
index a23f85fd946a6..05922a4fcf708 100644
--- a/bundles/org.openhab.binding.iammeter/README.md
+++ b/bundles/org.openhab.binding.iammeter/README.md
@@ -1,16 +1,15 @@
-# Iammeter Binding 
+# Iammeter Binding
 
 [Iammeter](https://www.iammeter.com) provides real-time readings of single-phase (WEM3080, WEM3162) and three-phase (WEM3080T) meters from IAMMETER over Wi-Fi.
 
 ## Use of the binding
 
-The Iammeter is exposed as one thing with a number of channels that can be used to read the values for different aspects of your Iammeter devices. 
+The Iammeter is exposed as one thing with a number of channels that can be used to read the values for different aspects of your Iammeter devices.
 
 ## Setup of the binding
 
 You can add the Iammeter device via the openHAB UI manually.
 
-
 ## Available channels
 
 The following table is taken from the official manual and contains all available channels.
@@ -24,7 +23,6 @@ Single-phase energy meter (WEM3080/WEM3162)
 | importenergy_a | kWh  | Energy consumption from gird | Number:Energy            |
 | exportgrid_a   | kWh  | Energy export to grid        | Number:Energy            |
 
-
 Three-phase energy meter (WEM3080T)
 | Name           | Unit | Description           | Type                     |
 |----------------|------|-----------------------|--------------------------|
@@ -50,8 +48,6 @@ Three-phase energy meter (WEM3080T)
 | frequency_c    | kWh  | C phase frequency     | Number:Frequency         |
 | pf_c           | kWh  | C phase power factor  | Number                   |
 
-
-
 ## More information
 
-More information about the Iammeter devices can be found in the [Iammeter website](https://www.iammeter.com). 
+More information about the Iammeter devices can be found in the [Iammeter website](https://www.iammeter.com).
diff --git a/bundles/org.openhab.binding.iaqualink/README.md b/bundles/org.openhab.binding.iaqualink/README.md
index e1a6ad3df101e..2bf91eec455cb 100644
--- a/bundles/org.openhab.binding.iaqualink/README.md
+++ b/bundles/org.openhab.binding.iaqualink/README.md
@@ -1,32 +1,30 @@
 # iAquaLink Binding
- 
+
 This binding supports:
 
-* Any iAquaLink based pool system
-* Reading auxiliary, temperature, pump, chemistry and system values
-* Controlling system, auxiliary, lighting, and temperature settings
+- Any iAquaLink based pool system
+- Reading auxiliary, temperature, pump, chemistry and system values
+- Controlling system, auxiliary, lighting, and temperature settings
 
 ## Binding Configuration
 
 The binding requires the iAquaLink user name and password.
 If you have more then one pool system registered to an account, you may optionally specify the pool serial ID/Number to use, otherwise the first pool controller will be used.
 
-
 ## Manual Thing Configuration
 
-```
+```java
 Thing iaqualink:controller:pool [ userName="user@domain.com", password="somepassword"]
 ```
 
 ## Channels
 
-
 The following is a list of supported channels.
 Auxiliary and OneTouch channels will be dynamically added depending on what a system reports as being supported.
 
 Auxiliary channels that are of a number type represent lighting modes (typically 0-15).
 Auxiliary channels that are dimmer types can set the light value in increments of 25 (0,25,50,750,100).
-The Auxiliary channel type will be dynamically assigned based on the controller configuration. 
+The Auxiliary channel type will be dynamically assigned based on the controller configuration.
 
 Heater status can be OFF (0), Enabled/ON (3), or Heating (1).
 
@@ -85,12 +83,9 @@ Colors can be set, but only On or Off is reported back as the current state of t
 | "13"         |                | Fat Tuesday            |                 |                   | Hold                 |
 | "14"         |                | Disco Tech             |                 |                   | Recall               |
 
-
-
-
 ## Sample Items
 
-```
+```java
 Group Group_AquaLink
 String AquaLinkStatus "Status [%s]" (Group_AquaLink) {channel="iaqualink:controller:pool:status"}
 Switch AquaLinkBoosterPump "Booster Pump" (Group_AquaLink) {channel="iaqualink:controller:pool:aux_1"}
diff --git a/bundles/org.openhab.binding.icalendar/README.md b/bundles/org.openhab.binding.icalendar/README.md
index 7a6c3db6898b9..150dd34df5b81 100644
--- a/bundles/org.openhab.binding.icalendar/README.md
+++ b/bundles/org.openhab.binding.icalendar/README.md
@@ -45,7 +45,7 @@ Each `eventfilter` thing requires a bridge of type `calendar` and has following
 
 ## Channels
 
-### Channels for `calendar` 
+### Channels for `calendar`
 
 The channels of `calendar` describe the current and the next forthcoming event.
 They are all read-only.
@@ -73,15 +73,15 @@ The channels of `eventfilter` are generated using following scheme, all are read
 
 The scheme replaces `<no>` by the results index, beginning at `0`. An `eventfilter` having `maxEvents` set to 3 will have following channels:
 
-* `result_0#begin`
-* `result_0#end`
-* `result_0#title`
-* `result_1#begin`
-* `result_1#end`
-* `result_1#title`
-* `result_2#begin`
-* `result_2#end`
-* `result_2#title` 
+- `result_0#begin`
+- `result_0#end`
+- `result_0#title`
+- `result_1#begin`
+- `result_1#end`
+- `result_1#title`
+- `result_2#begin`
+- `result_2#end`
+- `result_2#title`
 
 ## Command Tags
 
@@ -91,11 +91,11 @@ A command tag must consist of at least three fields.
 A fourth field is optional.
 The syntax is as follows:
 
-```
-	BEGIN:Item_Name:New_State_Value
-	BEGIN:Item_Name:New_State_Value:Authorization_Code
-	END:Item_Name:New_State_Value
-	END:Item_Name:New_State_Value:Authorization_Code
+```text
+BEGIN:Item_Name:New_State_Value
+BEGIN:Item_Name:New_State_Value:Authorization_Code
+END:Item_Name:New_State_Value
+END:Item_Name:New_State_Value:Authorization_Code
 ```
 
 The first field **must** be either `BEGIN` or `END`.
@@ -110,7 +110,7 @@ The `New_State_Value` is the state value that will be sent to the item.
 It must be a value which is compatible with the item type.
 See openHAB Core definitions for [command types](https://www.openhab.org/docs/concepts/items.html#state-and-command-type-formatting) for valid types and formats.
 
-The `Authorization_Code` may *optionally* be used as follows:
+The `Authorization_Code` may _optionally_ be used as follows:
 
 - When the thing configuration parameter `authorizationCode` is not blank, the binding will compare the `Authorization_Code` field against the `authorizationCode` configuration parameter, and it will only execute the command if the two strings are the same.
 
@@ -120,14 +120,14 @@ The `Authorization_Code` may *optionally* be used as follows:
 
 All required information must be provided in the thing definition, either via UI or in the `.things` file..
 
-```
+```java
 Bridge icalendar:calendar:deadbeef    "My calendar" @ "Internet" [ url="http://example.org/calendar.ical", refreshTime=60 ]
 Thing  icalendar:eventfilter:feedd0d0 "Tomorrows events" (icalendar:calendar:deadbeef) [ maxEvents=1, datetimeUnit="DAY", datetimeStart=1, datetimeEnd=2, datetimeRound=true ]
 ```
 
 Link the channels as usual to items:
 
-```
+```java
 String   current_event_name        "current event [%s]"                       <calendar> { channel="icalendar:calendar:deadbeef:current_title" }
 DateTime current_event_until       "current until [%1$tT, %1$tY-%1$tm-%1$td]" <calendar> { channel="icalendar:calendar:deadbeef:current_end" }
 String   next_event_name           "next event [%s]"                          <calendar> { channel="icalendar:calendar:deadbeef:next_title" }
@@ -138,7 +138,7 @@ DateTime first_event_at_tomorrow   "first at [%1$tT, %1$tY-%1$tm-%1$td]"      <c
 
 Sitemap just showing the current event and the beginning of the next:
 
-```
+```perl
 sitemap local label="My Calendar Sitemap" {
     Frame label="events" {
         Text item=current_event_name label="current event [%s]"
@@ -155,14 +155,14 @@ sitemap local label="My Calendar Sitemap" {
 
 Command tags in a calendar event (in the case that configuration parameter `authorizationCode` equals `abc`):
 
-```
+```text
 BEGIN:Calendar_Test_Temperature:12.3°C:abc
 END:Calendar_Test_Temperature:23.4°F:abc
 ```
 
 Command tags in a calendar event (in the case that configuration parameter `authorizationCode` is not set):
 
-```
+```text
 BEGIN:Calendar_Test_Switch:ON
 END:Calendar_Test_Switch:OFF
 ```
diff --git a/bundles/org.openhab.binding.icloud/README.md b/bundles/org.openhab.binding.icloud/README.md
index 2a6a09e0cbac6..aa2216783a25e 100644
--- a/bundles/org.openhab.binding.icloud/README.md
+++ b/bundles/org.openhab.binding.icloud/README.md
@@ -69,7 +69,7 @@ Bridge icloud:account:myaccount [appleId="mail@example.com", password="secure",
 ```
 
 The device ID can be found in the Inbox after it has been discovered.
-The information *@ "World"* is optional.
+The information _@ "World"_ is optional.
 
 ### icloud.items
 
diff --git a/bundles/org.openhab.binding.ihc/README.md b/bundles/org.openhab.binding.ihc/README.md
index 803f73fd081b9..1a61becc9faea 100644
--- a/bundles/org.openhab.binding.ihc/README.md
+++ b/bundles/org.openhab.binding.ihc/README.md
@@ -30,7 +30,6 @@ The `controller` Thing has the following configuration parameters:
 | createChannelsAutomatically | Create channels automatically from project file. Project file loading parameter should be enabled as well.                                                                                  | no       | true          |
 | tlsVersion                  | TLS version used for controller communication. Choose `TLSv1` for older firmware versions and `TLSv1.2` for never versions (since fall 2021). `AUTO` mode try to recognize correct version. | no       | TLSv1         |
 
-
 ## Channels
 
 List of default controller channels.
@@ -75,10 +74,10 @@ Channel parameters:
 There are several ways to find the correct resource id's:
 
 1. Find directly from your IHC / ELKO LS project file (.vis file).
-2. Via IHC / ELKO Visual application. Hold ctrl button from keyboard while mouse over the select item in Visual.
-3. Enable debug level from binding. Binding will then print basic resource ID from the project file, if `loadProjectFile` configuration variable is enabled. 
+1. Via IHC / ELKO Visual application. Hold ctrl button from keyboard while mouse over the select item in Visual.
+1. Enable debug level from binding. Binding will then print basic resource ID from the project file, if `loadProjectFile` configuration variable is enabled.
 
-The binding supports resource id's ***only*** in decimal format.
+The binding supports resource id's _**only**_ in decimal format.
 Hexadecimal values (start with 0x prefix) need to be converted to decimal format.
 Conversion can be done e.g. via Calculator in Windows or Mac.
 
@@ -131,24 +130,23 @@ Supported commands:
 | DOWN        | Rollershutter       |
 | TOGGLE      | Switch              |
 
-All commands but `TOGGLE` are standard openHAB commands. 
-When `TOGGLE` command is specified, profile will toggle switch item state. 
+All commands but `TOGGLE` are standard openHAB commands.
+When `TOGGLE` command is specified, profile will toggle switch item state.
 E.g. if item state has been OFF, profile will send ON command to item.
- 
+
 Example:
 
-```xtend
+```java
 Dimmer test { channel="ihc:controller:elko:my_test_trigger"[profile="ihc:pushbutton-to-command", short-press-command="TOGGLE", long-press-command="INCREASE", long-press-time=1000, repeat-time=200] }
 ```
 
 Will send TOGGLE (ON/OFF) command to Dimmer test item when short button press is detected (button press less than 1000ms) and send INCREASE commands as long button is pressed over 1000ms (200ms interval).
 
-
 ## Examples
 
 ### example.things
 
-```xtend
+```java
 ihc:controller:elko [ hostname="192.168.1.2", username="openhab", password="secret", timeout=5000, loadProjectFile=true, createChannelsAutomatically=false, tlsVersion="TLSv1" ] {
     Channels:
         Type switch                : my_test_switch  "My Test Switch"          [ resourceId=3988827 ]
@@ -169,7 +167,7 @@ ihc:controller:elko [ hostname="192.168.1.2", username="openhab", password="secr
 
 ### example.items
 
-```xtend
+```java
 Switch test_switch  "Test Switch"    { channel="ihc:controller:elko:my_test_switch" }
 Switch test_contact "Test Contact"   { channel="ihc:controller:elko:my_test_contact" }
 Number test_number  "Test Number"    { channel="ihc:controller:elko:my_test_number" }
@@ -184,7 +182,7 @@ Dimmer dimmer { channel="ihc:controller:elko:my_test_trigger"[profile="ihc:pushb
 
 ### example.rules
 
-```xtend
+```java
 rule "My test trigger test rule"
 when
     Channel 'ihc:controller:elko:my_test_trigger' triggered LONG_PRESS 
diff --git a/bundles/org.openhab.binding.innogysmarthome/README.md b/bundles/org.openhab.binding.innogysmarthome/README.md
index 376b163e98dd5..b45a7d86acae6 100644
--- a/bundles/org.openhab.binding.innogysmarthome/README.md
+++ b/bundles/org.openhab.binding.innogysmarthome/README.md
@@ -4,12 +4,12 @@ The binding integrates the [innogy SmartHome](https://innogy.com/smarthome) syst
 It uses the official API 1.1 as provided by innogy as cloud service.
 As all status updates and commands have to go through the API, a permanent internet connection is required.
 
-*Notice!*
+_Notice!_
 
-*This binding is deprecated!*
+_This binding is deprecated!_
 
-*LIVISI (formally innogy) has implemented a local API on their SHC from Software Version 1.2.XX.XXX.
-Please migrate to the "LIVISI SmartHome Binding" which is using the new local API and requires neither the LIVISI-cloud-servers nor an internet connection.* 
+_LIVISI (formally innogy) has implemented a local API on their SHC from Software Version 1.2.XX.XXX.
+Please migrate to the "LIVISI SmartHome Binding" which is using the new local API and requires neither the LIVISI-cloud-servers nor an internet connection._
 
 ## Supported things
 
@@ -123,10 +123,11 @@ Be sure it is connected to the Internet.
 Authorization is done as oauth2 workflow with the innogy API.
 
 To receive the auth-code, go to one of the following URLs depending on your brand and login with your credentials (you can find this link also in the SHC thing in the UI, if you edit it):
-https://auth.services-smarthome.de/AUTH
-* [innogy SmartHome authorization page](https://auth.services-smarthome.de/AUTH/authorize?response_type=code&client_id=24635748&redirect_uri=https%3A%2F%2Fwww.openhab.org%2Foauth%2Finnogy%2Finnogy-smarthome.html&scope&lang=de-DE)
-* [SmartHome Austria authorization page](https://auth.services-smarthome.de/AUTH/authorize?response_type=code&client_id=24635749&redirect_uri=https%3A%2F%2Fwww.openhab.org%2Foauth%2Finnogy%2Fsmarthome-austria.html&scope&lang=de-DE)
-* [Start SmartHome authorization page](https://auth.services-smarthome.de/AUTH/authorize?response_type=code&client_id=24635750&redirect_uri=https%3A%2F%2Fwww.openhab.org%2Foauth%2Finnogy%2Fstart-smarthome.html&scope&lang=de-DE)
+`https://auth.services-smarthome.de/AUTH`
+
+- [innogy SmartHome authorization page](https://auth.services-smarthome.de/AUTH/authorize?response_type=code&client_id=24635748&redirect_uri=https%3A%2F%2Fwww.openhab.org%2Foauth%2Finnogy%2Finnogy-smarthome.html&scope&lang=de-DE)
+- [SmartHome Austria authorization page](https://auth.services-smarthome.de/AUTH/authorize?response_type=code&client_id=24635749&redirect_uri=https%3A%2F%2Fwww.openhab.org%2Foauth%2Finnogy%2Fsmarthome-austria.html&scope&lang=de-DE)
+- [Start SmartHome authorization page](https://auth.services-smarthome.de/AUTH/authorize?response_type=code&client_id=24635750&redirect_uri=https%3A%2F%2Fwww.openhab.org%2Foauth%2Finnogy%2Fstart-smarthome.html&scope&lang=de-DE)
 
 You will be redirected to openhab.org and the auth-code will be displayed.
 Copy and paste it into your SHC configuration and you are done.
@@ -149,23 +150,23 @@ Now you can add all devices from your Inbox as things.
 As an alternative to using automatic discovery, innogy things can be configured using .things files.
 The innogy SmartHome Controller (SHC) can be configured using the following syntax:
 
-```
+```java
 Bridge innogysmarthome:bridge:<bridge-id> []
 ```
 
 Then the required authcode is retrieved and set **automatically**:
 
-```
+```java
 Bridge innogysmarthome:bridge:<bridge-id> [ authcode="<authcode>" ]
 ```
 
-** *Security warning!**
+** _Security warning!_*
 As the refresh-token is THE one and only credential one needs to access the innogy webservice with all device data, you have to make sure it is never given to another person.
 Thus it is recommended to remove the line from the openhab.log and/or make sure, the logfile is definitely never accessible by others!
 
 All other innogy devices can be added using the following syntax:
 
-```
+```java
 Thing WDS <thing-id> "<thing-name>" @ "<room-name>" [ id="<the-device-id>" ]
 ```
 
@@ -173,7 +174,7 @@ The device ID (e.g. e9a74941a3807b57332214f346fb1129) can be found in the Inbox,
 
 However, a full example .things configuration look like this:
 
-```
+```java
 Bridge innogysmarthome:bridge:mybride "innogy SmartHome Controller" {
     Thing ISD2 myDimmer "Dimmer Kitchen" @ "Kitchen" [ id="<device-id>" ]
     Thing ISS2 myLightSwitch "Light Livingroom" @ "Livingroom" [ id="<device-id>" ]
@@ -191,7 +192,7 @@ Bridge innogysmarthome:bridge:mybride "innogy SmartHome Controller" {
 
 You can then configure your items in your *.items config files as usual, for example:
 
-```
+```java
 Contact myWindowContact        "Kitchen"                <window>      {channel="innogysmarthome:WDS:mybridge:myWindowContact:contact"}
 Switch myWindowContactBattery  "Battery low"            <battery>     {channel="innogysmarthome:WDS:mybridge:myWindowContact:battery_low"}
 Number myHeatingTemp           "Bath [%.1f °C]"         <temperature> {channel="innogysmarthome:RST:mybridge:myHeating:temperature"}
@@ -205,7 +206,7 @@ Number myHeatingHumidity       "Bath [%.1f %%]"         <humidity>    {channel="
 
 The site configuration works a usual. One special example
 
-```
+```perl
 sitemap default label="Home" {
     Frame {
         Text item=myHeatingTemp label="Temperature"
@@ -221,13 +222,13 @@ sitemap default label="Home" {
 Pushbuttons provide trigger channels, that can only be used in rules.
 Here is an example rule:
 
-```
+```java
 rule "Button triggered rule"
 when
-	Channel 'innogysmarthome:WSC2:mybridge:myPushButton:button1' triggered PRESSED
+ Channel 'innogysmarthome:WSC2:mybridge:myPushButton:button1' triggered PRESSED
 then
     // do something...
-	logInfo("testlogger", "Button 1 pressed")
+ logInfo("testlogger", "Button 1 pressed")
 end
 ```
 
@@ -239,13 +240,13 @@ If the bridge stays offline with the following status shown in the UI, the reaso
 
 To solve this on a Linux system, follow this steps:
 
-1. Download the certificates (.cer-files) of https://home.innogy-smarthome.de and https://innogy.com including the "DigiCert Global Root G2" to your computer.
+1. Download the certificates (.cer-files) of <https://home.innogy-smarthome.de> and <https://innogy.com> including the "DigiCert Global Root G2" to your computer.
 As this depends on the used browser and operating system, please use a web search engine to find out how to achieve this for your situation.
-2. On your Linux system, goto your Java Machine's certificate store, e.g. `/usr/lib/jvm/jdk-8-oracle-arm32-vfp-hflt/jre/lib/security`.
+1. On your Linux system, goto your Java Machine's certificate store, e.g. `/usr/lib/jvm/jdk-8-oracle-arm32-vfp-hflt/jre/lib/security`.
 The path should include a file called `cacerts` (this is the certificate store) and may differ depending on the system used.
-3. Copy the .cer-files from step 1 into this directory.
-4. Import each certificate with the command: `sudo keytool –importcert –alias “innogysmarthome” –keystore cacerts –file innogy.cer`
+1. Copy the .cer-files from step 1 into this directory.
+1. Import each certificate with the command: `sudo keytool –importcert –alias “innogysmarthome” –keystore cacerts –file innogy.cer`
 (alias can be freely chosen but must be unique; replace innogy.cer with the filename of the downloaded certificate)
-5. Restart the JVM and openHAB.
+1. Restart the JVM and openHAB.
 
 The default password of the certificate store is "changeit".
diff --git a/bundles/org.openhab.binding.insteon/README.md b/bundles/org.openhab.binding.insteon/README.md
index 2fff1020acc8b..b2dc77e338aa3 100644
--- a/bundles/org.openhab.binding.insteon/README.md
+++ b/bundles/org.openhab.binding.insteon/README.md
@@ -13,7 +13,7 @@ The binding translates openHAB commands into Insteon messages and sends them on
 Relevant messages from the Insteon network (like notifications about switches being toggled) are picked up by the modem and converted to openHAB status updates by the binding.
 The binding also supports sending and receiving of legacy X10 messages.
 
-The binding does not support linking new devices on the fly, i.e. all devices must be linked with the modem *before* starting the Insteon binding.
+The binding does not support linking new devices on the fly, i.e. all devices must be linked with the modem _before_ starting the Insteon binding.
 
 The openHAB binding supports minimal configuration of devices, currently only monitoring and sending messages.
 For all other configuration and set up of devices, link the devices manually via the set buttons, or use the free [Insteon Terminal](https://github.com/pfrommerd/insteon-terminal) software.
@@ -36,7 +36,7 @@ X10 devices are not auto discovered.
 
 ## Thing Configuration
 
-#### Network Configuration
+### Network Configuration
 
 The Insteon PLM or hub is configured with the following parameters:
 
@@ -49,7 +49,7 @@ The Insteon PLM or hub is configured with the following parameters:
 
 >NOTE: For users upgrading from InsteonPLM, The parameter port_1 is now port.
 
-#### Device Configuration
+### Device Configuration
 
 The Insteon device is configured with the following required parameters:
 
@@ -190,12 +190,11 @@ In order to determine which channels a device supports, you can look at the devi
 | update | Switch | Update |
 | watts | Number:Power | Watts |
 
-
 ## Full Example
 
 Sample things file:
 
-```
+```java
 Bridge insteon:network:home [port="/dev/ttyUSB0"] {
   Thing device 22F8A8 [address="22.F8.A8", productKey="F00.00.15"] {
     Channels:
@@ -226,7 +225,7 @@ Bridge insteon:network:home [port="/dev/ttyUSB0"] {
 
 Sample items file:
 
-```
+```java
 Switch switch1 { channel="insteon:device:home:243141:switch" }
 Dimmer dimmer1 { channel="insteon:device:home:238F55:dimmer" }
 Dimmer dimmer2 { channel="insteon:device:home:23B0D9:dimmer" }
@@ -245,7 +244,7 @@ The binding provides commands you can use to help with troubleshooting.
 Enter `openhab:insteon` or `insteon` in the console and you will get a list of available commands.
 The `openhab:` prefix is optional:
 
-```
+```shell
 openhab> openhab:insteon
 Usage: openhab:insteon display_devices - display devices that are online, along with available channels
 Usage: openhab:insteon display_channels - display channels that are linked, along with configuration information
@@ -265,8 +264,8 @@ If you want to see the response from the device, you will need to monitor the de
 
 ## Insteon Groups and Scenes
 
-How do Insteon devices tell other devices on the network that their state has changed? They send out a broadcast message, labeled with a specific *group* number.
-All devices (called *responders*) that are configured to listen to this message will then go into a pre-defined state.
+How do Insteon devices tell other devices on the network that their state has changed? They send out a broadcast message, labeled with a specific _group_ number.
+All devices (called _responders_) that are configured to listen to this message will then go into a pre-defined state.
 For instance when light switch A is switched to "ON", it will send out a message to group #1, and all responders will react to it, e.g they may go into the "ON" position as well.
 Since more than one device can participate, the sending out of the broadcast message and the subsequent state change of the responders is referred to as "triggering a scene".
 At the device and PLM level, the concept of a "scene" does not exist, so you will find it notably absent in the binding code and this document.
@@ -296,7 +295,7 @@ For some of the more sophisticated devices the complete linking process can no l
 Since Insteon devices can have multiple features (for instance a switchable relay and a contact sensor) under a single Insteon address, an openHAB item is not bound to a device, but to a given feature of a device.
 For example, the following lines would create two Number items referring to the same thermostat device, but to different features of it:
 
-```
+```java
 Number  thermostatCoolPoint "cool point [%.1f °F]" { channel="insteon:device:home:32F422:coolSetPoint" }
 Number  thermostatHeatPoint "heat point [%.1f °F]" { channel="insteon:device:home:32F422:heatSetPoint" }
 ```
@@ -305,7 +304,7 @@ Number  thermostatHeatPoint "heat point [%.1f °F]" { channel="insteon:device:ho
 
 The following example shows how to configure a simple light switch (2477S) in the .items file:
 
-```
+```java
 Switch officeLight "office light"  { channel="insteon:device:home:AABBCC:switch" }
 ```
 
@@ -313,7 +312,7 @@ Switch officeLight "office light"  { channel="insteon:device:home:AABBCC:switch"
 
 Here is how to configure a simple dimmer (2477D) in the .items file:
 
-```
+```java
 Dimmer kitchenChandelier "kitchen chandelier" { channel="insteon:device:home:AABBCC:dimmer" }
 ```
 
@@ -322,9 +321,9 @@ If a maximum level is configured, openHAB will never set the level of the dimmer
 The parameter dimmermax must be defined for the channel.
 The below example sets a maximum level of 70% for dim 1 and 60% for dim 2:
 
-**Things**
+#### Things
 
-```
+```java
 Bridge insteon:network:home [port="/dev/ttyUSB0"] {
   Thing device AABBCC [address="AA.BB.CC", productKey="F00.00.11"]  {
     Channels:
@@ -337,9 +336,9 @@ Bridge insteon:network:home [port="/dev/ttyUSB0"] {
 }
 ```
 
-**Items**
+#### Items
 
-```
+```java
 Dimmer d1 "dimmer 1" { channel="insteon:device:home:AABBCC:dimmer"}
 Dimmer d2 "dimmer 2" { channel="insteon:device:home:AABBCD:loadDimmer"}
 ```
@@ -350,7 +349,7 @@ Setting a maximum level does not affect manual turning on or dimming a switch.
 
 Here's how to configure the top and bottom outlet of the in-wall 2 outlet controller:
 
-```
+```java
 Switch fOutTop "Front Outlet Top"    <socket> { channel="insteon:device:home:AABBCC:topOutlet" }
 Switch fOutBot "Front Outlet Bottom" <socket> { channel="insteon:device:home:AABBCC:bottomOutlet" }
 ```
@@ -364,31 +363,31 @@ Link all buttons, one after the other.
 The 4-button mini remote sends out messages on groups 0x01 - 0x04, each corresponding to one button.
 The modem's link database (see [Insteon Terminal](https://github.com/pfrommerd/insteon-terminal)) should look like this:
 
-```
-    0000 xx.xx.xx                       xx.xx.xx  RESP  10100010 group: 01 data: 02 2c 41
-    0000 xx.xx.xx                       xx.xx.xx  RESP  10100010 group: 02 data: 02 2c 41
-    0000 xx.xx.xx                       xx.xx.xx  RESP  10100010 group: 03 data: 02 2c 41
-    0000 xx.xx.xx                       xx.xx.xx  RESP  10100010 group: 04 data: 02 2c 41
+```text
+0000 xx.xx.xx                       xx.xx.xx  RESP  10100010 group: 01 data: 02 2c 41
+0000 xx.xx.xx                       xx.xx.xx  RESP  10100010 group: 02 data: 02 2c 41
+0000 xx.xx.xx                       xx.xx.xx  RESP  10100010 group: 03 data: 02 2c 41
+0000 xx.xx.xx                       xx.xx.xx  RESP  10100010 group: 04 data: 02 2c 41
 ```
 
 **Items**
 This goes into the items file:
 
-```
-    Switch miniRemoteButtonA "mini remote button a" { channel="insteon:device:home:AABBCC:buttonA", autoupdate="false" }
-    Switch miniRemoteButtonB "mini remote button b" { channel="insteon:device:home:AABBCC:buttonB", autoupdate="false" }
-    Switch miniRemoteButtonC "mini remote button c" { channel="insteon:device:home:AABBCC:buttonC", autoupdate="false" }
-    Switch miniRemoteButtonD "mini remote button d" { channel="insteon:device:home:AABBCC:buttonD", autoupdate="false" }
+```java
+Switch miniRemoteButtonA "mini remote button a" { channel="insteon:device:home:AABBCC:buttonA", autoupdate="false" }
+Switch miniRemoteButtonB "mini remote button b" { channel="insteon:device:home:AABBCC:buttonB", autoupdate="false" }
+Switch miniRemoteButtonC "mini remote button c" { channel="insteon:device:home:AABBCC:buttonC", autoupdate="false" }
+Switch miniRemoteButtonD "mini remote button d" { channel="insteon:device:home:AABBCC:buttonD", autoupdate="false" }
 ```
 
 **Sitemap**
 This goes into the sitemap file:
 
-```
-    Switch item=miniRemoteButtonA label="mini remote button a" mappings=[ OFF="Off", ON="On"]
-    Switch item=miniRemoteButtonB label="mini remote button b" mappings=[ OFF="Off", ON="On"]
-    Switch item=miniRemoteButtonC label="mini remote button c" mappings=[ OFF="Off", ON="On"]
-    Switch item=miniRemoteButtonD label="mini remote button d" mappings=[ OFF="Off", ON="On"]
+```perl
+Switch item=miniRemoteButtonA label="mini remote button a" mappings=[ OFF="Off", ON="On"]
+Switch item=miniRemoteButtonB label="mini remote button b" mappings=[ OFF="Off", ON="On"]
+Switch item=miniRemoteButtonC label="mini remote button c" mappings=[ OFF="Off", ON="On"]
+Switch item=miniRemoteButtonD label="mini remote button d" mappings=[ OFF="Off", ON="On"]
 ```
 
 The switches in the GUI just display the mini remote's most recent button presses.
@@ -400,23 +399,21 @@ Link such that the modem is a responder to the motion sensor.
 Create a contact.map file in the transforms directory as described elsewhere in this document.
 Then create entries in the .items file like this:
 
-**Items**
+#### Items
 
-```
-    Contact motionSensor             "motion sensor [MAP(contact.map):%s]" { channel="insteon:device:home:AABBCC:contact"}
-    Number  motionSensorBatteryLevel "motion sensor battery level"         { channel="insteon:device:home:AABBCC:batteryLevel" }
-    Number  motionSensorLightLevel   "motion sensor light level"           { channel="insteon:device:home:AABBCC:lightLevel" }
+```java
+Contact motionSensor             "motion sensor [MAP(contact.map):%s]" { channel="insteon:device:home:AABBCC:contact"}
+Number  motionSensorBatteryLevel "motion sensor battery level"         { channel="insteon:device:home:AABBCC:batteryLevel" }
+Number  motionSensorLightLevel   "motion sensor light level"           { channel="insteon:device:home:AABBCC:lightLevel" }
 ```
 
 This will give you a contact, the battery level, and the light level.
 The motion sensor II includes three additional channels:
 
-**Items**
-
-```
-    Number  motionSensorBatteryPercent     "motion sensor battery percent"                     { channel="insteon:device:home:AABBCC:batteryPercent" }
-    Contact motionSensorTamperSwitch       "motion sensor tamper switch [MAP(contact.map):%s]" { channel="insteon:device:home:AABBCC:tamperSwitch"}
-    Number  motionSensorTemperatureLevel   "motion sensor temperature level"                   { channel="insteon:device:home:AABBCC:temperatureLevel" }
+```java
+Number  motionSensorBatteryPercent     "motion sensor battery percent"                     { channel="insteon:device:home:AABBCC:batteryPercent" }
+Contact motionSensorTamperSwitch       "motion sensor tamper switch [MAP(contact.map):%s]" { channel="insteon:device:home:AABBCC:tamperSwitch"}
+Number  motionSensorTemperatureLevel   "motion sensor temperature level"                   { channel="insteon:device:home:AABBCC:temperatureLevel" }
 ```
 
 The battery, light level and temperature level are updated when either there is motion, light level above/below threshold, tamper switch activated, or the sensor battery runs low.
@@ -428,9 +425,9 @@ Disabling the querying of the device should provide more accurate battery data s
 This can be configured with the device configuration parameter of the device.
 The key in the JSON object is `heartbeatOnly` and the value is a boolean:
 
-**Things**
+#### Things
 
-```
+```java
 Bridge insteon:network:home [port="/dev/ttyUSB0"] {
   Thing device AABBCC [address="AA.BB.CC", productKey="F00.00.24", deviceConfig="{'heartbeatOnly': true}"]
 }
@@ -439,8 +436,8 @@ Bridge insteon:network:home [port="/dev/ttyUSB0"] {
 
 The temperature can be calculated in Fahrenheit using the following formulas:
 
-* If the device is battery powered: `temperature = 0.73 * motionSensorTemperatureLevel - 20.53`
-* If the device is USB powered: `temperature = 0.72 * motionSensorTemperatureLevel - 24.61`
+- If the device is battery powered: `temperature = 0.73 * motionSensorTemperatureLevel - 20.53`
+- If the device is USB powered: `temperature = 0.72 * motionSensorTemperatureLevel - 24.61`
 
 Since the motion sensor II might not be calibrated correctly, the values `20.53` and `24.61` can be adjusted as necessary to produce the correct temperature.
 
@@ -450,18 +447,18 @@ Similar in operation to the motion sensor above.
 Link such that the modem is a responder to the motion sensor.
 Create a contact.map file in the transforms directory like the following:
 
-```
-    OPEN=open
-    CLOSED=closed
-    -=unknown
+```text
+OPEN=open
+CLOSED=closed
+-=unknown
 ```
 
 **Items**
 Then create entries in the .items file like this:
 
-```
-    Contact doorSensor             "Door sensor [MAP(contact.map):%s]" { channel="insteon:device:home:AABBCC:contact" }
-    Number  doorSensorBatteryLevel "Door sensor battery level [%.1f]"  { channel="insteon:device:home:AABBCC:batteryLevel" }
+```java
+Contact doorSensor             "Door sensor [MAP(contact.map):%s]" { channel="insteon:device:home:AABBCC:contact" }
+Number  doorSensorBatteryLevel "Door sensor battery level [%.1f]"  { channel="insteon:device:home:AABBCC:batteryLevel" }
 ```
 
 This will give you a contact and the battery level.
@@ -474,16 +471,16 @@ Read the instructions very carefully: sync with lock within 5 feet to avoid bad
 **Items**
 Put something like this into your .items file:
 
-```
-    Switch doorLock "Front Door [MAP(lock.map):%s]"  { channel="insteon:device:home:AABBCC:switch" }
+```java
+Switch doorLock "Front Door [MAP(lock.map):%s]"  { channel="insteon:device:home:AABBCC:switch" }
 ```
 
 and create a file "lock.map" in the transforms directory with these entries:
 
-```
-    ON=Lock
-    OFF=Unlock
-    -=unknown
+```text
+ON=Lock
+OFF=Unlock
+-=unknown
 ```
 
 ### I/O Linc (garage door openers)
@@ -498,26 +495,26 @@ Ensure the contact is OFF (status LED is dark/garage door open) when linking the
 
 Add this map into your transforms directory as "contact.map":
 
-```
-    OPEN=open
-    CLOSED=closed
-    -=unknown
+```text
+OPEN=open
+CLOSED=closed
+-=unknown
 ```
 
 **Items**
 Along with this into your .items file:
 
-```
-    Switch  garageDoorOpener  "garage door opener"                        <garagedoor>  { channel="insteon:device:home:AABBCC:switch", autoupdate="false" }
-    Contact garageDoorContact "garage door contact [MAP(contact.map):%s]"               { channel="insteon:device:home:AABBCC:contact" }
+```java
+Switch  garageDoorOpener  "garage door opener"                        <garagedoor>  { channel="insteon:device:home:AABBCC:switch", autoupdate="false" }
+Contact garageDoorContact "garage door contact [MAP(contact.map):%s]"               { channel="insteon:device:home:AABBCC:contact" }
 ```
 
 **Sitemap**
 To make it visible in the GUI, put this into your sitemap file:
 
-```
-    Switch item=garageDoorOpener label="garage door opener" mappings=[ ON="OPEN/CLOSE"]
-    Text item=garageDoorContact
+```perl
+Switch item=garageDoorOpener label="garage door opener" mappings=[ ON="OPEN/CLOSE"]
+Text item=garageDoorContact
 ```
 
 For safety reasons, only close the garage door if you have visual contact to make sure there is no obstruction! The use of automated rules for closing garage doors is dangerous.
@@ -549,7 +546,7 @@ Here is an example correspondence table:
 
 When e.g. the "A" button is pressed (that's button #3 internally) a broadcast message will be sent out to all responders configured to listen to Insteon group #3.
 This means you must configure the modem as a responder to group #3 (and #4, #5, #6) messages coming from your keypad.
-For instructions how to do this, check out the [Insteon Terminal](https://github.com/pfrommerd/insteon-terminal.
+For instructions how to do this, check out the [Insteon Terminal](https://github.com/pfrommerd/insteon-terminal).
 You can even do that with the set buttons (see instructions that come with the keypad).
 
 While capturing the messages that the buttons emit is pretty straight forward, controlling the buttons is  another matter.
@@ -559,25 +556,24 @@ The example configuration below uses groups 0xf3, 0xf4, 0xf5, and 0xf6.
 Then link the buttons such that they respond to those groups, and link the modem as a controller for them (see [Insteon Terminal](https://github.com/pfrommerd/insteon-terminal) documentation.
 In your items file you specify these groups with the "group=" parameters such that the binding knows what group number to put on the outgoing message.
 
-
 #### Keypad Switches
 
-**Items**
+##### Items
 
 Here is a simple example, just using the load (main) switch:
 
-```
-    Switch keypadSwitch             "main load"          { channel="insteon:device:home:AABBCC:loadSwitch" }
-    Number keypadSwitchManualChange "main manual change" { channel="insteon:device:home:AABBCC:loadSwitchManualChange" }
-    Switch keypadSwitchFastOnOff    "main fast on/off"   { channel="insteon:device:home:AABBCC:loadSwitchFastOnOff" }
+```java
+Switch keypadSwitch             "main load"          { channel="insteon:device:home:AABBCC:loadSwitch" }
+Number keypadSwitchManualChange "main manual change" { channel="insteon:device:home:AABBCC:loadSwitchManualChange" }
+Switch keypadSwitchFastOnOff    "main fast on/off"   { channel="insteon:device:home:AABBCC:loadSwitchFastOnOff" }
 ```
 
 Most people will not use the fast on/off features or the manual change feature, so you really only need the first line.
 To make the buttons available, add the following:
 
-**Things**
+###### Things
 
-```
+```java
 Bridge insteon:network:home [port="/dev/ttyUSB0"] {
   Thing device AABBCC [address="AA.BB.CC", productKey="F00.00.15"] {
     Channels:
@@ -592,53 +588,53 @@ Bridge insteon:network:home [port="/dev/ttyUSB0"] {
 The value after group must either be a number or string.
 The hexadecimal value 0xf3 can either converted to a numeric value 243 or the string value "0xf3".
 
-**Items**
+###### Items
 
-```
-    Switch keypadSwitchA "keypad button A" { channel="insteon:device:home:AABBCC:keypadButtonA"}
-    Switch keypadSwitchB "keypad button B" { channel="insteon:device:home:AABBCC:keypadButtonB"}
-    Switch keypadSwitchC "keypad button C" { channel="insteon:device:home:AABBCC:keypadButtonC"}
-    Switch keypadSwitchD "keypad button D" { channel="insteon:device:home:AABBCC:keypadButtonD"}
+```java
+Switch keypadSwitchA "keypad button A" { channel="insteon:device:home:AABBCC:keypadButtonA"}
+Switch keypadSwitchB "keypad button B" { channel="insteon:device:home:AABBCC:keypadButtonB"}
+Switch keypadSwitchC "keypad button C" { channel="insteon:device:home:AABBCC:keypadButtonC"}
+Switch keypadSwitchD "keypad button D" { channel="insteon:device:home:AABBCC:keypadButtonD"}
 ```
 
-**Sitemap**
+##### Sitemap
 
 The following sitemap will bring the items to life in the GUI:
 
-```
-    Frame label="Keypad" {
-          Switch item=keypadSwitch label="main"
-          Switch item=keypadSwitchFastOnOff label="fast on/off"
-          Switch item=keypadSwitchManualChange label="manual change" mappings=[ 0="DOWN", 1="STOP",  2="UP"]
-          Switch item=keypadSwitchA label="button A"
-          Switch item=keypadSwitchB label="button B"
-          Switch item=keypadSwitchC label="button C"
-          Switch item=keypadSwitchD label="button D"
-    }
+```perl
+Frame label="Keypad" {
+      Switch item=keypadSwitch label="main"
+      Switch item=keypadSwitchFastOnOff label="fast on/off"
+      Switch item=keypadSwitchManualChange label="manual change" mappings=[ 0="DOWN", 1="STOP",  2="UP"]
+      Switch item=keypadSwitchA label="button A"
+      Switch item=keypadSwitchB label="button B"
+      Switch item=keypadSwitchC label="button C"
+      Switch item=keypadSwitchD label="button D"
+}
 ```
 
 #### Keypad Dimmers
 
 The keypad dimmers are like keypad switches, except that the main load is dimmable.
 
-**Items**
+##### Items
 
-```
-    Dimmer keypadDimmer           "dimmer"                          { channel="insteon:device:home:AABBCC:loadDimmer" }
-    Switch keypadDimmerButtonA    "keypad dimmer button A [%d %%]"  { channel="insteon:device:home:AABBCC:keypadButtonA" }
+```java
+Dimmer keypadDimmer           "dimmer"                          { channel="insteon:device:home:AABBCC:loadDimmer" }
+Switch keypadDimmerButtonA    "keypad dimmer button A [%d %%]"  { channel="insteon:device:home:AABBCC:keypadButtonA" }
 ```
 
-**Sitemap**
+##### Sitemap
 
-```
-    Slider item=keypadDimmer switchSupport
-    Switch item=keypadDimmerButtonA label="buttonA"
+```perl
+Slider item=keypadDimmer switchSupport
+Switch item=keypadDimmerButtonA label="buttonA"
 ```
 
 ### Thermostats
 
 The thermostat (2441TH) is one of the most complex Insteon devices available.
-It must first be properly linked to the modem using configuration software like [Insteon Terminal](https://github.com/pfrommerd/insteon-terminal.
+It must first be properly linked to the modem using configuration software like [Insteon Terminal](<https://github.com/pfrommerd/insteon-terminal>.
 The Insteon Terminal wiki describes in detail how to link the thermostat, and how to make it publish status update reports.
 
 When all is set and done the modem must be configured as a controller to group 0 (not sure why), and a responder to groups 1-5 such that it picks up when the thermostat switches on/off heating and cooling etc, and it must be a responder to special group 0xEF to get status update reports when measured values (temperature) change.
@@ -646,49 +642,49 @@ Symmetrically, the thermostat must be a responder to group 0, and a controller f
 The linking process is not difficult but needs some persistence.
 Again, refer to the [Insteon Terminal](https://github.com/pfrommerd/insteon-terminal) documentation.
 
-**Items**
+#### Items
 
 This is an example of what to put into your .items file:
 
-```
-    Number              thermostatCoolPoint   "cool point [%.1f °F]"       { channel="insteon:device:home:AABBCC:coolSetPoint" }
-    Number              thermostatHeatPoint   "heat point [%.1f °F]"       { channel="insteon:device:home:AABBCC:heatSetPoint" }
-    Number              thermostatSystemMode  "system mode [%d]"           { channel="insteon:device:home:AABBCC:systemMode" }
-    Number              thermostatFanMode     "fan mode [%d]"              { channel="insteon:device:home:AABBCC:fanMode" }
-    Number              thermostatIsHeating   "is heating [%d]"            { channel="insteon:device:home:AABBCC:isHeating"}
-    Number              thermostatIsCooling   "is cooling [%d]"            { channel="insteon:device:home:AABBCC:isCooling" }
-    Number:Temperature  thermostatTemperature  "temperature [%.1f %unit%]" { channel="insteon:device:home:AABBCC:temperature" }
-    Number              thermostatHumidity    "humidity [%.0f %%]"         { channel="insteon:device:home:AABBCC:humidity" }
+```java
+Number              thermostatCoolPoint   "cool point [%.1f °F]"       { channel="insteon:device:home:AABBCC:coolSetPoint" }
+Number              thermostatHeatPoint   "heat point [%.1f °F]"       { channel="insteon:device:home:AABBCC:heatSetPoint" }
+Number              thermostatSystemMode  "system mode [%d]"           { channel="insteon:device:home:AABBCC:systemMode" }
+Number              thermostatFanMode     "fan mode [%d]"              { channel="insteon:device:home:AABBCC:fanMode" }
+Number              thermostatIsHeating   "is heating [%d]"            { channel="insteon:device:home:AABBCC:isHeating"}
+Number              thermostatIsCooling   "is cooling [%d]"            { channel="insteon:device:home:AABBCC:isCooling" }
+Number:Temperature  thermostatTemperature  "temperature [%.1f %unit%]" { channel="insteon:device:home:AABBCC:temperature" }
+Number              thermostatHumidity    "humidity [%.0f %%]"         { channel="insteon:device:home:AABBCC:humidity" }
 ```
 
 Add this as well for some more exotic features:
 
-```
-    Number              thermostatACDelay      "A/C delay [%d min]"        { channel="insteon:device:home:AABBCC:acDelay" }
-    Number              thermostatBacklight    "backlight [%d sec]"        { channel="insteon:device:home:AABBCC:backlightDuration" }
-    Number              thermostatStage1       "A/C stage 1 time [%d min]" { channel="insteon:device:home:AABBCC:stage1Duration" }
-    Number              thermostatHumidityHigh "humidity high [%d %%]"     { channel="insteon:device:home:AABBCC:humidityHigh" }
-    Number              thermostatHumidityLow  "humidity low [%d %%]"      { channel="insteon:device:home:AABBCC:humidityLow" }
+```java
+Number              thermostatACDelay      "A/C delay [%d min]"        { channel="insteon:device:home:AABBCC:acDelay" }
+Number              thermostatBacklight    "backlight [%d sec]"        { channel="insteon:device:home:AABBCC:backlightDuration" }
+Number              thermostatStage1       "A/C stage 1 time [%d min]" { channel="insteon:device:home:AABBCC:stage1Duration" }
+Number              thermostatHumidityHigh "humidity high [%d %%]"     { channel="insteon:device:home:AABBCC:humidityHigh" }
+Number              thermostatHumidityLow  "humidity low [%d %%]"      { channel="insteon:device:home:AABBCC:humidityLow" }
 ```
 
-**Sitemap**
+#### Sitemap
 
 For the thermostat to display in the GUI, add this to the sitemap file:
 
-```
-    Text   item=thermostatTemperature icon="temperature"
-    Text   item=thermostatHumidity
-    Setpoint item=thermostatCoolPoint icon="temperature" minValue=63 maxValue=90 step=1
-    Setpoint item=thermostatHeatPoint icon="temperature" minValue=50 maxValue=80 step=1
-    Switch item=thermostatSystemMode  label="system mode" mappings=[ 0="OFF",  1="HEAT", 2="COOL", 3="AUTO", 4="PROGRAM"]
-    Switch item=thermostatFanMode  label="fan mode" mappings=[ 0="AUTO",  1="ALWAYS ON"]
-    Switch item=thermostatIsHeating  label="is heating" mappings=[ 0="OFF",  1="HEATING"]
-    Switch item=thermostatIsCooling  label="is cooling" mappings=[ 0="OFF",  1="COOLING"]
-    Setpoint item=thermostatACDelay  minValue=2 maxValue=20 step=1
-    Setpoint item=thermostatBacklight  minValue=0 maxValue=100 step=1
-    Setpoint item=thermostatHumidityHigh  minValue=0 maxValue=100 step=1
-    Setpoint item=thermostatHumidityLow   minValue=0 maxValue=100 step=1
-    Setpoint item=thermostatStage1  minValue=1 maxValue=60 step=1
+```perl
+Text   item=thermostatTemperature icon="temperature"
+Text   item=thermostatHumidity
+Setpoint item=thermostatCoolPoint icon="temperature" minValue=63 maxValue=90 step=1
+Setpoint item=thermostatHeatPoint icon="temperature" minValue=50 maxValue=80 step=1
+Switch item=thermostatSystemMode  label="system mode" mappings=[ 0="OFF",  1="HEAT", 2="COOL", 3="AUTO", 4="PROGRAM"]
+Switch item=thermostatFanMode  label="fan mode" mappings=[ 0="AUTO",  1="ALWAYS ON"]
+Switch item=thermostatIsHeating  label="is heating" mappings=[ 0="OFF",  1="HEATING"]
+Switch item=thermostatIsCooling  label="is cooling" mappings=[ 0="OFF",  1="COOLING"]
+Setpoint item=thermostatACDelay  minValue=2 maxValue=20 step=1
+Setpoint item=thermostatBacklight  minValue=0 maxValue=100 step=1
+Setpoint item=thermostatHumidityHigh  minValue=0 maxValue=100 step=1
+Setpoint item=thermostatHumidityLow   minValue=0 maxValue=100 step=1
+Setpoint item=thermostatStage1  minValue=1 maxValue=60 step=1
 ```
 
 ### Power Meters
@@ -697,31 +693,31 @@ The iMeter Solo reports both wattage and kilowatt hours, and is updated during t
 You can also manually update the current values from the device and reset the device.
 See the example below:
 
-**Items**
+#### Items
 
-```
-    Number:Power  iMeterWatts   "iMeter [%d watts]"   { channel="insteon:device:home:AABBCC:watts" }
-    Number:Energy iMeterKwh     "iMeter [%.04f kWh]"  { channel="insteon:device:home:AABBCC:kWh" }
-    Switch        iMeterUpdate  "iMeter Update"       { channel="insteon:device:home:AABBCC:update" }
-    Switch        iMeterReset   "iMeter Reset"        { channel="insteon:device:home:AABBCC:reset" }
+```java
+Number:Power  iMeterWatts   "iMeter [%d watts]"   { channel="insteon:device:home:AABBCC:watts" }
+Number:Energy iMeterKwh     "iMeter [%.04f kWh]"  { channel="insteon:device:home:AABBCC:kWh" }
+Switch        iMeterUpdate  "iMeter Update"       { channel="insteon:device:home:AABBCC:update" }
+Switch        iMeterReset   "iMeter Reset"        { channel="insteon:device:home:AABBCC:reset" }
 ```
 
 ### Fan Controllers
 
 Here is an example configuration for a FanLinc module, which has a dimmable light and a variable speed fan:
 
-**Items**
+#### Items
 
-```
-    Dimmer fanLincDimmer "fanlinc dimmer [%d %%]" { channel="insteon:device:home:AABBCC:lightDimmer" }
-    Number fanLincFan    "fanlinc fan"            { channel="insteon:device:home:AABBCC:fan"}
+```java
+Dimmer fanLincDimmer "fanlinc dimmer [%d %%]" { channel="insteon:device:home:AABBCC:lightDimmer" }
+Number fanLincFan    "fanlinc fan"            { channel="insteon:device:home:AABBCC:fan"}
 ```
 
-**Sitemap**
+#### Sitemap
 
-```
-    Slider item=fanLincDimmer switchSupport
-    Switch item=fanLincFan label="fan speed" mappings=[ 0="OFF",  1="LOW", 2="MEDIUM", 3="HIGH"]
+```perl
+Slider item=fanLincDimmer switchSupport
+Switch item=fanLincFan label="fan speed" mappings=[ 0="OFF",  1="LOW", 2="MEDIUM", 3="HIGH"]
 ```
 
 ### X10 Devices
@@ -732,23 +728,23 @@ While you cannot bind the the X10 devices to the Insteon PLM/HUB, here are some
 Be aware that most X10 switches/dimmers send no status updates, i.e. openHAB will not learn about switches that are toggled manually.
 Further note that X10 devices are addressed with `houseCode.unitCode`, e.g. `A.2`.
 
-**Items**
+#### Items
 
-```
-    Switch x10Switch  "X10 switch" { channel="insteon:device:home:AABB:switch" }
-    Dimmer x10Dimmer  "X10 dimmer" { channel="insteon:device:home:AABB:dimmer" }
-    Contact x10Motion "X10 motion" { channel="insteon:device:home:AABB:contact" }
+```java
+Switch x10Switch  "X10 switch" { channel="insteon:device:home:AABB:switch" }
+Dimmer x10Dimmer  "X10 dimmer" { channel="insteon:device:home:AABB:dimmer" }
+Contact x10Motion "X10 motion" { channel="insteon:device:home:AABB:contact" }
 ```
 
 ## Direct Sending of Group Broadcasts (Triggering Scenes)
 
 The binding can command the modem to send broadcasts to a given Insteon group.
-Since it is a broadcast message, the corresponding item does *not* take the address of any device, but of the modem itself.
+Since it is a broadcast message, the corresponding item does _not_ take the address of any device, but of the modem itself.
 The format is `broadcastOnOff#X` where X is the group that you want to be able to broadcast messages to:
 
-**Things**
+### Things
 
-```
+```java
 Bridge insteon:network:home [port="/dev/ttyUSB0"] {
   Thing device AABBCC             [address="AA.BB.CC", productKey="0x000045"] {
     Channels:
@@ -758,10 +754,10 @@ Bridge insteon:network:home [port="/dev/ttyUSB0"] {
 
 ```
 
-**Items**
+### Items
 
-```
-    Switch  broadcastOnOff "group on/off"  { channel="insteon:device:home:AABBCC:broadcastOnOff#2" }
+```java
+Switch  broadcastOnOff "group on/off"  { channel="insteon:device:home:AABBCC:broadcastOnOff#2" }
 ```
 
 Flipping this switch to "ON" will cause the modem to send a broadcast message with group=2, and all devices that are configured to respond to it should react.
@@ -769,9 +765,9 @@ Flipping this switch to "ON" will cause the modem to send a broadcast message wi
 Channels can also be configured using the device configuration parameter of the device.
 The key in the JSON object is `broadcastGroups` and the value is an array of integers:
 
-**Things**
+### Things (device Config)
 
-```
+```java
 Bridge insteon:network:home [port="/dev/ttyUSB0"] {
   Thing device AABBCC             [address="AA.BB.CC", productKey="0x000045", deviceConfig="{'broadcastGroups': [2]}"]
 }
@@ -781,12 +777,12 @@ Bridge insteon:network:home [port="/dev/ttyUSB0"] {
 ## Channel "related" Property
 
 When an Insteon device changes its state because it is directly operated (for example by flipping a switch manually), it sends out a broadcast message to announce the state change, and the binding (if the PLM modem is properly linked as a responder) should update the corresponding openHAB items.
-Other linked devices however may also change their state in response, but those devices will *not* send out a broadcast message, and so openHAB will not learn about their state change until the next poll.
+Other linked devices however may also change their state in response, but those devices will _not_ send out a broadcast message, and so openHAB will not learn about their state change until the next poll.
 One common scenario is e.g. a switch in a 3-way configuration, with one switch controlling the load, and the other switch being linked as a controller.
 In this scenario, the "related" keyword can be used to have the binding poll a related device whenever a state change occurs for another device.
 A typical example would be two dimmers (A and B) in a 3-way configuration:
 
-```
+```java
 Bridge insteon:network:home [port="/dev/ttyUSB0"] {
   Thing device AABBCC [address="AA.BB.CC", productKey="F00.00.11"] {
     Channels:
@@ -803,7 +799,7 @@ Another scenario is a group broadcast message, the binding doesn't know which de
 In this scenario, the "related" keyword can be used to have the binding poll one or more related device when group message are sent.
 A typical example would be a switch configured to broadcast to a group, and one or more devices configured to respond to the message:
 
-```
+```java
 Bridge insteon:network:home [port="/dev/ttyUSB0"] {
   Thing device AABBCC [address="AA.BB.CC", productKey="0x000045"] {
     Channels:
@@ -814,7 +810,7 @@ Bridge insteon:network:home [port="/dev/ttyUSB0"] {
 ```
 
 More than one device can be polled by separating them with "+" sign, e.g. "related=aa.bb.cc+xx.yy.zz" would poll both of these devices.
-The implemenation of the *related* keyword is simple: if you add it to a channel, and that channel changes its state, then the *related* device will be polled to see if its state has updated.
+The implemenation of the _related_ keyword is simple: if you add it to a channel, and that channel changes its state, then the _related_ device will be polled to see if its state has updated.
 
 ## Troubleshooting
 
@@ -828,10 +824,10 @@ Under openSUSE this is `/run/lock` and is managed by the **lock** group.
 
 Example commands to grant openHAB access (adjust for your distribution):
 
-````
+```shell
 usermod -a -G dialout openhab
 usermod -a -G lock openhab
-````
+```
 
 Insufficient access to the lock directory will result in openHAB failing to access the device, even if the device itself is writable.
 
@@ -840,7 +836,9 @@ Insufficient access to the lock directory will result in openHAB failing to acce
 Device types are defined in the file `device_types.xml`, which is inside the Insteon bundle and thus not visible to the user.
 You can however load your own device_types.xml by referencing it in the network config parameters:
 
-    additionalDevices="/usr/local/openhab/rt/my_own_devices.xml"
+```text
+additionalDevices="/usr/local/openhab/rt/my_own_devices.xml"
+```
 
 Where the `my_own_devices.xml` file defines a new device like this:
 
@@ -855,7 +853,7 @@ Where the `my_own_devices.xml` file defines a new device like this:
     </xml>
 ```
 
-Finding the Insteon product key can be tricky since Insteon has not updated the product key table (https://www.insteon.com/pdf/insteon_devcats_and_product_keys_20081008.pdf) since 2008.
+Finding the Insteon product key can be tricky since Insteon has not updated the product key table (<https://www.insteon.com/pdf/insteon_devcats_and_product_keys_20081008.pdf>) since 2008.
 If a web search does not turn up the product key, make one up, starting with "F", like: F00.00.99.
 Avoid duplicate keys by finding the highest fake product key in the `device_types.xml` file, and incrementing by one.
 
@@ -863,9 +861,11 @@ Avoid duplicate keys by finding the highest fake product key in the `device_type
 
 If you can't build a new device out of the existing device features (for a complete list see `device_features.xml`) you can add new features by specifying a file (let's call it `my_own_features.xml`) with the "additionalDevices" option in the network config parameters:
 
-    additionalFeatures="/usr/local/openhab/rt/my_own_features.xml"
+```text
+additionalFeatures="/usr/local/openhab/rt/my_own_features.xml"
+```
 
-  In this file you can define your own features (or even overwrite an existing feature.
+In this file you can define your own features (or even overwrite an existing feature.
 In the example below a new feature "MyFeature" is defined, which can then be referenced from the `device_types.xml` file (or from `my_own_devices.xml`):
 
 ```xml
@@ -885,12 +885,12 @@ In the example below a new feature "MyFeature" is defined, which can then be ref
 
 ## Known Limitations and Issues
 
-* Devices cannot be linked to the modem while the binding is running.
+- Devices cannot be linked to the modem while the binding is running.
 If new devices are linked, the binding must be restarted.
-* Setting up Insteon groups and linking devices cannot be done from within openHAB.
+- Setting up Insteon groups and linking devices cannot be done from within openHAB.
 Use the [Insteon Terminal](https://github.com/pfrommerd/insteon-terminal) for that.
 If using Insteon Terminal (especially as root), ensure any stale lock files (For example, /var/lock/LCK..ttyUSB0) are removed before starting openHAB runtime.
 Failure to do so may result in "found no ports".
-* The Insteon PLM or hub is know to break in about 2-3 years due to poorly sized capacitors.
+- The Insteon PLM or hub is know to break in about 2-3 years due to poorly sized capacitors.
 You can repair it yourself using basic soldering skills, search for "Insteon PLM repair" or "Insteon hub repair".
-* Using the Insteon Hub 2014 in conjunction with other applications (such as the InsteonApp) is not supported. Concretely, openHAB will not learn when a switch is flipped via the Insteon App until the next poll, which could take minutes.
+- Using the Insteon Hub 2014 in conjunction with other applications (such as the InsteonApp) is not supported. Concretely, openHAB will not learn when a switch is flipped via the Insteon App until the next poll, which could take minutes.
diff --git a/bundles/org.openhab.binding.intesis/README.md b/bundles/org.openhab.binding.intesis/README.md
index feed72209e91e..b591e6ddffca3 100644
--- a/bundles/org.openhab.binding.intesis/README.md
+++ b/bundles/org.openhab.binding.intesis/README.md
@@ -2,8 +2,6 @@
 
 This binding connects to WiFi [IntesisHome](https://www.intesis.com/products/cloud-solutions/ac-cloud-control) devices using their local REST Api and to [IntesisBox](https://www.intesis.com/products/ac-interfaces/wifi-gateways) devices using TCP connection.
 
-
-
 ## Supported Things
 
 This binding only supports one thing type:
@@ -27,7 +25,6 @@ The binding uses the following configuration parameters.
 | password  | IntesisHome         | Password to login to the local webserver of IntesisHome device |
 | port      | IntesisBox          | TCP port to connect to IntesisBox device, defaults to 3310     |
 
-
 ## Channels
 
 | Channel ID         | Item Type          | Description                                            | Possible Values                                         |
@@ -58,16 +55,16 @@ IntesisBox firmware 1.3.3 reports temperatures by full degrees only (e.g. 23.0)
 
 The binding can be fully setup from the UI but if you decide to use files here is a full example:
 
-**Things**
+### Things
 
-```
+```java
 Thing intesis:intesisHome:acOffice "AC Unit Adapter" @ "AC" [ipAddress="192.168.1.100", password="xxxxx"]
 Thing intesis:intesisBox:acOffice  "AC Unit Adapter" @ "AC" [ipAddress="192.168.1.100", port=3310]
 ```
 
-**Items**
+### Items
 
-```intesishome.items
+```java
 Switch              ac               "Power"                                        { channel="intesis:intesisHome:acOffice:power" }
 String              acMode           "Mode"                                         { channel="intesis:intesisHome:acOffice:mode" }
 String              acFanSpeed       "Fan Speed"             <fan>                  { channel="intesis:intesisHome:acOffice:fanSpeed" }
@@ -81,9 +78,9 @@ String              acErrorCode      "Errorcode"
 String              acWifiSignal     "Wifi Signal Quality"   <qualityofservice>     { channel="intesis:intesisBox:acOffice:wifiSignal" }
 ```
 
-**Sitemap**
+### Sitemap
 
-```intesisHome.sitemap
+```perl
 sitemap intesishome label="My AC control" {
 
     Frame label="Climate" {
diff --git a/bundles/org.openhab.binding.ipcamera/README.md b/bundles/org.openhab.binding.ipcamera/README.md
index 742a8ac7d6805..ac4358d5a61dd 100644
--- a/bundles/org.openhab.binding.ipcamera/README.md
+++ b/bundles/org.openhab.binding.ipcamera/README.md
@@ -10,12 +10,12 @@ To see what features each brand has implemented from their APIs, please see this
 
 ## How to Get Help
 
-+ Check this readme for any setup steps for your brand.
-+ Check if the camera is offline, if so there will be a reason listed.
-+ Always look at the log files with TRACE enabled, as any FFmpeg and camera errors may not reach the INFO logs.
+- Check this readme for any setup steps for your brand.
+- Check if the camera is offline, if so there will be a reason listed.
+- Always look at the log files with TRACE enabled, as any FFmpeg and camera errors may not reach the INFO logs.
 To enable TRACE logging, enter this in the openHAB console `log:set TRACE org.openhab.binding.ipcamera`.
-+ Search the forum using any log messages to find how others have already solved it.
-+ Only after doing the above ask for help in the forum and create a new thread.
+- Search the forum using any log messages to find how others have already solved it.
+- Only after doing the above ask for help in the forum and create a new thread.
 
 ## Special Notes for Different Brands
 
@@ -38,7 +38,7 @@ Due to many custom firmwares available, you may need to ask the firmware develop
 
 Example:
 
-```
+```java
 Thing ipcamera:generic:Esp32Cam
 [
     ipAddress="192.168.1.181",
@@ -54,7 +54,7 @@ Thing ipcamera:generic:Esp32Cam
 
 It is better to always setup your Amcrest camera as a `dahua` thing type.
 The old alarm polling based method is used if you setup as `amcrest`, and the newer/better event based method is used if you setup as `dahua` instead.
-All other features should be the same between the two. 
+All other features should be the same between the two.
 
 ### Dahua
 
@@ -62,47 +62,47 @@ For MJPEG to work, you need to set the first sub-stream to use MJPEG format for
 
 ### Foscam
 
-* If the user/pass is wrong, the camera can lockout and refuse to answer the binding requiring a reboot of the camera, so be sure the details are correct before the camera tries to poll the camera too many times.
-* To use MJPEG streaming, you need to enable one of the streams to use this format. This can be done by entering this into any browser:`http://ip:88/cgi-bin/CGIProxy.fcgi?cmd=setSubStreamFormat&format=1&usr=admin&pwd=password`
-* If your camera does not support MJPEG as some Foscams no longer do, then you can set `mjpegUrl` to contain *ffmpeg* to use your CPU to generate a MJPEG stream.
-* Some Foscam cameras need to have a detection area listed in the URL when you enable the motion alarm.
+- If the user/pass is wrong, the camera can lockout and refuse to answer the binding requiring a reboot of the camera, so be sure the details are correct before the camera tries to poll the camera too many times.
+- To use MJPEG streaming, you need to enable one of the streams to use this format. This can be done by entering this into any browser:`http://ip:88/cgi-bin/CGIProxy.fcgi?cmd=setSubStreamFormat&format=1&usr=admin&pwd=password`
+- If your camera does not support MJPEG as some Foscams no longer do, then you can set `mjpegUrl` to contain _ffmpeg_ to use your CPU to generate a MJPEG stream.
+- Some Foscam cameras need to have a detection area listed in the URL when you enable the motion alarm.
 
-As each Foscam model has a different resolution and two different URLs, this makes it difficult to automate, so an override feature was added to create your own "enable the alarm" URL. 
+As each Foscam model has a different resolution and two different URLs, this makes it difficult to automate, so an override feature was added to create your own "enable the alarm" URL.
 This setting is called `customMotionAlarmUrl` and the steps to using it are:
 
 1. Enable the motion alarm in the web interface of your camera and setup any areas you wish movement to be ignored in. E.g. tree branches moving in the wind.
-2. Use any web browser to fetch this URL `https://x.x.x.x/cgi-bin/CGIProxy.fcgi?cmd=getMotionDetectConfig1&usr=xxxxx&pwd=xxxxx`
-3. Use the information returned by the above URL to create the override settings.
+1. Use any web browser to fetch this URL `https://x.x.x.x/cgi-bin/CGIProxy.fcgi?cmd=getMotionDetectConfig1&usr=xxxxx&pwd=xxxxx`
+1. Use the information returned by the above URL to create the override settings.
 
 An example for a Foscam C2 is...
 
-```
+```text
 /cgi-bin/CGIProxy.fcgi?cmd=setMotionDetectConfig1&isEnable=1&snapInterval=1&schedule0=281474976710655&schedule1=281474976710655&schedule2=281474976710655&schedule3=281474976710655&schedule4=281474976710655&schedule5=281474976710655&schedule6=281474976710655&x1=0&y1=0&width1=10000&height1=10000&sensitivity1=1&valid1=1&linkage=6&usr=xxxxx&pwd=xxxxx
 ```
 
 Another example is:
 
-```
+```text
 /cgi-bin/CGIProxy.fcgi?cmd=setMotionDetectConfig&isEnable=1&linkage=0001&sensitivity=1&triggerInterval=15&schedule0=281474976710655&schedule1=281474976710655&schedule2=281474976710655&schedule3=281474976710655&schedule4=281474976710655&schedule5=281474976710655&schedule6=281474976710655&area0=1023&area1=1023&area2=1023&area3=1023&area4=1023&area5=1023&area6=1023&area7=1023&area7=1023&area8=1023&area9=1023&usr=username&pwd=password
 ```
 
 ### Hikvision
 
-+ For MJPEG to work, you need to set the first sub-stream to be in MJPEG format, otherwise you can override the default with the `mjpegUrl` config with a valid URL for MJPEG streams.
-+ The CGI/API and also ONVIF features are disabled by default on these cameras, so enable and create user details for ONVIF that are the same user/pass as what you have given the binding.
+- For MJPEG to work, you need to set the first sub-stream to be in MJPEG format, otherwise you can override the default with the `mjpegUrl` config with a valid URL for MJPEG streams.
+- The CGI/API and also ONVIF features are disabled by default on these cameras, so enable and create user details for ONVIF that are the same user/pass as what you have given the binding.
 If your camera does not have PTZ (Pan Tilt Zoom) then you can leave ONVIF disabled and just enable the CGI/API.
-+ Each alarm you wish to use must have `Notify Surveillance Center` enabled under each alarms settings in the control panel of the camera itself. 
+- Each alarm you wish to use must have `Notify Surveillance Center` enabled under each alarms settings in the control panel of the camera itself.
 
 ### Hikvision NVRs
 
 In case your Hikvision NVR does not communicate with the binding, make sure that:
 
-* ISAPI is enabled in the NVR settings.
-* ONVIF is enabled and a user/pass created that match the bindings.
-* RTSP is enabled.
-* Some NVR's allow each camera to be exposed on a set port to give direct access to each camera, some users report this works the best and needs to be enabled.
+- ISAPI is enabled in the NVR settings.
+- ONVIF is enabled and a user/pass created that match the bindings.
+- RTSP is enabled.
+- Some NVR's allow each camera to be exposed on a set port to give direct access to each camera, some users report this works the best and needs to be enabled.
 
-Some older versions of these NVRs require setting a different snapshot URL (`snapshotUrl`), as well as `ffmpegInput`. 
+Some older versions of these NVRs require setting a different snapshot URL (`snapshotUrl`), as well as `ffmpegInput`.
 The older ones use the same URLs just with 'ISAPI' removed.
 
 ```java
@@ -121,12 +121,12 @@ Thing ipcamera:hikvision:West "West Camera"
 
 ### Instar
 
-+ For MJPEG to work, you need to set the first sub-stream to be MJPEG format for the default settings to work, otherwise you can override the default with mjpegUrl with a valid URL for MJPEG streams.
-+ Be sure to update to the latest firmware for your camera as Instar have made a lot of improvements recently, including adding MQTT features (MQTT is not needed for this binding to work).
+- For MJPEG to work, you need to set the first sub-stream to be MJPEG format for the default settings to work, otherwise you can override the default with mjpegUrl with a valid URL for MJPEG streams.
+- Be sure to update to the latest firmware for your camera as Instar have made a lot of improvements recently, including adding MQTT features (MQTT is not needed for this binding to work).
 
 ## Discovery
 
-The discovery feature of openHAB can be used to find and setup any ONVIF cameras. 
+The discovery feature of openHAB can be used to find and setup any ONVIF cameras.
 This method should be preferred as it will discover the cameras IP, ports and URLs for you, making the setup much easier.
 The binding needs to use UDP port 3702 to discover the cameras with, so this port needs to be unblocked by your firewall or add the camera manually if the camera is not auto found.
 To use the discovery, just press the `+` icon located in the Inbox, then select the IpCamera binding from the list of installed bindings.
@@ -160,7 +160,7 @@ For ONVIF cameras that auto detect the wrong URL, these same fields can be used
 NOTE: Leave any `user:pass@` out of any URLs, the binding will handle this for you.
 Not only does this hide your login details, it will also make changing your password much easier if it is only located in 1 field.
 
-Below is a list of all configuration parameters (useful for textual config) with a short description. 
+Below is a list of all configuration parameters (useful for textual config) with a short description.
 If you do not specify any of these, the binding will use the default which should work in most cases and should be tried first.
 
 | Parameter | Description |
@@ -202,7 +202,7 @@ If you do not specify any of these, the binding will use the default which shoul
 
 ## Channels
 
-Each camera brand will have different channels depending on how much of the support for an API has been added. 
+Each camera brand will have different channels depending on how much of the support for an API has been added.
 The channels are kept consistent as much as possible from brand to brand to make upgrading to a different camera easier.
 
 | Channel | Type | Description |
@@ -269,25 +269,24 @@ The channels are kept consistent as much as possible from brand to brand to make
 
 To move a camera with this binding you need an ONVIF camera that supports one of the following:
 
-+ Absolute movements
-+ Relative movements
-+ Continuous movements  
-+ Presets
+- Absolute movements
+- Relative movements
+- Continuous movements  
+- Presets
 
 To test your cameras compatibility and also to create some preset locations, use a free program called `ONVIF Device Manager` (ODM for short).
 Not all ONVIF cameras work with all of the methods, so testing first to confirm what works is a good idea and the presets can not be created with the binding, only loaded after they are already created in a program like ODM.
-After creating new or changing existing presets, it is necessary to send the REFRESH command to the `gotoPreset` channel or you can restart the binding if that is easier. 
+After creating new or changing existing presets, it is necessary to send the REFRESH command to the `gotoPreset` channel or you can restart the binding if that is easier.
 You can create names using the mappings feature of the selection element.
 See docs here <https://www.openhab.org/docs/configuration/sitemaps.html#mappings>
 
-Moving the camera using *Relative* or *Continuous* (config `ptzContinuous` must be true) movements can be done by sending the INCREASE and DECREASE commands to the Pan, Tilt and Zoom channels.
+Moving the camera using _Relative_ or _Continuous_ (config `ptzContinuous` must be true) movements can be done by sending the INCREASE and DECREASE commands to the Pan, Tilt and Zoom channels.
 The OFF command (to any of the PTZ channels) will stop the cameras movements in the case of continuous being selected.
-When the config is set to false (the default if not specified) the binding will send relative movements. 
+When the config is set to false (the default if not specified) the binding will send relative movements.
 There are some widgets created in the HABpanel widget gallery that you can download and use right away saving you time if your camera supports either presets, relative or continuous modes.
 
 For sitemaps, the below examples can be used.
 
-
 item:
 
 ```java
@@ -339,19 +338,19 @@ This is where this feature can come in handy, as you can add any of the many FFm
 
 To get this working:
 
-+ Provide a URL to the bindings config `alarmInputUrl` or leave it blank to use the auto detected URL if your camera has ONVIF.
-+ Install FFmpeg.
-+ You have the resolution and FPS at realistic settings for your CPU. You need to reach 1.x speed otherwise the alarm will lag further behind realtime the longer you have this running.
+- Provide a URL to the bindings config `alarmInputUrl` or leave it blank to use the auto detected URL if your camera has ONVIF.
+- Install FFmpeg.
+- You have the resolution and FPS at realistic settings for your CPU. You need to reach 1.x speed otherwise the alarm will lag further behind realtime the longer you have this running.
 1080p and 10 fps maximum for an ARM processor is probably a good place to start testing or even lower if you can.
-+ Set the `ffmpegMotionControl` channel to 16 with a slider control and if the alarm stays on increase the value until it works as desired.
+- Set the `ffmpegMotionControl` channel to 16 with a slider control and if the alarm stays on increase the value until it works as desired.
 If it will not trigger, lower the control until it does.
-+ Set the `ffmpegMotionControl` to OFF or 0 and it stops using your CPU.
+- Set the `ffmpegMotionControl` to OFF or 0 and it stops using your CPU.
 You can link this same channel to BOTH a switch and a slider at the same time if you like to have both types of controls.
-+ The output of the alarm will go to a channel called `ffmpegMotionAlarm` and you can use the `lastMotionType` channel to determine which alarm was last tripped if your camera has multiple alarm types.
+- The output of the alarm will go to a channel called `ffmpegMotionAlarm` and you can use the `lastMotionType` channel to determine which alarm was last tripped if your camera has multiple alarm types.
 
-**audioAlarm**
+### audioAlarm
 
-This works in the same way, just with different channels. 
+This works in the same way, just with different channels.
 If you setup a lower resolution URL in the config `alarmInputUrl` you need to ensure it contains audio otherwise this feature wont work.
 A value of 10 on a slider translates to -10dB below max volume (digital full scale) and when the audio goes above the -10dB threshold the alarm will turn ON.
 
@@ -361,20 +360,20 @@ There are a number of ways to use snapshots with this binding.
 
 **Ways to use snapshots are:**
 
-+ Use the cameras URL so it passes from the camera directly to your end device. ie a tablet.
+- Use the cameras URL so it passes from the camera directly to your end device. ie a tablet.
 This is always the best option if it works.
-+ Request a snapshot with the URL `http://openhabIP:8080/ipcamera/{cameraUID}/ipcamera.jpg`.
-The IP is for your openHAB server not the camera. 
+- Request a snapshot with the URL `http://openhabIP:8080/ipcamera/{cameraUID}/ipcamera.jpg`.
+The IP is for your openHAB server not the camera.
 If you find the snapshot is old, you can set the `gifPreroll` to a number above 0 and this forces the camera to keep updating the stored JPG in RAM.
 The ipcamera.jpg can also be cast, as most cameras can not directly cast their snapshots.
-+ Use the `http://openHAB:8080/ipcamera/{cameraUID}/snapshots.mjpeg` to request a stream of snapshots to be delivered in MJPEG format. 
-+ Use the record GIF action and use a `gifPreroll` value > 0. 
-This creates a number of snapshots in the FFmpeg output folder called snapshotXXX.jpg where XXX starts at 0 and increases each `pollTime`. 
-This allows you to get a snapshot from an exact amount of time before, on, or after starting the record to GIF action. 
+- Use the `http://openHAB:8080/ipcamera/{cameraUID}/snapshots.mjpeg` to request a stream of snapshots to be delivered in MJPEG format.
+- Use the record GIF action and use a `gifPreroll` value > 0.
+This creates a number of snapshots in the FFmpeg output folder called snapshotXXX.jpg where XXX starts at 0 and increases each `pollTime`.
+This allows you to get a snapshot from an exact amount of time before, on, or after starting the record to GIF action.
 Handy for cameras which lag due to slow processors, or if you do not want a hand blocking the image when the door bell was pushed.
-These snapshots can be fetched either directly as they exist on disk, or via this URL format. 
+These snapshots can be fetched either directly as they exist on disk, or via this URL format.
 `http://openHAB:8080/ipcamera/{cameraUID}/snapshot0.jpg`
-+ Also worth a mention is that you can off load cameras to a software package running on a separate server such as, Motion, Shinobi and Zoneminder.
+- Also worth a mention is that you can off load cameras to a software package running on a separate server such as, Motion, Shinobi and Zoneminder.
 
 See this forum thread for examples of how to use snapshots and streams in a sitemap.
 <https://community.openhab.org/t/ip-camera-how-to-clickable-thumbnail-overview-in-sitemaps-that-opens-up-to-a-larger-view/77990>
@@ -384,37 +383,37 @@ See this forum thread for examples of how to use snapshots and streams in a site
 To get video streams working, this forum thread has working widget examples that you can use.
 <https://community.openhab.org/t/oh3-widget-building-a-camera-widget/110069>
 
-To get some of the video formats working, you need to install FFmpeg. 
+To get some of the video formats working, you need to install FFmpeg.
 Visit their site here to learn how <https://ffmpeg.org/>
 
 Under Linux, FFmpeg can be installed very easily with this one command.
 
-```
+```shell
 sudo apt update && sudo apt install ffmpeg
 ```
 
 **IMPORTANT:**
-The binding has its own file server that works by allowing access to the snapshot and video streams with no user/password for requests that come from an IP located in the `ipWhitelist`. 
-Requests from external IPs or internal requests that are not on the `ipWhitelist` will fail to get any answer. 
+The binding has its own file server that works by allowing access to the snapshot and video streams with no user/password for requests that come from an IP located in the `ipWhitelist`.
+Requests from external IPs or internal requests that are not on the `ipWhitelist` will fail to get any answer.
 If you prefer to use your own firewall instead, you can also choose to make the `ipWhitelist` equal "DISABLE" and then all internal IPs will have access.
 
 There are multiple ways to get a moving picture, to use them just enter the URL into any browser using `http://openHAB:8080/ipcamera/{cameraUID}/name.format` replacing the name.format with one of the options that are listed below:
 
-+ **ipcamera.m3u8** HLS (HTTP Live Streaming) which uses H.264 compression. 
+- **ipcamera.m3u8** HLS (HTTP Live Streaming) which uses H.264 compression.
 This can be used to cast to Chromecast devices, or can display video in many browsers (some browsers require a plugin to be installed).
 Please understand that this format due to the way it works will give you lag behind real time, more on this below.
-+ **ipcamera.mjpeg** whilst needing more bandwidth, it is far more compatible for displaying in a wider range of UIs and browsers.
+- **ipcamera.mjpeg** whilst needing more bandwidth, it is far more compatible for displaying in a wider range of UIs and browsers.
 It is normally 1 second or less behind real-time.
-FFmpeg can be used to create this stream if your camera does not create one for you, but this uses more CPU. 
+FFmpeg can be used to create this stream if your camera does not create one for you, but this uses more CPU.
 A lot of cameras limit the resolution in this format, so consider using HLS, autofps.mjpeg, or snapshots.mjpeg instead which will be in a higher resolution.
-+ **snapshots.mjpeg** is a special MJPEG stream created from the cameras snapshots that are taken at the polling rate.
-+ **autofps.mjpeg** This requires a camera that has a motion alarm to be turned on or it will only send a picture every 8 seconds.
+- **snapshots.mjpeg** is a special MJPEG stream created from the cameras snapshots that are taken at the polling rate.
+- **autofps.mjpeg** This requires a camera that has a motion alarm to be turned on or it will only send a picture every 8 seconds.
 You can also use the `externalMotion` channel to change the framerate.
 This feature is designed to keep data traffic to your mobile devices as low as possible by automatically sending 1fps when motion is occurring, but only 1 picture every 8 seconds when the picture has no motion.
 The idea is to not send lots of pictures if the picture has not changed as doing so only eats up your data plan.
-+ **ipcamera.gif** This is small in size and very compatible and handy to use in push notifications, Pushover, Telegram, or emails.
-You can cast it which can be handy to show a moving picture that keeps repeating on a Google/Nest home hub or your wall mounted tablet. 
-+ MP4 recordings can be created by the binding and FFmpeg, more on this below.
+- **ipcamera.gif** This is small in size and very compatible and handy to use in push notifications, Pushover, Telegram, or emails.
+You can cast it which can be handy to show a moving picture that keeps repeating on a Google/Nest home hub or your wall mounted tablet.
+- MP4 recordings can be created by the binding and FFmpeg, more on this below.
 
 ## MJPEG Streams
 
@@ -434,18 +433,18 @@ To request the MJPEG stream from the binding, all you need to do is use this lin
 
 <http://openHAB:8080/ipcamera/{cameraUID}/ipcamera.mjpeg>
 
-**Creating MJPEG with FFmpeg**
+### Creating MJPEG with FFmpeg
 
 To use this feature, all you need to do is set the config `mjpegUrl` to contain "ffmpeg" to use your CPU to generate the MJPEG stream with FFmpeg.
 For cameras that have an API you can opt to not use the cameras stream and use FFmpeg instead should you run out of available streams.
 
 FFmpeg may require you to lower the resolution and/or the FPS to lower the CPU load down enough to run, you may need to experiment.
 To change the settings used by this feature the binding exposes the config `mjpegOptions` which the default is currently `-q:v 5 -r 2 -vf scale=640:-2 -update 1` where 5 is the JPG quality/compression setting, and -r 2 is how many frames per second to try and create.
-In this case it will create 2 frames every second. 
+In this case it will create 2 frames every second.
 `-vf scale=640:-2` will lower the resolution down to make the video 640 pixels wide.
 You can remove this to use the same resolution as the camera is set to use, however it may become a trade off and you may get less frames per second if you raise the resolution.
 Always try to get the default settings working first before you begin to experiment and if your stream is above 1080p and 10 frames per second, consider lowering it if you have issues on an ARM based server like a Raspberry PIx.
- 
+
 ## snapshots.mjpeg and autofps.mjpeg
 
 These similar features allow you to request a MJPEG stream created by the binding with low CPU usage from the cameras snapshots.
@@ -453,16 +452,16 @@ Snapshots are usually high resolution and look great, however they are limited t
 The reason this is more useful than snapshots on their own, is some UIs will flash white or black when a snapshot is refreshing, this does not happen with snapshots.mjpeg and is the same bandwidth and CPU load as just using snapshots!
 
 The autofps.mjpeg feature will display a snapshot that updates every 8 seconds to keep network traffic low, then when motion is detected it will automatically increase the frames to every second until the motion stops.
-This means lower traffic unless the picture is actually changing. 
+This means lower traffic unless the picture is actually changing.
 
-Request the stream to be sent to an item with this URL. 
+Request the stream to be sent to an item with this URL.
 NOTE: The IP is openHAB's not your cameras IP.
 
 `http://openHAB:8080/ipcamera/{cameraUID}/snapshots.mjpeg`
 
 Use the following to display it in your sitemap.
 
-```
+```java
 Video url="http://openHAB:8080/ipcamera/{cameraUID}/autofps.mjpeg" encoding="mjpeg"
 
 Video url="http://openHAB:8080/ipcamera/{cameraUID}/snapshots.mjpeg" encoding="mjpeg"
@@ -471,9 +470,9 @@ Video url="http://openHAB:8080/ipcamera/{cameraUID}/snapshots.mjpeg" encoding="m
 ## HLS (HTTP Live Streaming)
 
 HLS is a way of splitting the live stream up into small H.264 based files so it can be played in many browsers (some require addons to be installed) without using much CPU power as cameras generally are already in H.264 and this does not transcode the data.
-Because the files need to be created, this creates a lag/delay behind real time that can be reduced (more on that below). 
+Because the files need to be created, this creates a lag/delay behind real time that can be reduced (more on that below).
 
-The channel called 'startStream' can be used to create HLS files non stop and will remove the startup delay that comes with using this type of stream. 
+The channel called 'startStream' can be used to create HLS files non stop and will remove the startup delay that comes with using this type of stream.
 The startup delay and the lag are two different things, with the startup delay easily solved by turning this channel ON.
 If the channel is OFF, the stream will start and stop automatically as required and the channel will reflect its current status.
 With a fast openHAB server it should only need to be requested once, but on slower ARM systems it takes a while for FFmpeg to get up and running at full speed.
@@ -483,23 +482,23 @@ This 64 second delay before the stream is stopped helps when you are moving back
 
 To use the HLS feature, you need to:
 
-+ Ensure FFmpeg is installed.
-+ For `generic` cameras, you will need to use the config `ffmpegInput` to provide a HTTP or RTSP URL.
-+ Consider using a SSD/HDD, zram location, or a tmpfs (ram drive) can be used if you only have micro SD/flash based storage.
+- Ensure FFmpeg is installed.
+- For `generic` cameras, you will need to use the config `ffmpegInput` to provide a HTTP or RTSP URL.
+- Consider using a SSD/HDD, zram location, or a tmpfs (ram drive) can be used if you only have micro SD/flash based storage.
 
 ### Ram Drive Setup
 
-To create a tmpfs of 20mb at /tmpfs/ run this command to open the file for editing. 
+To create a tmpfs of 20mb at /tmpfs/ run this command to open the file for editing.
 Recommend using 20Mb per camera that uses this location although it could use less than half that amount if carefully streamlined for less ram.
-If using the FFmpeg `-hls_wrap wrap` option (causes issues for my Home Hub), you can get away with 5Mb per camera. 
+If using the FFmpeg `-hls_wrap wrap` option (causes issues for my Home Hub), you can get away with 5Mb per camera.
 
-```
+```shell
 nano /etc/fstab
 ```
 
 Enter and save this at the bottom of the file using ctrl X when done.
 
-```
+```shell
 tmpfs /tmpfs tmpfs defaults,nosuid,nodev,noatime,size=20m 0 0
 ```
 
@@ -513,26 +512,26 @@ Then you need to change the HLS settings to what you need, some are suggestions
 
 Less delay behind realtime (no audio) if your cameras iFrames are 1 second apart (-hls_time 1):
 
-```bash
+```shell
 -strict -2 -f lavfi -i aevalsrc=0 -acodec aac -vcodec copy -hls_flags delete_segments -hls_time 1 -hls_list_size 4
 ```
 
 For cameras with no audio in the stream (default setting).
 
-```bash
+```shell
 -strict -2 -f lavfi -i aevalsrc=0 -acodec aac -vcodec copy -hls_flags delete_segments -hls_time 2 -hls_list_size 4
 ```
 
 For cameras with audio in the stream.
 Note: will break Chromecast if the camera does not send audio which is why this is not the default.
 
-```bash
+```shell
 -strict -2 -acodec aac -vcodec copy -hls_flags delete_segments -hls_time 2 -hls_list_size 4
 ```
 
 Some browsers require larger segment sizes to prevent choppy playback, this can be done with this setting to create 10 second segment files which increases the time before you can get playback working.
 
-```bash
+```shell
 -strict -2 -f lavfi -i aevalsrc=0 -acodec aac -vcodec copy -hls_flags delete_segments -hls_time 10 -hls_list_size 4
 
 ```
@@ -541,22 +540,19 @@ Some browsers require larger segment sizes to prevent choppy playback, this can
 
 The webview version allows you to zoom in on the video when using the iOS app, the Video element version does not zoom, but it will pass through myopenHAB.
 
-```
-
+```java
 Text label="HLS Video Stream" icon="camera"{Video url="http://openHAB:8080/ipcamera/{cameraUID}/ipcamera.m3u8" encoding="hls"}
 
 Text label="HLS Webview Stream" icon="camera"{Webview url="http://openHAB:8080/ipcamera/{cameraUID}/ipcamera.m3u8" height=15}
-
 ```
 
-**Display multiple HLS streams side by side**
+#### Display multiple HLS streams side by side
 
 In order to display camera hls streams side by side you can also create a webView item and link it to a HTML file in the conf/html directory as follows:
 The webView URL is that of your openHAB installation.
 
-```
+```java
 Webview url="http://192.168.6.4:8080/static/html/file.html" height=5
-
 ```
 
 ```html
@@ -585,19 +581,18 @@ Webview url="http://192.168.6.4:8080/static/html/file.html" height=5
 There are two ways to cast a camera.
 
 1. openHAB Cloud Connector and using metadata/tags.
-2. Chromecast Bindings `playuri` channel.
+1. Chromecast Bindings `playuri` channel.
 
 The first method once setup allows you to ask "OK Google show X camera", or "OK Google show X camera on Y display".
 By optionally naming the display that you wish to use, it can be cast directly to your Chromecast (connected to your TV) by speaking to a Google Nest Mini.
 This must use the HLS format and use the metadata tag shown below with the openHAB Cloud Connector setup.
-Don't forget to ask Google to 'sync my devices' after adding the metadata. 
+Don't forget to ask Google to 'sync my devices' after adding the metadata.
 The synonyms in the tag allows Google to understand multiple names that the camera may be called by different people in your family.
 
 Example of how this is done in an items file.
 
-```
+```java
 String FrontDoorCamHlsUrl "Front Door" { channel="ipcamera:ONVIF:FrontDoor:hlsUrl", synonyms="door bell, front camera", ga="Camera" [ protocols="hls" ] }
-
 ```
 
 The second method is by using the Chromecast Binding and by sending the URL you wish to cast to the `playuri` channel.
@@ -607,16 +602,14 @@ Example:
 
 items
 
-```
+```java
 String KitchenHomeHubPlayURI { channel="chromecast:chromecast:KitchenHomeHub:playuri" }
-
 ```
 
 In a rule...
 
-```
+```java
 KitchenHomeHubPlayURI.sendCommand("http://openHAB:8080/ipcamera/{cameraUID}/ipcamera.m3u8")
-
 ```
 
 ## MP4 and GIF Recordings
@@ -625,19 +618,19 @@ You can use FFmpeg to recording to either GIF or MP4 format.
 
 The steps to do this are:
 
-+ Use the Action called `recordMP4(String filename, int secondsToRecord)` or `recordGIF(String filename, int secondsToRecord)` with the first argument being the filename you wish to use, and the second the time in seconds you wish to record for.
-+ Once the file is created, the channel `recordingMp4` or `recordingGif` will change itself back to `0`, which can be used to trigger a rule to send/use the file which will appear in the `ffmpegOutput` folder.
-+ The channel `mp4History` or `gifHistory` keeps a string of the last 50 filenames (comma separated values CSV) until you reset the history. If you use `ipcamera` as the filename, this stops the history from growing.
-+ The channel `mp4HistoryLength` and `gifHistoryLength` keeps track of how many recordings were made since it was last reset.
+- Use the Action called `recordMP4(String filename, int secondsToRecord)` or `recordGIF(String filename, int secondsToRecord)` with the first argument being the filename you wish to use, and the second the time in seconds you wish to record for.
+- Once the file is created, the channel `recordingMp4` or `recordingGif` will change itself back to `0`, which can be used to trigger a rule to send/use the file which will appear in the `ffmpegOutput` folder.
+- The channel `mp4History` or `gifHistory` keeps a string of the last 50 filenames (comma separated values CSV) until you reset the history. If you use `ipcamera` as the filename, this stops the history from growing.
+- The channel `mp4HistoryLength` and `gifHistoryLength` keeps track of how many recordings were made since it was last reset.
 You can send the `0` command to this channel to clear the `mp4History` at the same time as setting this channel back to 0.
-+ You can use the `mp4OutOptions` or `gifOutOptions` config's to apply any FFmpeg filters that you wish.
+- You can use the `mp4OutOptions` or `gifOutOptions` config's to apply any FFmpeg filters that you wish.
 
 There is also a HABpanel Widget worth checking out that uses the history feature to display a list of recent recordings.
 <https://community.openhab.org/t/custom-widget-camera-history-and-live-popup/103082>
 
 **NOTE:** If you are using a tmpfs folder, you will need to ensure you do not run out of space by moving the files with a rule.
 
-**GIF Preroll**
+### GIF Preroll
 
 There is also a config called `gifPreroll` to be aware of.
 When `gifPreroll` is 0 (the default) the binding will use the `ffmpegInput` stream to record from.
@@ -694,11 +687,11 @@ The display order can be allowed to change if one or more of the cameras detects
 
 Some additional checks to get it working are:
 
-+ If using the groups HLS feature, the poll time of the group must be the same or less than the total time contained in each cameras m3u8 file.
+- If using the groups HLS feature, the poll time of the group must be the same or less than the total time contained in each cameras m3u8 file.
 If you have 3 seconds worth of video segments in each cameras HLS stream, this is the max you can set the poll time of the group to.
-+ All cameras in a group should have the same HLS segment size setting, 1 and 2 second long segments have been tested to work.
-+ Mixing cameras with different aspect ratios may cause issues when cast.
-+ The HLS files need to remain on disk for the number of cameras X pollTime, use the `-hls_delete_threshold` ffmpeg option to control this.
+- All cameras in a group should have the same HLS segment size setting, 1 and 2 second long segments have been tested to work.
+- Mixing cameras with different aspect ratios may cause issues when cast.
+- The HLS files need to remain on disk for the number of cameras X pollTime, use the `-hls_delete_threshold` ffmpeg option to control this.
 
 ## Sitemap Example
 
diff --git a/bundles/org.openhab.binding.ipobserver/README.md b/bundles/org.openhab.binding.ipobserver/README.md
index 100586090039a..d0d983e6606db 100644
--- a/bundles/org.openhab.binding.ipobserver/README.md
+++ b/bundles/org.openhab.binding.ipobserver/README.md
@@ -8,7 +8,7 @@ Whilst Ambient Weather has it own cloud based binding, the other brands will not
 This binding works fully offline and can work via one of two methods:
 
 1. Local scraping of the weather station's `livedata` webpage at 12 second resolution (non WiFi models only).
-2. Both WiFi and RJ45 models can be setup to push the data directly to the openHAB (default 8080) server directly and the binding can parse the data from the weather underground data.
+1. Both WiFi and RJ45 models can be setup to push the data directly to the openHAB (default 8080) server directly and the binding can parse the data from the weather underground data.
 
 The other binding worth mentioning is the weather underground binding that allows the data to be intercepted on its way to WU, however many of the weather stations do not allow the redirection of the WU data and require you to know how to do redirections with a custom DNS server on your network.
 This binding with method 1 and a RJ45 model is by far the easiest method and works for all the brands and will not stop the data still being sent to WU if you wish to do both at the same time.
diff --git a/bundles/org.openhab.binding.irobot/README.md b/bundles/org.openhab.binding.irobot/README.md
index e68bcd8427783..6f1ff8e88850b 100644
--- a/bundles/org.openhab.binding.irobot/README.md
+++ b/bundles/org.openhab.binding.irobot/README.md
@@ -1,12 +1,12 @@
 # iRobot Binding
 
-This binding provides integration of products by iRobot company (https://www.irobot.com/). It is currently developed
+This binding provides integration of products by iRobot company (<https://www.irobot.com/>). It is currently developed
 to support Roomba vacuum cleaner/mopping robots with built-in Wi-Fi module. The binding interfaces to the robot directly
 without any need for a dedicated MQTT server.
 
 ## Supported Things
 
-- iRobot Roomba robotic vacuum cleaner (https://www.irobot.com/roomba).
+- iRobot Roomba robotic vacuum cleaner (<https://www.irobot.com/roomba>).
 - iRobot Braava has also been reported to (partially) work.
 - In general, the channel list is far from complete. There is a lot to do now.
 
@@ -22,7 +22,7 @@ receive the password and go ONLINE.
 After you've done this procedure you can write the password somewhere in case if you need to reconfigure your binding. It's
 not known, however, whether the password is eternal or can change during factory reset.
 If you have issues getting the password make sure there are no other devices like your smartphone communicating with the robot.
-You can also try using [these python scripts](https://github.com/NickWaterton/Roomba980-Python) to get the password. 
+You can also try using [these python scripts](https://github.com/NickWaterton/Roomba980-Python) to get the password.
 
 ## Thing Configuration
 
@@ -149,8 +149,8 @@ Error codes. Data type is string in order to be able to utilize mapping to human
 
 You can clean one or many specific regions of a given map by sending the following String to the command channel:
 
-```
- cleanRegions:<pmapId>;[r=]<region_id1>,[r=]<region_id2>,z=<zone_id1>,...;[<user_pmapv_id>]
+```text
+cleanRegions:<pmapId>;[r=]<region_id1>,[r=]<region_id2>,z=<zone_id1>,...;[<user_pmapv_id>]
 ```
 
 Some devices support cleaning rooms (aka regions). Additionally, support for cleaning rectangle areas previously defined in the iRobot-App (aka zones) may be available.
@@ -161,22 +161,21 @@ The easiest way to determine the pmapId, region_ids/zoneids and userPmapvId is t
 ## Known Problems / Caveats
 
 1. Sending "pause" command during missions other than "clean" is equivalent to sending "stop"
-2. Switching to "spot" mission is possible only in "stop" state. Attempt to do it otherwise causes error: the command is rejected and error tones are played.
-3. Roomba's built-in MQTT server, used for communication, supports only a single local connection at a time. Bear this in mind when you want to do something that requires local connection from your phone, like reconfiguring the network. Disable openHAB Thing before doing this.
-4. Sometimes during intensive testing Roomba just stopped communicating over the local connection. If this happens, try rebooting it. On my robot it's done by holding "Clean" button for about 10 seconds until all the LEDs come on. Release the button and the reboot tone will be played. It looks like there are some bugs in the firmware.
-
+1. Switching to "spot" mission is possible only in "stop" state. Attempt to do it otherwise causes error: the command is rejected and error tones are played.
+1. Roomba's built-in MQTT server, used for communication, supports only a single local connection at a time. Bear this in mind when you want to do something that requires local connection from your phone, like reconfiguring the network. Disable openHAB Thing before doing this.
+1. Sometimes during intensive testing Roomba just stopped communicating over the local connection. If this happens, try rebooting it. On my robot it's done by holding "Clean" button for about 10 seconds until all the LEDs come on. Release the button and the reboot tone will be played. It looks like there are some bugs in the firmware.
 
 ## Example
 
 irobot.things:
 
-```
+```java
 Thing irobot:roomba:my_roomba [ ipaddress="192.168.0.5", password="xxxxxxxx" ]
 ```
 
 irobot.items:
 
-```
+```java
 String Roomba_Command { channel="irobot:roomba:my_roomba:command" }
 String Roomba_Cycle { channel="irobot:roomba:my_roomba:cycle" }
 String Roomba_Phase { channel="irobot:roomba:my_roomba:phase" }
@@ -187,7 +186,7 @@ String Roomba_Error { channel="irobot:roomba:my_roomba:error" }
 
 irobot.sitemap:
 
-```
+```perl
 Selection item=Roomba_Command mappings=["clean"="Clean", "spot"="Spot", dock="Dock", pause="Pause", stop="Stop"]
 Text item=Roomba_Cycle label="Current cycle"
 Text item=Roomba_Phase label="Current phase"
@@ -198,8 +197,8 @@ Text item=Roomba_Error label="Error"
 
 ## Credits
 
-This code is a result of development of an abandoned draft by hkunh42 (https://github.com/hkuhn42/openhab2.roomba)
+This code is a result of development of an abandoned draft by hkunh42 (<https://github.com/hkuhn42/openhab2.roomba>)
 and heavily uses the following projects as a reference:
 
-- Roomba980-Python by Nick Waterton (https://github.com/NickWaterton/Roomba980-Python)
-- Dorita980 by Facu ZAK (https://github.com/koalazak/dorita980)
+- Roomba980-Python by Nick Waterton (<https://github.com/NickWaterton/Roomba980-Python>)
+- Dorita980 by Facu ZAK (<https://github.com/koalazak/dorita980>)
diff --git a/bundles/org.openhab.binding.irtrans/README.md b/bundles/org.openhab.binding.irtrans/README.md
index 23948c1da21ab..b0d1e47ef343a 100644
--- a/bundles/org.openhab.binding.irtrans/README.md
+++ b/bundles/org.openhab.binding.irtrans/README.md
@@ -4,7 +4,7 @@ This binding integrates infrared receivers and blasters manufactured by IRtrans
 
 ## Supported Things
 
-The *ethernet* Bridge supports the Ethernet (PoE) IRtrans transceiver equipped with an on-board IRDB database. Blasters and receivers are defined as Channels on the Bridge, but one can also define blasters as a *blaster* child Thing on the Bridge.
+The _ethernet_ Bridge supports the Ethernet (PoE) IRtrans transceiver equipped with an on-board IRDB database. Blasters and receivers are defined as Channels on the Bridge, but one can also define blasters as a _blaster_ child Thing on the Bridge.
 
 ## Discovery
 
@@ -16,37 +16,37 @@ There is no specific binding configuration required.
 
 ## Thing Configuration
 
-The *ethernet* Bridge requires an *ipAddress* IP address and *portNumber* TCP port number in order to configure it. Optionally, one can add the following parameters to the configuration:
+The _ethernet_ Bridge requires an _ipAddress_ IP address and _portNumber_ TCP port number in order to configure it. Optionally, one can add the following parameters to the configuration:
 
-*bufferSize* : Buffer size used by the TCP socket when sending and receiving commands to the transceiver (default: 1024)
-*responseTimeOut* : Specifies the time milliseconds to wait for a response from the transceiver when sending a command (default: 100)
-*pingTimeOut* : Specifies the time milliseconds to wait for a response from the transceiver when pinging the device (default: 1000)
-*reconnectInterval* : Specifies the time seconds to wait before reconnecting to a transceiver after a communication failure (default: 10)
+_bufferSize_ : Buffer size used by the TCP socket when sending and receiving commands to the transceiver (default: 1024)
+_responseTimeOut_ : Specifies the time milliseconds to wait for a response from the transceiver when sending a command (default: 100)
+_pingTimeOut_ : Specifies the time milliseconds to wait for a response from the transceiver when pinging the device (default: 1000)
+_reconnectInterval_ : Specifies the time seconds to wait before reconnecting to a transceiver after a communication failure (default: 10)
 
-The *blaster* Thing requires a *led* parameter to specify on which infrared commands will be emitted, *remote* the remote or manufacturer name which's commands will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' remote), and *command* the name of the command will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' command).
+The _blaster_ Thing requires a _led_ parameter to specify on which infrared commands will be emitted, _remote_ the remote or manufacturer name which's commands will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be ' \*' for 'any' remote), and _command_ the name of the command will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' command).
 
 ## Channels
 
-The *ethernet* Thing supports the following Channel Types:
+The _ethernet_ Thing supports the following Channel Types:
 
 | Channel Type ID | Item Type | Description                                                                         |
 |-----------------|-----------|-------------------------------------------------------------------------------------|
 | blaster         | String    | Send (filtered) infrared commands over the specified blaster LED of the transceiver |
 | receiver        | String    | Receive (filtered) infrared commands on the receiver LED of the transceiver         |
 
-The *blaster* Channel Type requires a *led* configuration parameter to specify on which infrared commands will be emitted, *remote* the remote or manufacturer name which's commands will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' remote), and *command* the name of the command will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' command).
+The _blaster_ Channel Type requires a _led_ configuration parameter to specify on which infrared commands will be emitted, _remote_ the remote or manufacturer name which's commands will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '\*' for 'any' remote), and _command_ the name of the command will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' command).
 
-The *receiver* Channel Type requires *remote* the remote or manufacturer name which's commands will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' remote), and *command* the name of the command will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' command).
+The _receiver_ Channel Type requires _remote_ the remote or manufacturer name which's commands will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '\*' for 'any' remote), and _command_ the name of the command will be allowed, as defined in the IRtrans server database that is flashed into the transceiver (can be '*' for 'any' command).
 
-The *blaster* Thing supports a *io* Channel (of Item Type String) that allows to read infrared commands received by the blaster, as well as to write infrared commands to be sent by the blaster.
+The _blaster_ Thing supports a _io_ Channel (of Item Type String) that allows to read infrared commands received by the blaster, as well as to write infrared commands to be sent by the blaster.
 
-The IRtrans transceivers store infrared commands in a "remote,command" table, e.g. "telenet,power". Sending the literal text string "telenet,power" to the transceiver will make the transceiver "translate" that into the actual infrared command that will be emitted by the transceiver.  A "remote,command" string sent to a Channel that does not match the defined filter will be ignored. 
+The IRtrans transceivers store infrared commands in a "remote,command" table, e.g. "telenet,power". Sending the literal text string "telenet,power" to the transceiver will make the transceiver "translate" that into the actual infrared command that will be emitted by the transceiver.  A "remote,command" string sent to a Channel that does not match the defined filter will be ignored.
 
 ## Full Example
 
 demo.things:
 
-```
+```java
 Bridge irtrans:ethernet:kitchen [ ipAddress="192.168.0.56", portNumber=21000, bufferSize=1024, responseTimeOut=100, pingTimeOut=2000, reconnectInterval=10 ]
 {
 Channels:
@@ -60,7 +60,7 @@ In the above example, the first channel will be updated when any IR command from
 The led can be "E"-External, "I"-Internal, "B"-Both, and a numeric for a selected led.
 Depending on the number of remotes, the bufferSize must be adjusted. E.g. for 7 remotes and 47 commands a bufferSize of 2048 is needed.
 
-```
+```java
 Bridge irtrans:ethernet:technicalfacilities [ ipAddress="192.168.0.58", portNumber=21000, bufferSize=1024, responseTimeOut=100, pingTimeOut=2000, reconnectInterval=10 ]
 {
 Channels:
@@ -75,7 +75,7 @@ In the above channel a single IRtrans transceiver has 3 output LEDs in use, 2 to
 
 demo.items:
 
-```
+```java
 String KitchenIRReceiverAny {channel="irtrans:ethernet:kitchen:any"}
 String KitchenIRReceiverTelenetPower {channel="irtrans:ethernet:kitchen:telenet_power"}
 String KitchenIRBlasterSamsung {channel="irtrans:ethernet:kitchen:samsung"}
@@ -88,7 +88,7 @@ String TechnicalFacilitiesIRBlasterAppleTV {channel="irtrans:ethernet:technicalf
 
 demo.rules:
 
-```
+```java
 rule "Kitchen switch IR rule"
 when
     Item KitchenIRReceiverTelenetPower received update 
diff --git a/bundles/org.openhab.binding.ism8/README.md b/bundles/org.openhab.binding.ism8/README.md
index 0105e5efc5e7c..72a24a1053293 100644
--- a/bundles/org.openhab.binding.ism8/README.md
+++ b/bundles/org.openhab.binding.ism8/README.md
@@ -2,13 +2,13 @@
 
 _This binding can receive values of the Wolf heating system._
 
-The ISM8 card can be placed into the Wolf heating system. 
-The card is usually used in combination with an object server, where the object server does forward those messages into the KNX bus system. 
-In case there is no need to handle the heating system values directly in the KNX system you can use this binding to monitor and control your heating system without the need to buy an object server. 
-The system works in a way that the ISM8 connects to a partner and sends from time to time an update. The frequency depends on the change of the values. 
+The ISM8 card can be placed into the Wolf heating system.
+The card is usually used in combination with an object server, where the object server does forward those messages into the KNX bus system.
+In case there is no need to handle the heating system values directly in the KNX system you can use this binding to monitor and control your heating system without the need to buy an object server.
+The system works in a way that the ISM8 connects to a partner and sends from time to time an update. The frequency depends on the change of the values.
 This binding is listening to those messages.
 After the first connection there is an active command send to the ISM8 in order to receive all available data points.
-The manual of the ISM8 can be downloaded from the supplier (https://www.wolf.eu/fileadmin/Wolf_Profi/Downloads/Montage-Bedienungsanleitungen/Regelungen/Zubehoer/3064356_201611_ISM8i_Montage-u.Bedienungsanleitung.pdf) 
+The manual of the ISM8 can be downloaded from the supplier (<https://www.wolf.eu/fileadmin/Wolf_Profi/Downloads/Montage-Bedienungsanleitungen/Regelungen/Zubehoer/3064356_201611_ISM8i_Montage-u.Bedienungsanleitung.pdf>)
 
 ## Supported Things
 
@@ -18,7 +18,6 @@ _This binding does only support one Thing - the Ism8-Device._
 
 _Auto-discovery is not supported._
 
-
 ## Thing Configuration
 
 The intention was to have a generic ISM8 binding in order to offer the full flexibilty for the different heating systems.
@@ -28,58 +27,56 @@ For this reason you need to create a Thing configuration, where basically only t
 ## Channels
 
 You can use any channel supported by the ISM8 as data point. Please have a look at the official manual from Wolf.
-Within this document you'll find a table containing all supported data points. 
-The available data points are depending on your heating system configuration. 
+Within this document you'll find a table containing all supported data points.
+The available data points are depending on your heating system configuration.
 The ISM8 does currently support 4 different devices at the same moment of time (e.g. CGB-2, CWL Excellent, Solar, ...).
 
 Once you have an overview of your heating system set you can start to create the channels accordingly.
 Each channel should be created in the following way:
 
-	| Type   | Name    | Description                | Configuration   |
-	|--------|---------|----------------------------|-----------------|
-	| Number | DpId004 | "Kesseltemperatur"         | id, type, write |
+| Type   | Name    | Description                | Configuration   |
+|--------|---------|----------------------------|-----------------|
+| Number | DpId004 | "Kesseltemperatur"         | id, type, write |
 
 Type:
 
-+ Switch use for boolean values
-+ Number use for any number
-+ Other types may work as well.
+- Switch use for boolean values
+- Number use for any number
+- Other types may work as well.
 
 Name:
 
-+ Put here any name you'd like. This name is used for creating the binding.
-
+- Put here any name you'd like. This name is used for creating the binding.
 
 Description:
 
-+ Put here any description you'd like or the description for the data point ID from the Wolf manual.
-
+- Put here any description you'd like or the description for the data point ID from the Wolf manual.
 
 Configuration:
 
-+ id=1            - Please enter here the ID of the data point you'd like to map to this channel. 
-A list of the available IDs are available within the Wolf manual. 
+- id=1            - Please enter here the ID of the data point you'd like to map to this channel.
+A list of the available IDs are available within the Wolf manual.
 The supported IDs are depending on the firmware version of the ISM8 and the connected systems.
-+ type="1.001"    - Please enter here the knx type of the data point. 
+- type="1.001"    - Please enter here the knx type of the data point.
 You can find the data type in the Wolf ISM8 document as well.
-+ write=true      - This parameter defines if the channel is bidirectional, but the parameter is optional and by default false. 
+- write=true      - This parameter defines if the channel is bidirectional, but the parameter is optional and by default false.
 
 Note:
 Not all available types of the ISM8 interface are fully supported, but this can be extended.
 For the moment the following data types are implemented:
 
-+ DPT-Bool:         `1.001`, `1.002`, `1.003`, `1.009`
-+ DPT-Scaling:      `5.001`
-+ DPT-Value:        `9.001`, `9.002`, `9.006`
-+ DPT-FlowRate:     `13.002`
-+ DPT-Mode:         `20.102`, `20.103`, `20.105`
-
+- DPT-Bool:         `1.001`, `1.002`, `1.003`, `1.009`
+- DPT-Scaling:      `5.001`
+- DPT-Value:        `9.001`, `9.002`, `9.006`
+- DPT-FlowRate:     `13.002`
+- DPT-Mode:         `20.102`, `20.103`, `20.105`
 
 ## Full Example
 
-_ism8.things_
+### ism8.things
 
-    Thing ism8:device:heater "Wolf Heizung"         [portNumber=12004]
+```java
+Thing ism8:device:heater "Wolf Heizung"         [portNumber=12004]
     {
         Type switch-readonly : DpId001 "Störung Heizgerät"            [id=1, type="1.001"]
         Type number-readonly : DpId002 "Betriebsart"                  [id=2, type="20.105"]
@@ -105,89 +102,96 @@ _ism8.things_
         Type number-readonly : DpId167 "CWL Luftdurchsatz Abluft"     [id=167, type="13.002"]
         Type number-readonly : DpId192 "CML Filterwarnung"            [id=192, type="1.001"]    
     }
-
-_ism8.items_
-
-	Switch	ISM_HeizungStoerung              "Störung Heizgerät"                      { channel="ism8:device:heater:DpId001" }
-	Number	ISM_HeizungBetriebsart           "Betriebsart"                            { channel="ism8:device:heater:DpId002" }
-	Number	ISM_HeizungBrennerleistung       "Brennerleistung [%.1f %%]"              { channel="ism8:device:heater:DpId003" }
-	Number	ISM_HeizungKesseltemperatur      "Kesseltemperatur [%.1f °C]"             { channel="ism8:device:heater:DpId004" }
-	Number	ISM_HeizungRuecklauftemperatur   "Rücklauftemperatur [%.1f °C]"           { channel="ism8:device:heater:DpId006" }
-	Number	ISM_HeizungWarmwassertemperatur  "Warmwassertemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId007" }
-	Number	ISM_HeizungAussentemperatur      "Außentemperatur [%.1f °C]"              { channel="ism8:device:heater:DpId008" }
-	Switch	ISM_HeizungStatusFlamme          "Status Flamme"                          { channel="ism8:device:heater:DpId009" }
-	Number	ISM_HeizungAnlagendruck          "Anlagendruck [%.2f bar]"                { channel="ism8:device:heater:DpId013" }
-	Switch	ISM_HeizungSysStoerung           "Störung Systemmodul"                    { channel="ism8:device:heater:DpId053" }
-	Number	ISM_HeizungSysAussentemperatur   "Außentemperatur Systemmodul [%.1f °C]"  { channel="ism8:device:heater:DpId054" }
-	Number	ISM_HeizungSollwertWarmwasser    "Sollwert Warmwasser [%.1f °C]"          { channel="ism8:device:heater:DpId056" }
-	Number	ISM_HeizungBetriebsartHeizkreis  "Betriebsart Heizkreis"                  { channel="ism8:device:heater:DpId057" }
-	Number	ISM_HeizungBetriebsartWarmwasser "Betriebsart Warmwasser"                 { channel="ism8:device:heater:DpId058" }
-	Number	ISM_HeizungSollwertverschiebung  "Sollwertverschiebung [%.1f °C]"         { channel="ism8:device:heater:DpId065" }
-	Switch	ISM_LueftungStoerung             "CML Störung"                            { channel="ism8:device:heater:DpId148" }
-	Number	ISM_LueftungBetriebsart          "CWL Betriebsart"                        { channel="ism8:device:heater:DpId149" }
-	Number	ISM_LueftungLueftungsstufe       "CWL Lüftungsstufe [%.1f %%]"            { channel="ism8:device:heater:DpId163" }
-	Number	ISM_LueftungAblufttemperatur     "CWL Ablufttemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId164" }
-	Number	ISM_LueftungZulufttemperatur     "CWL Zulufttemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId165" }
-	Number	ISM_LueftungLuftdurchsatzZuluft  "CWL Luftdurchsatz Zuluft [%.1f m³/h]"   { channel="ism8:device:heater:DpId166" }
-	Number	ISM_LueftungLuftdurchsatzAbluft  "CWL Luftdurchsatz Abluft [%.1f m³/h]"   { channel="ism8:device:heater:DpId167" }
-	Switch	ISM_LueftungFilterwarnung        "CML Filterwarnung"                      { channel="ism8:device:heater:DpId192" }
-	
-_demo.sitemap_
-
-    Frame label="Heizung"
-    {    
-        Text item=ISM_HeizungSysStoerung                icon="siren"
-        Text item=ISM_HeizungStoerung                   icon="siren"
-        Text item=ISM_HeizungAussentemperatur           icon="temperature"
-        Text item=ISM_HeizungBetriebsart                icon="radiator"          label="Modus [MAP(HVACContrMode.map):%s]"
-        Text item=ISM_HeizungAnlagendruck               icon="pressure"
-        Text item=ISM_HeizungBrennerleistung            icon="chart"
-        Selection item=ISM_HeizungBetriebsartHeizkreis  icon="radiator"          mappings=[0="Auto", 1="Komfort", 2="Stand By", 3="Eco", 4="Frost Schutz"]
-        Text item=ISM_HeizungStatusFlamme               icon="fire"
-        Text item=ISM_HeizungKesseltemperatur           icon="temperature"
-        Text item=ISM_HeizungRuecklauftemperatur        icon="temperature_cold"
-        Setpoint item=ISM_HeizungSollwertverschiebung   icon="radiator"          minValue=-5 maxValue=5 step=1
-    }
-    Frame label="Wasser"
-    {    
-        Text item=ISM_HeizungWarmwassertemperatur       icon="temperature_hot"
-        Setpoint item=ISM_HeizungSollwertWarmwasser     icon="temperature"       minValue=40 maxValue=60 step=1
-        Selection item=ISM_HeizungBetriebsartWarmwasser icon="faucet"            mappings=[0="Auto", 1="Legionellen Schutz", 2="Normal", 3="Eco", 4="Frost Schutz"]
-    }
-    Frame label="Lüftung"
-    {    
-        Text item=ISM_LueftungStoerung                  icon="siren"        
-        Selection item=ISM_LueftungBetriebsart          icon="fan"                mappings=[0="Auto", 1="Minimum", 2="Reduziert", 3="Normal", 4="Intensiv"]
-        Text item=ISM_LueftungLueftungsstufe            icon="qualityofservice"
-        Text item=ISM_LueftungFilterwarnung             icon="siren"
-        Text item=ISM_LueftungAblufttemperatur          icon="temperature_hot"
-        Text item=ISM_LueftungZulufttemperatur          icon="temperature_cold"
-        Text item=ISM_LueftungLuftdurchsatzZuluft       icon="flow"
-        Text item=ISM_LueftungLuftdurchsatzAbluft       icon="flow"
-    }
-
-_HVACContrMode.map_
-
-    0=Auto
-    1=Heizen
-    2=Aufwärmen
-    3=Abkühlen
-    4=Nächtliche Reinigung
-    5=Vorkühlen
-    6=Aus
-    7=Test
-    8=Notfall Heizen
-    9=Nur Lüften
-    10=Freies Kühlen
-    11=Eis
-    12=Maximum Heizen
-    13=Eco Heiz-/Kühlmodus
-    14=Entfeuchten
-    15=Kalibriermodus
-    16=Notfall Kühlmodus
-    17=Emergency Dampfmodus
-    20=Reserviert
-    NULL=Undefiniert
+```
+
+### ism8.items
+
+```java
+Switch ISM_HeizungStoerung              "Störung Heizgerät"                      { channel="ism8:device:heater:DpId001" }
+Number ISM_HeizungBetriebsart           "Betriebsart"                            { channel="ism8:device:heater:DpId002" }
+Number ISM_HeizungBrennerleistung       "Brennerleistung [%.1f %%]"              { channel="ism8:device:heater:DpId003" }
+Number ISM_HeizungKesseltemperatur      "Kesseltemperatur [%.1f °C]"             { channel="ism8:device:heater:DpId004" }
+Number ISM_HeizungRuecklauftemperatur   "Rücklauftemperatur [%.1f °C]"           { channel="ism8:device:heater:DpId006" }
+Number ISM_HeizungWarmwassertemperatur  "Warmwassertemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId007" }
+Number ISM_HeizungAussentemperatur      "Außentemperatur [%.1f °C]"              { channel="ism8:device:heater:DpId008" }
+Switch ISM_HeizungStatusFlamme          "Status Flamme"                          { channel="ism8:device:heater:DpId009" }
+Number ISM_HeizungAnlagendruck          "Anlagendruck [%.2f bar]"                { channel="ism8:device:heater:DpId013" }
+Switch ISM_HeizungSysStoerung           "Störung Systemmodul"                    { channel="ism8:device:heater:DpId053" }
+Number ISM_HeizungSysAussentemperatur   "Außentemperatur Systemmodul [%.1f °C]"  { channel="ism8:device:heater:DpId054" }
+Number ISM_HeizungSollwertWarmwasser    "Sollwert Warmwasser [%.1f °C]"          { channel="ism8:device:heater:DpId056" }
+Number ISM_HeizungBetriebsartHeizkreis  "Betriebsart Heizkreis"                  { channel="ism8:device:heater:DpId057" }
+Number ISM_HeizungBetriebsartWarmwasser "Betriebsart Warmwasser"                 { channel="ism8:device:heater:DpId058" }
+Number ISM_HeizungSollwertverschiebung  "Sollwertverschiebung [%.1f °C]"         { channel="ism8:device:heater:DpId065" }
+Switch ISM_LueftungStoerung             "CML Störung"                            { channel="ism8:device:heater:DpId148" }
+Number ISM_LueftungBetriebsart          "CWL Betriebsart"                        { channel="ism8:device:heater:DpId149" }
+Number ISM_LueftungLueftungsstufe       "CWL Lüftungsstufe [%.1f %%]"            { channel="ism8:device:heater:DpId163" }
+Number ISM_LueftungAblufttemperatur     "CWL Ablufttemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId164" }
+Number ISM_LueftungZulufttemperatur     "CWL Zulufttemperatur [%.1f °C]"         { channel="ism8:device:heater:DpId165" }
+Number ISM_LueftungLuftdurchsatzZuluft  "CWL Luftdurchsatz Zuluft [%.1f m³/h]"   { channel="ism8:device:heater:DpId166" }
+Number ISM_LueftungLuftdurchsatzAbluft  "CWL Luftdurchsatz Abluft [%.1f m³/h]"   { channel="ism8:device:heater:DpId167" }
+Switch ISM_LueftungFilterwarnung        "CML Filterwarnung"                      { channel="ism8:device:heater:DpId192" }
+```
+
+### demo.sitemap
+
+```perl
+Frame label="Heizung"
+{    
+    Text item=ISM_HeizungSysStoerung                icon="siren"
+    Text item=ISM_HeizungStoerung                   icon="siren"
+    Text item=ISM_HeizungAussentemperatur           icon="temperature"
+    Text item=ISM_HeizungBetriebsart                icon="radiator"          label="Modus [MAP(HVACContrMode.map):%s]"
+    Text item=ISM_HeizungAnlagendruck               icon="pressure"
+    Text item=ISM_HeizungBrennerleistung            icon="chart"
+    Selection item=ISM_HeizungBetriebsartHeizkreis  icon="radiator"          mappings=[0="Auto", 1="Komfort", 2="Stand By", 3="Eco", 4="Frost Schutz"]
+    Text item=ISM_HeizungStatusFlamme               icon="fire"
+    Text item=ISM_HeizungKesseltemperatur           icon="temperature"
+    Text item=ISM_HeizungRuecklauftemperatur        icon="temperature_cold"
+    Setpoint item=ISM_HeizungSollwertverschiebung   icon="radiator"          minValue=-5 maxValue=5 step=1
+}
+Frame label="Wasser"
+{    
+    Text item=ISM_HeizungWarmwassertemperatur       icon="temperature_hot"
+    Setpoint item=ISM_HeizungSollwertWarmwasser     icon="temperature"       minValue=40 maxValue=60 step=1
+    Selection item=ISM_HeizungBetriebsartWarmwasser icon="faucet"            mappings=[0="Auto", 1="Legionellen Schutz", 2="Normal", 3="Eco", 4="Frost Schutz"]
+}
+Frame label="Lüftung"
+{    
+    Text item=ISM_LueftungStoerung                  icon="siren"        
+    Selection item=ISM_LueftungBetriebsart          icon="fan"                mappings=[0="Auto", 1="Minimum", 2="Reduziert", 3="Normal", 4="Intensiv"]
+    Text item=ISM_LueftungLueftungsstufe            icon="qualityofservice"
+    Text item=ISM_LueftungFilterwarnung             icon="siren"
+    Text item=ISM_LueftungAblufttemperatur          icon="temperature_hot"
+    Text item=ISM_LueftungZulufttemperatur          icon="temperature_cold"
+    Text item=ISM_LueftungLuftdurchsatzZuluft       icon="flow"
+    Text item=ISM_LueftungLuftdurchsatzAbluft       icon="flow"
+}
+```
+
+### HVACContrMode.map
+
+```text
+0=Auto
+1=Heizen
+2=Aufwärmen
+3=Abkühlen
+4=Nächtliche Reinigung
+5=Vorkühlen
+6=Aus
+7=Test
+8=Notfall Heizen
+9=Nur Lüften
+10=Freies Kühlen
+11=Eis
+12=Maximum Heizen
+13=Eco Heiz-/Kühlmodus
+14=Entfeuchten
+15=Kalibriermodus
+16=Notfall Kühlmodus
+17=Emergency Dampfmodus
+20=Reserviert
+NULL=Undefiniert
+```
 
 _Result_
 <img src="doc/Sitemap-Example.png" width="800" height="600">
diff --git a/bundles/org.openhab.binding.jablotron/README.md b/bundles/org.openhab.binding.jablotron/README.md
index 26f699a59c325..3e862230c4009 100644
--- a/bundles/org.openhab.binding.jablotron/README.md
+++ b/bundles/org.openhab.binding.jablotron/README.md
@@ -1,7 +1,7 @@
 # Jablotron Alarm Binding
 
 This is the binding for Jablotron alarms.
-https://www.jablotron.com/en/jablotron-products/alarms/
+<https://www.jablotron.com/en/jablotron-products/alarms/>
 
 ## Supported Things
 
@@ -11,7 +11,7 @@ https://www.jablotron.com/en/jablotron-products/alarms/
 | JA-80   | the OASIS alarm                           |
 | JA-100  | with the thermometer support              |
 | JA-100F | without the thermometer support           |
- 
+
 ## Discovery
 
 This binding supports auto discovery. Just manually add a bridge thing and supply login & password to your Jablonet account.
@@ -60,30 +60,30 @@ Binding itself doesn't require specific configuration.
 
 The state, pgm, thermometer, thermostat, sec and pg channels for the JA-100/JA-100F alarms are dynamically created according to your configuration.
 
-* The sections are represented by String channels (with possible values "set", "unset", "partialSet" for JA-100 and possible values "ARM", "PARTIAL_ARM" and "DISARM" for JA100-F)
+- The sections are represented by String channels (with possible values "set", "unset", "partialSet" for JA-100 and possible values "ARM", "PARTIAL_ARM" and "DISARM" for JA100-F)
 
 ## Full Example
 
 # items file for JA80
 
-```
+```java
 String  HouseAlarm "Alarm [%s]" <alarm>
 String JablotronCode { channel="jablotron:oasis:8c93a5ed:50139:command", autoupdate="false" }
-Switch	ArmSectionA	"Garage arming"	<jablotron>	(Alarm)	{ channel="jablotron:oasis:8c93a5ed:50139:statusA" }
-Switch	ArmSectionAB	"1st floor arming"	<jablotron>	(Alarm)	{ channel="jablotron:oasis:8c93a5ed:50139:statusB" }
-Switch	ArmSectionABC	"2nd floor arming"	<jablotron>	(Alarm)	{ channel="jablotron:oasis:8c93a5ed:50139:statusABC" }
+Switch ArmSectionA "Garage arming" <jablotron> (Alarm) { channel="jablotron:oasis:8c93a5ed:50139:statusA" }
+Switch ArmSectionAB "1st floor arming" <jablotron> (Alarm) { channel="jablotron:oasis:8c93a5ed:50139:statusB" }
+Switch ArmSectionABC "2nd floor arming" <jablotron> (Alarm) { channel="jablotron:oasis:8c93a5ed:50139:statusABC" }
 String LastEvent "Last event code [%s]" <jablotron> { channel="jablotron:oasis:8c93a5ed:50139:lastEvent" }
 String LastEventClass "Last event class [%s]" <jablotron> { channel="jablotron:oasis:8c93a5ed:50139:lastEventClass" }
 String LastEventInvoker "Last event class [%s]" <jablotron> { channel="jablotron:oasis:8c93a5ed:50139:lastEventInvoker" }
 DateTime LastEventTime "Last event [%1$td.%1$tm.%1$tY %1$tR]" <clock> { channel="jablotron:oasis:8c93a5ed:50139:lastEventTime" }
 DateTime LastCheckTime "Last check [%1$td.%1$tm.%1$tY %1$tR]" <clock> { channel="jablotron:oasis:8c93a5ed:50139:lastCheckTime" }
-Switch	ArmControlPGX	"PGX"	<jablotron>	(Alarm)	{ channel="jablotron:oasis:8c93a5ed:50139:statusPGX" }
-Switch	ArmControlPGY	"PGY"	<jablotron>	(Alarm)	{ channel="jablotron:oasis:8c93a5ed:50139:statusPGY" }
+Switch ArmControlPGX "PGX" <jablotron> (Alarm) { channel="jablotron:oasis:8c93a5ed:50139:statusPGX" }
+Switch ArmControlPGY "PGY" <jablotron> (Alarm) { channel="jablotron:oasis:8c93a5ed:50139:statusPGY" }
 ```
 
 # sitemap example for JA80
 
-```
+```java
 Text item=HouseAlarm icon="alarm" {
           Switch item=ArmSectionA
           Switch item=ArmSectionAB
@@ -102,7 +102,7 @@ Text item=HouseAlarm icon="alarm" {
 
 # rule example for JA80
 
-```
+```java
 rule "Alarm"
 when 
   Item ArmSectionA changed or Item ArmSectionAB changed or Item ArmSectionABC changed or 
diff --git a/bundles/org.openhab.binding.jeelink/README.md b/bundles/org.openhab.binding.jeelink/README.md
index 0e6928bb7a432..ab58d4684cffd 100644
--- a/bundles/org.openhab.binding.jeelink/README.md
+++ b/bundles/org.openhab.binding.jeelink/README.md
@@ -10,15 +10,15 @@ Binding should be compatible with JeeLink USB receivers and LaCrosseGateways. It
 
 This binding supports:
 
-*   JeeLink (connected to USB)
-*   JeeLink (connected over TCP)
-*   LaCrosseGateway (connected to USB)
-*   LaCrosseGateway (connected over TCP)
-*   LaCrosse temperature sensors
-*   EC3000 power monitors
-*   Revolt power monitors
-*   PCA301 power monitoring wireless sockets
-*   TX22 temperature & humidity Sensors (including connected TX23 wind and TX26 rain sensors)
+- JeeLink (connected to USB)
+- JeeLink (connected over TCP)
+- LaCrosseGateway (connected to USB)
+- LaCrosseGateway (connected over TCP)
+- LaCrosse temperature sensors
+- EC3000 power monitors
+- Revolt power monitors
+- PCA301 power monitoring wireless sockets
+- TX22 temperature & humidity Sensors (including connected TX23 wind and TX26 rain sensors)
 
 ## Binding configuration
 
@@ -38,7 +38,7 @@ PCA301 sockets are polled every 120 seconds by default. This results in sockets
 
 ## Thing configuration
 
-#### JeeLink / LaCrosseGateway (connected to USB)
+### JeeLink / LaCrosseGateway (connected to USB)
 
 | Parameter     | Item Type | Description                                                                                                                                  |
 |---------------|-----------|----------------------------------------------------------------------------------------------------------------------------------------------|
@@ -48,8 +48,7 @@ PCA301 sockets are polled every 120 seconds by default. This results in sockets
 
 The available init commands depend on the sketch that is running on the USB stick / LaCrosseGateway.
 
-
-#### JeeLink / LaCrosseGateway (connected over TCP)
+### JeeLink / LaCrosseGateway (connected over TCP)
 
 | Parameter     | Item Type | Description                                                                                                                       |
 |---------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------|
@@ -57,8 +56,7 @@ The available init commands depend on the sketch that is running on the USB stic
 | TCP Port      | Number    | The TCP port over which the serial port is made available, or the LaCrosseGateway port (which usually is 81)                      |
 | Init Commands | String    | A semicolon separated list of init commands that will be send to the Jeelink / LaCrosseGateway, e.g. "0a" for disabling the LED   |
 
-
-#### LaCrosse temperature sensors
+### LaCrosse temperature sensors
 
 | Parameter                  | Item Type | Description                                                                                                                                          |
 |----------------------------|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -70,7 +68,7 @@ The available init commands depend on the sketch that is running on the USB stic
 | Upper Temperature Limit    | Decimal   | The highest allowed valid temperature. Higher temperature readings will be ignored                                                                   |
 | Maximum allowed difference | Decimal   | The maximum allowed difference from a value to the previous value (0 disables this check). If the difference is higher, the reading will be ignored. |
 
-#### EC3000 power monitors
+### EC3000 power monitors
 
 | Parameter       | Item Type | Description                                                                                                             |
 |-----------------|-----------|-------------------------------------------------------------------------------------------------------------------------|
@@ -79,7 +77,7 @@ The available init commands depend on the sketch that is running on the USB stic
 | Update Interval | Number    | The update interval in seconds how often value updates are propagated. A value of 0 leads to propagation of every value |
 | Buffer Size     | Number    | The number of readings used for computing the rolling average                                                           |
 
-#### PCA301 power monitoring wireless sockets
+### PCA301 power monitoring wireless sockets
 
 | Parameter         | Item Type    | Description                                                                                                            |
 |-------------------|--------------|------------------------------------------------------------------------------------------------------------------------|
@@ -87,7 +85,7 @@ The available init commands depend on the sketch that is running on the USB stic
 | Sensor Timeout    | Number       | The amount of time in seconds that should result in OFFLINE status when no readings have been received from the sensor |
 | Retry Count       | Number       | The number of times a switch command will be resent to the socket until giving up                                      |
 
-#### Revolt power monitors
+### Revolt power monitors
 
 | Parameter         | Item Type    | Description                                                                                                            |
 |-------------------|--------------|------------------------------------------------------------------------------------------------------------------------|
@@ -96,7 +94,7 @@ The available init commands depend on the sketch that is running on the USB stic
 
 ## Channels
 
-#### LaCrosse temperature sensors
+### LaCrosse temperature sensors
 
 | Channel Type ID | Item Type             | Description                                       |
 |-----------------|-----------------------|---------------------------------------------------|
@@ -105,7 +103,7 @@ The available init commands depend on the sketch that is running on the USB stic
 | batteryNew      | Contact               | Whether the battery is new (CLOSED) or not (OPEN) |
 | batteryLow      | Contact               | Whether the battery is low (CLOSED) or not (OPEN) |
 
-#### TX22 temperature and humidity sensors
+### TX22 temperature and humidity sensors
 
 | Channel Type ID | Item Type             | Description                |
 |-----------------|-----------------------|----------------------------|
@@ -117,7 +115,7 @@ The available init commands depend on the sketch that is running on the USB stic
 | windAngle       | Number:Angle          | Current wind direction     |
 | gustStrength    | Number:Speed          | Gust speed                 |
 
-#### EC3000 power monitors
+### EC3000 power monitors
 
 | Channel Type ID  | Item Type     | Description                               |
 |------------------|---------------|-------------------------------------------|
@@ -128,7 +126,7 @@ The available init commands depend on the sketch that is running on the USB stic
 | sensorTime       | Number:Time   | Total turn on time of power monitor       |
 | resets           | Number        | Number of resets                          |
 
-#### PCA301 power monitoring wireless sockets
+### PCA301 power monitoring wireless sockets
 
 | Channel Type ID         | Item Type     | Description                                          |
 |-------------------------|---------------|------------------------------------------------------|
@@ -136,7 +134,7 @@ The available init commands depend on the sketch that is running on the USB stic
 | currentPower            | Number:Power  | Current power draw                                   |
 | consumptionTotal        | Number:Energy | Total energy consumption                             |
 
-#### Revolt power monitors
+### Revolt power monitors
 
 | Channel Type ID   | Item Type                | Description                               |
 |-------------------|--------------------------|-------------------------------------------|
@@ -149,7 +147,7 @@ The available init commands depend on the sketch that is running on the USB stic
 
 ## Commands
 
-#### PCA301 power monitoring wireless sockets
+### PCA301 power monitoring wireless sockets
 
 | Channel Type ID         | Item Type    | Description                                       |
 |-------------------------|--------------|---------------------------------------------------|
@@ -159,14 +157,14 @@ The available init commands depend on the sketch that is running on the USB stic
 
 A typical thing configuration for PCA301 looks like this:
 
-```
+```java
 Bridge jeelink:jeelinkUsb:pca301 "Jeelink pca301" @ "home" [ serialPort="/dev/ttyUSB0" ]
 Thing jeelink:pca301:1-160-236 "ec3k 1" (jeelink:jeelinkUsb:pca301)  @ "home" [ sensorId="1-160-236"]
 ```
 
 A typical thing configuration for EC3000 looks like this:
 
-```
+```java
 Bridge jeelink:jeelinkUsb:ec3k "Jeelink ec3k" @ "home" [ serialPort="COM4" ]
 Thing jeelink:ec3k:0E3D "ec3k 1" (jeelink:jeelinkUsb:ec3k)  @ "home" [ sensorId="0E3D"]
 Thing jeelink:ec3k:14E7 "ec3k 2" (jeelink:jeelinkUsb:ec3k)  @ "home" [ sensorId="14E7"]
@@ -174,7 +172,7 @@ Thing jeelink:ec3k:14E7 "ec3k 2" (jeelink:jeelinkUsb:ec3k)  @ "home" [ sensorId=
 
 A typical Thing configuration for lacrosse looks like this:
 
-```
+```java
 Bridge jeelink:jeelinkUsb:lacrosse "Jeelink lacrosse" @ "home" [ serialPort="COM6" ]
 Thing jeelink:lacrosse:sensor1 "Jeelink lacrosse 1" (jeelink:jeelinkUsb:lacrosse)  @ "home" [ sensorId="16", minTemp=10, maxTemp=32]
 Thing jeelink:lacrosse:sensor2 "Jeelink lacrosse 2" (jeelink:jeelinkUsb:lacrosse)  @ "home" [ sensorId="18", minTemp=10, maxTemp=32]
@@ -182,14 +180,14 @@ Thing jeelink:lacrosse:sensor2 "Jeelink lacrosse 2" (jeelink:jeelinkUsb:lacrosse
 
 A typical thing configuration for Revolt looks like this:
 
-```
+```java
 Bridge jeelink:jeelinkUsb:revolt "Jeelink revolt" @ "home" [ serialPort="COM4" ]
 Thing jeelink:revolt:4F1B "revolt 1" (jeelink:jeelinkUsb:revolt)  @ "home" [ sensorId="4F1B"]
 ```
 
 A typical item configuration for a LaCrosse temperature sensor looks like this:
 
-```
+```java
 Number:Dimensionless Humidty_LR "Living Room [%.1f %unit%]" <humidity> {channel="jeelink:lacrosse:42:humidity"}
 Number:Temperature Temperature_LR "Living Room [%.1f %unit%]" <temperature> {channel="jeelink:lacrosse:42:temperature"}
 Contact Battery_Low_LR "Battery Low Living Room" {channel="jeelink:lacrosse:42:batteryLow"}
@@ -198,7 +196,7 @@ Contact Battery_New_LR "Battery New Living Room" {channel="jeelink:lacrosse:42:b
 
 A typical item configuration for a PCA301 power monitoring wireless sockets looks like this:
 
-```
+```java
 Switch SocketSwitch {channel="jeelink:pca301:1-160-236:switchingState"}
 Number:Power SocketWattage {channel="jeelink:pca301:1-160-236:currentPower"}
 Number:Energy SocketConsumption {channel="jeelink:pca301:1-160-236:consumptionTotal"}
@@ -206,7 +204,7 @@ Number:Energy SocketConsumption {channel="jeelink:pca301:1-160-236:consumptionTo
 
 A typical item configuration for a TX22 temperature and humidity sensor looks like this:
 
-```
+```java
 Number:Dimensionless Humidity "Outside [%.1f %unit%]" <humidity> {channel="jeelink:tx22:42:humidity"}
 Number:Temperature Temperature "Outside [%.1f %unit%]" <temperature> {channel="jeelink:tx22:42:temperature"}
 Contact Battery_Low_LR "Battery Low Outside" {channel="jeelink:tx22:42:batteryLow"}
@@ -219,7 +217,7 @@ Number:Speed GustStrength "Gust [%.1f %unit%]" {channel="jeelink:tx22:42:gustStr
 
 A typical item configuration for a Revolt power monitor looks like this:
 
-```
+```java
 Number:Power SocketWattage {channel="jeelink:revolt:4F1B:currentPower"}
 Number:Energy SocketConsumption {channel="jeelink:revolt:4F1B:consumptionTotal"}
 Number:Dimensionless POwerFactor {channel="jeelink:revolt:4F1B:powerFactor"}
@@ -227,4 +225,3 @@ Number:ElectricCurrent Current {channel="jeelink:revolt:4F1B:electricCurrent"}
 Number:ElectricPotential Voltage {channel="jeelink:revolt:4F1B:electricPotential"}
 Number:Frequency PowerFrequency {channel="jeelink:revolt:4F1B:powerFrequency"}
 ```
-
diff --git a/bundles/org.openhab.binding.jellyfin/README.md b/bundles/org.openhab.binding.jellyfin/README.md
index 903baf907e21e..a43661f91abb5 100644
--- a/bundles/org.openhab.binding.jellyfin/README.md
+++ b/bundles/org.openhab.binding.jellyfin/README.md
@@ -1,7 +1,7 @@
 # Jellyfin Binding
 
-This is the binding for [Jellyfin](https://jellyfin.org) the volunteer-built media solution that puts you in control of your media. 
-Stream to any device from your own server, with no strings attached. 
+This is the binding for [Jellyfin](https://jellyfin.org) the volunteer-built media solution that puts you in control of your media.
+Stream to any device from your own server, with no strings attached.
 Your media, your server, your way.
 This binding allows connect to Jellyfin clients that supports remote control, it's build on top of the official Jellyfin kotlin sdk.
 Compatible with Jellyfin servers in version 10.8.x.
@@ -15,7 +15,7 @@ Before open an issue please test you are able to correctly control your device f
 
 ## Discovery
 
-Before you are able to discover clients you should have a bridge to the server so until one is online the discovery will only look for servers on your local network. Once one is online the discovery will detect controllable clients connected to that server. 
+Before you are able to discover clients you should have a bridge to the server so until one is online the discovery will only look for servers on your local network. Once one is online the discovery will detect controllable clients connected to that server.
 
 ## Thing Types
 
@@ -29,7 +29,7 @@ Before you are able to discover clients you should have a bridge to the server s
 To allow the server thing to go online you should provide valid credentials for the user that the biding will use to interact with the server api (userId and token configuration properties).
 Please note that the user should be allowed on the Jellyfin server to remote control devices.
 
-In order to assist you with this process the binding expose a simple login form you can access on \<local openHAB server url\>/jellyfin/\<server thing id\> for example http://127.0.0.1:8080/jellyfin/2846b8fb60ad444f9ebd085335e3f6bf.
+In order to assist you with this process the binding expose a simple login form you can access on \<local openHAB server url\>/jellyfin/\<server thing id\> for example `http://127.0.0.1:8080/jellyfin/2846b8fb60ad444f9ebd085335e3f6bf`.
 
 ## Server Thing Configuration
 
@@ -69,6 +69,7 @@ In order to assist you with this process the binding expose a simple login form
 | play-next-by-id            | String | Add to playback queue as next by id, works for series, episodes and movies                                      |
 | play-last-by-id            | String | Add to playback queue as last by id, works for series, episodes and movies                                      |
 | browse-by-id               | String | Browse media by id, works for series, episodes and movies                                                       |
+
 ### Terms search:
 
 The terms search has a default behavior that can be modified sending some predefined prefixes.
@@ -84,32 +85,32 @@ Also, you can target a specific series episode by season and episode numbers pre
 
 ### Example Server (Bridge) - jellyfin.bridge.things
 
-```
+```java
 Bridge jellyfin:server:exampleServerId "Jellyfin Server" [
-	clientActiveWithInSeconds=0,
-	hostname="192.168.1.177",
-	port=8096,
-	refreshSeconds=30,
-	ssl="false"
+ clientActiveWithInSeconds=0,
+ hostname="192.168.1.177",
+ port=8096,
+ refreshSeconds=30,
+ ssl="false"
     token=XXXXX # Optional, read bellow
     userId=XXXXX # Optional, read bellow
 ]
 ```
 
- * token and userId could be retrieved using the login form at http://YOUROPENHABIP:PORT/jellyfin/exampleServerId
+- token and userId could be retrieved using the login form at `http://YOUROPENHABIP:PORT/jellyfin/exampleServerId`
 
 ### Example Client - jellyfin.clients.things
 
-```
+```java
 Thing jellyfin:client:exampleServerId:<JELLYFIN_DEVICE_ID> "Jellyfin Web client" (jellyfin:server:exampleServerId)
 Thing jellyfin:client:exampleServerId:<JELLYFIN_DEVICE_ID> "Jellyfin Android client" (jellyfin:server:exampleServerId)
 ```
 
-* I recommend creating the clients using the discovery. For getting the device ids manually I recommend to use the Jellyfin web interface with the web inspector and look for the request that is launched when you click the cast button (<jellyfin url>/Sessions?ControllableByUserId=XXXXXXXXXXXX). 
+- I recommend creating the clients using the discovery. For getting the device ids manually I recommend to use the Jellyfin web interface with the web inspector and look for the request that is launched when you click the cast button (<jellyfin url>/Sessions?ControllableByUserId=XXXXXXXXXXXX).
 
 ### Example Items - jellyfin.items
 
-```
+```java
 String strJellyfinAndroidSendNotification { channel="jellyfin:client:exampleServerId:<JELLYFIN_DEVICE_ID>:send-notification " }
 Player plJellyfinAndroidMediaControl { channel="jellyfin:client:exampleServerId:<JELLYFIN_DEVICE_ID>:media-control" }
 String strJellyfinAndroidPlayingItemId { channel="jellyfin:client:exampleServerId:<JELLYFIN_DEVICE_ID>:playing-item-id" }
diff --git a/bundles/org.openhab.binding.juicenet/README.md b/bundles/org.openhab.binding.juicenet/README.md
index ad1c3689436f1..0379975822aba 100644
--- a/bundles/org.openhab.binding.juicenet/README.md
+++ b/bundles/org.openhab.binding.juicenet/README.md
@@ -8,7 +8,7 @@ In addition to getting the status of various items from the EV charger, it is al
 This binding supports the following things:
 
 | thing               | type    | description                  |
-|----------           |-------- |------------------------------ | 
+|----------           |-------- |------------------------------ |
 | JuiceNet Account    | Bridge  | This represents the cloud account to interface with the JuiceNet API.  |
 | JuiceBox EV Charger | Device  | This interfaces to a specific JuiceBox EV charger associated with the JuiceNet account. |
 
@@ -18,11 +18,10 @@ This binding should work with multiple JuiceBox EV chargers associated with the
 
 Once a JuiceNet Account bridge has been created, any JuiceBox EV Chargers associated with this account will be discovered.
 
-
 ### Thing Configuration
 
 The configuration required is to create a JuiceNet account thing and fill in the appropriate API token.
-The API token can be found on the Account page at https://home.juice.net/Manage.
+The API token can be found on the Account page at <https://home.juice.net/Manage>.
 
 A JuiceBox EV Charger requires a unitID which can also be found in the device settings at the JuiceNet web page.
 
@@ -66,7 +65,7 @@ A JuiceBox EV Charger requires a unitID which can also be found in the device se
 
 If configuring the binding with manual configuration an example thing file looks like this:
 
-```
+```java
 Bridge juicenet:account:myaccount [ apiToken="xxxx-xxxx-xxxx-xxxx-xxxxx" ] {
     Thing device JamesCharger [ unitID="xxxxxxx" ]
 }
@@ -76,7 +75,7 @@ Bridge juicenet:account:myaccount [ apiToken="xxxx-xxxx-xxxx-xxxx-xxxxx" ] {
 
 An example of an items file is here.
 
-```
+```java
 String                  JuiceNet_Name               "Name"                                                      { channel="juicenet:device:myaccount:JamesCharger:name" }
 String                  JuiceNet_State              "Device State"                                              { channel="juicenet:device:myaccount:JamesCharger:state" }
 String                  JuiceNet_ChargingState      "Charging State"                                            { channel="juicenet:device:myaccount:JamesCharger:chargingState" }
@@ -115,7 +114,7 @@ The following custom widget can be used with this binding.
 
 ![JuiceBox Widget](doc/widget.png)
 
-```
+```yaml
 uid: widget_JuiceBox
 tags: []
 props:
@@ -267,4 +266,3 @@ slots:
             config:
               text: =items[props.prefix + "_CarDescription"].state
 ```
-
diff --git a/bundles/org.openhab.binding.kaleidescape/README.md b/bundles/org.openhab.binding.kaleidescape/README.md
index 8d6f72651365e..88bca36cf787e 100644
--- a/bundles/org.openhab.binding.kaleidescape/README.md
+++ b/bundles/org.openhab.binding.kaleidescape/README.md
@@ -46,17 +46,17 @@ The thing has the following configuration parameters:
 
 Some notes:
 
-* Due to a bug in the control protocol, a Strato C player will be identified as a Premiere 'Player' by the auto discovery process.
-* The only caveat of note about this binding is the updatePeriod configuration parameter.
-* When set to the default of 0, the component only sends running time update messages sporadically (as an example: when the movie chapter changes) while content is playing.
-* In this case, the running time channels will also only sporadically update.
-* When updatePeriod is set to 1 (values greater than 1 are not yet supported by the control protocol), the component sends running time status update messages every second.
-* Be aware that this could cause performance impacts to your openHAB system.
-
-* On Linux, you may get an error stating the serial port cannot be opened when the Kaleidescape binding tries to load.
-* You can get around this by adding the `openhab` user to the `dialout` group like this: `usermod -a -G dialout openhab`.
-* Also on Linux you may have issues with the USB if using two serial USB devices e.g. Kaleidescape and RFXcom.
-* See the [general documentation about serial port configuration](/docs/administration/serial.html) for more on symlinking the USB ports.
+- Due to a bug in the control protocol, a Strato C player will be identified as a Premiere 'Player' by the auto discovery process.
+- The only caveat of note about this binding is the updatePeriod configuration parameter.
+- When set to the default of 0, the component only sends running time update messages sporadically (as an example: when the movie chapter changes) while content is playing.
+- In this case, the running time channels will also only sporadically update.
+- When updatePeriod is set to 1 (values greater than 1 are not yet supported by the control protocol), the component sends running time status update messages every second.
+- Be aware that this could cause performance impacts to your openHAB system.
+
+- On Linux, you may get an error stating the serial port cannot be opened when the Kaleidescape binding tries to load.
+- You can get around this by adding the `openhab` user to the `dialout` group like this: `usermod -a -G dialout openhab`.
+- Also on Linux you may have issues with the USB if using two serial USB devices e.g. Kaleidescape and RFXcom.
+- See the [general documentation about serial port configuration](/docs/administration/serial.html) for more on symlinking the USB ports.
 
 ## Channels
 
@@ -141,16 +141,15 @@ The following channels are available:
 
 kaleidescape.things:
 
-```
+```java
 kaleidescape:player:myzone1 "M500 Living Rm" [ host="192.168.1.10", updatePeriod=0, loadHighlightedDetails=true, loadAlbumDetails=true ]
 kaleidescape:cinemaone:myzone2 "My Cinema One" [ host="192.168.1.11", updatePeriod=0, loadHighlightedDetails=true, loadAlbumDetails=true ]
 kaleidescape:strato:myzone3 "Strato Theater Rm" [ host="192.168.1.12", updatePeriod=0, loadHighlightedDetails=true ]
-
 ```
 
 kaleidescape.items:
 
-```
+```java
 // Virtual switch to send a command, see sitemap and rules below
 Switch z1_GoMovieCovers   "Go to Movie Covers"
 
@@ -230,12 +229,11 @@ String z1_Detail_ColorDescription "Color Description: [%s]" { channel="kaleidesc
 String z1_Detail_Country "Country: [%s]" { channel="kaleidescape:player:myzone1:detail#country" }
 String z1_Detail_AspectRatio "Aspect Ratio: [%s]" { channel="kaleidescape:player:myzone1:detail#aspect_ratio" }
 String z1_Detail_DiscLocation "Disc Location: [%s]" { channel="kaleidescape:player:myzone1:detail#disc_location" }
-
 ```
 
 ksecondsformat.js:
 
-```
+```javascript
 (function(totalSeconds) {
     if (isNaN(totalSeconds)) {
         return '-';
@@ -257,7 +255,7 @@ ksecondsformat.js:
 
 kaleidescape.sitemap:
 
-```
+```perl
 sitemap kaleidescape label="Kaleidescape" {
     Frame label="Zone 1" {
         Image item=z1_Detail_CoverArt
@@ -343,7 +341,7 @@ sitemap kaleidescape label="Kaleidescape" {
 
 kaleidescape.rules:
 
-```
+```java
 var int lightPercent
 val kactions = getActions("kaleidescape","kaleidescape:player:myzone1")
 
diff --git a/bundles/org.openhab.binding.keba/README.md b/bundles/org.openhab.binding.keba/README.md
index 5c30f533b4278..1a7c62bb6658a 100644
--- a/bundles/org.openhab.binding.keba/README.md
+++ b/bundles/org.openhab.binding.keba/README.md
@@ -15,94 +15,93 @@ Optionally, a refresh interval (in seconds) can be defined as parameter `refresh
 
 All devices support the following channels:
 
-| Channel ID         		| Item Type 				| Read-only | Description                                                            	|
-|---------------------------|---------------------------|-----------|---------------------------------------------------------------------------|
-| state              		| Number    				| yes       | current operational state of the wallbox                               	|
-| enabled            		| Switch    				| no        | activation state of the wallbox                                        	|
-| maxpresetcurrent   		| Number:ElectricCurrent   	| no        | maximum current the charging station should deliver to the EV in A      	|
-| maxpresetcurrentrange		| Number:Dimensionless      | no 		| maximum current the charging station should deliver to the EV in %        |
-| power              		| Number:Power             	| yes       | active power delivered by the charging station                         	|
-| wallbox            		| Switch    				| yes       | plug state of wallbox                                                  	|
-| vehicle            		| Switch    				| yes       | plug state of vehicle                                                  	|
-| locked             		| Switch    				| yes       | lock state of plug at vehicle                                          	|
-| I1/2/3             		| Number:ElectricCurrent   	| yes       | current for the given phase                                            	|
-| U1/2/3             		| Number:ElectricPotential 	| yes       | voltage for the given phase                                            	|
-| output             		| Switch    				| no        | state of the X1 relais                                                 	|
-| input              		| Switch    				| yes       | state of the X2 contact                                                	|
-| display           		| String    				| no        | display text on wallbox                                                	|
-| error1             		| String    				| yes       | error code state 1, if in error (see the KeContact FAQ)                	|
-| error2             		| String    				| yes       | error code state 2, if in error (see the KeContact FAQ)                	|
-| maxsystemcurrent   		| Number:ElectricCurrent   	| yes       | maximum current the wallbox can deliver                                	|
-| failsafecurrent    		| Number:ElectricCurrent   	| yes       | maximum current the wallbox can deliver, if network is lost            	|
-| uptime             		| Number:Time  				| yes       | system uptime since the last reset of the wallbox                      	|
-| sessionconsumption 		| Number:Energy    			| yes       | energy delivered in current session                                    	|
-| totalconsumption   		| Number:Energy    			| yes       | total energy delivered since the last reset of the wallbox             	|
-| authreq            		| Switch    				| yes       | authentication required                                                	|
-| authon             		| Switch    				| yes       | authentication enabled                                                 	|
-| sessionrfidtag     		| String    				| yes       | RFID tag used for the last charging session                            	|
-| sessionrfidclass   		| String    				| yes       | RFID tag class used for the last charging session                      	|
-| sessionid          		| Number    				| yes       | session ID of the last charging session                                	|
-| setenergylimit     		| Number:Energy    			| no        | set an energy limit for an already running or the next charging session	|
-| authenticate       		| String    				| no        | authenticate and start a session using RFID tag+RFID class             	|
-| maxpilotcurrent         	| Number:ElectricCurrent	| yes  		| current offered to the vehicle via control pilot signalization         	|
-| maxpilotcurrentdutycyle 	| Number:Dimensionless 		| yes  		| duty cycle of the control pilot signal									|
-
+| Channel ID              | Item Type                | Read-only | Description                                                             |
+| ----------------------- | ------------------------ | --------- | ----------------------------------------------------------------------- |
+| state                   | Number                   | yes       | current operational state of the wallbox                                |
+| enabled                 | Switch                   | no        | activation state of the wallbox                                         |
+| maxpresetcurrent        | Number:ElectricCurrent   | no        | maximum current the charging station should deliver to the EV in A      |
+| maxpresetcurrentrange   | Number:Dimensionless     | no        | maximum current the charging station should deliver to the EV in %      |
+| power                   | Number:Power             | yes       | active power delivered by the charging station                          |
+| wallbox                 | Switch                   | yes       | plug state of wallbox                                                   |
+| vehicle                 | Switch                   | yes       | plug state of vehicle                                                   |
+| locked                  | Switch                   | yes       | lock state of plug at vehicle                                           |
+| I1/2/3                  | Number:ElectricCurrent   | yes       | current for the given phase                                             |
+| U1/2/3                  | Number:ElectricPotential | yes       | voltage for the given phase                                             |
+| output                  | Switch                   | no        | state of the X1 relais                                                  |
+| input                   | Switch                   | yes       | state of the X2 contact                                                 |
+| display                 | String                   | no        | display text on wallbox                                                 |
+| error1                  | String                   | yes       | error code state 1, if in error (see the KeContact FAQ)                 |
+| error2                  | String                   | yes       | error code state 2, if in error (see the KeContact FAQ)                 |
+| maxsystemcurrent        | Number:ElectricCurrent   | yes       | maximum current the wallbox can deliver                                 |
+| failsafecurrent         | Number:ElectricCurrent   | yes       | maximum current the wallbox can deliver, if network is lost             |
+| uptime                  | Number:Time              | yes       | system uptime since the last reset of the wallbox                       |
+| sessionconsumption      | Number:Energy            | yes       | energy delivered in current session                                     |
+| totalconsumption        | Number:Energy            | yes       | total energy delivered since the last reset of the wallbox              |
+| authreq                 | Switch                   | yes       | authentication required                                                 |
+| authon                  | Switch                   | yes       | authentication enabled                                                  |
+| sessionrfidtag          | String                   | yes       | RFID tag used for the last charging session                             |
+| sessionrfidclass        | String                   | yes       | RFID tag class used for the last charging session                       |
+| sessionid               | Number                   | yes       | session ID of the last charging session                                 |
+| setenergylimit          | Number:Energy            | no        | set an energy limit for an already running or the next charging session |
+| authenticate            | String                   | no        | authenticate and start a session using RFID tag+RFID class              |
+| maxpilotcurrent         | Number:ElectricCurrent   | yes       | current offered to the vehicle via control pilot signalization          |
+| maxpilotcurrentdutycyle | Number:Dimensionless     | yes       | duty cycle of the control pilot signal                                  |
 
 ## Example
 
 demo.Things:
 
-```
+```java
 Thing keba:kecontact:1 [ipAddress="192.168.0.64", refreshInterval=30]
 ```
 
 demo.items:
 
-```
-Number:Dimensionless		KebaCurrentRange  		"Maximum supply current [%.1f %%]"			{channel="keba:kecontact:1:maxpresetcurrentrange"} 
-Number:ElectricCurrent  	KebaCurrent  			"Maximum supply current [%.3f A]"			{channel="keba:kecontact:1:maxpresetcurrent"}
-Number:ElectricCurrent  	KebaSystemCurrent  		"Maximum system supply current [%.3f A]"	{channel="keba:kecontact:1:maxsystemcurrent"} 
-Number:ElectricCurrent  	KebaFailSafeCurrent  	"Failsafe supply current [%.3f A]"			{channel="keba:kecontact:1:failsafecurrent"} 
-Number 						KebaState  				"Operating State [%s]"						{channel="keba:kecontact:1:state"}
-Switch 						KebaSwitch  			"Enabled"									{channel="keba:kecontact:1:enabled"}
-Switch 						KebaWallboxPlugged  	"Plugged into wallbox"						{channel="keba:kecontact:1:wallbox"}
-Switch 						KebaVehiclePlugged  	"Plugged into vehicle"						{channel="keba:kecontact:1:vehicle"}
-Switch 						KebaPlugLocked  		"Plug locked"								{channel="keba:kecontact:1:locked"}
-DateTime					KebaUptime 				"Uptime [%s s]"  							{channel="keba:kecontact:1:uptime"}
-Number:ElectricCurrent  	KebaI1  															{channel="keba:kecontact:1:I1"}
-Number:ElectricCurrent  	KebaI2  															{channel="keba:kecontact:1:I2"}
-Number:ElectricCurrent  	KebaI3  															{channel="keba:kecontact:1:I3"}
-Number:ElectricPotential 	KebaU1  															{channel="keba:kecontact:1:U1"}
-Number:ElectricPotential 	KebaU2  															{channel="keba:kecontact:1:U2"}
-Number:ElectricPotential 	KebaU3  															{channel="keba:kecontact:1:U3"}
-Number:Power 				KebaPower  				"Energy during current session [%.1f Wh]"	{channel="keba:kecontact:1:power"}
-Number:Energy 				KebaSessionEnergy  													{channel="keba:kecontact:1:sessionconsumption"}
-Number:Energy 				KebaTotalEnergy  		"Energy during all sessions [%.1f Wh]"		{channel="keba:kecontact:1:totalconsumption"}
-Switch 						KebaInputSwitch  													{channel="keba:kecontact:1:input"}
-Switch 						KebaOutputSwitch  													{channel="keba:kecontact:1:output"}
-Number:Energy 				KebaSetEnergyLimit 		"Set charge energy limit [%.1f Wh]"			{channel="keba:kecontact:1:setenergylimit"}
+```java
+Number:Dimensionless      KebaCurrentRange      "Maximum supply current [%.1f %%]"        {channel="keba:kecontact:1:maxpresetcurrentrange"}
+Number:ElectricCurrent    KebaCurrent           "Maximum supply current [%.3f A]"         {channel="keba:kecontact:1:maxpresetcurrent"}
+Number:ElectricCurrent    KebaSystemCurrent     "Maximum system supply current [%.3f A]"  {channel="keba:kecontact:1:maxsystemcurrent"} 
+Number:ElectricCurrent    KebaFailSafeCurrent   "Failsafe supply current [%.3f A]"        {channel="keba:kecontact:1:failsafecurrent"} 
+Number                    KebaState             "Operating State [%s]"                    {channel="keba:kecontact:1:state"}
+Switch                    KebaSwitch            "Enabled"                                 {channel="keba:kecontact:1:enabled"}
+Switch                    KebaWallboxPlugged    "Plugged into wallbox"                    {channel="keba:kecontact:1:wallbox"}
+Switch                    KebaVehiclePlugged    "Plugged into vehicle"                    {channel="keba:kecontact:1:vehicle"}
+Switch                    KebaPlugLocked        "Plug locked"                             {channel="keba:kecontact:1:locked"}
+DateTime                  KebaUptime            "Uptime [%s s]"                           {channel="keba:kecontact:1:uptime"}
+Number:ElectricCurrent    KebaI1                                                          {channel="keba:kecontact:1:I1"}
+Number:ElectricCurrent    KebaI2                                                          {channel="keba:kecontact:1:I2"}
+Number:ElectricCurrent    KebaI3                                                          {channel="keba:kecontact:1:I3"}
+Number:ElectricPotential  KebaU1                                                          {channel="keba:kecontact:1:U1"}
+Number:ElectricPotential  KebaU2                                                          {channel="keba:kecontact:1:U2"}
+Number:ElectricPotential  KebaU3                                                          {channel="keba:kecontact:1:U3"}
+Number:Power              KebaPower             "Energy during current session [%.1f Wh]" {channel="keba:kecontact:1:power"}
+Number:Energy             KebaSessionEnergy                                               {channel="keba:kecontact:1:sessionconsumption"}
+Number:Energy             KebaTotalEnergy       "Energy during all sessions [%.1f Wh]"    {channel="keba:kecontact:1:totalconsumption"}
+Switch                    KebaInputSwitch                                                 {channel="keba:kecontact:1:input"}
+Switch                    KebaOutputSwitch                                                {channel="keba:kecontact:1:output"}
+Number:Energy             KebaSetEnergyLimit    "Set charge energy limit [%.1f Wh]"       {channel="keba:kecontact:1:setenergylimit"}
 ```
 
 demo.sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu"
 {
-	Text label="Charging Station" {
-		Text 	item=KebaState
-		Text 	item=KebaUptime
-		Switch 	item=KebaSwitch
-		Switch 	item=KebaWallboxPlugged
-		Switch 	item=KebaVehiclePlugged
-		Switch 	item=KebaPlugLocked
-		Slider 	item=KebaCurrentRange
-		Text 	item=KebaCurrent
-		Text 	item=KebaSystemCurrent
-		Text 	item=KebaFailSafeCurrent
-		Text 	item=KebaSessionEnergy
-		Text 	item=KebaTotalEnergy
-		Switch 	item=KebaSetEnergyLimit
-	}
+ Text label="Charging Station" {
+  Text  item=KebaState
+  Text  item=KebaUptime
+  Switch  item=KebaSwitch
+  Switch  item=KebaWallboxPlugged
+  Switch  item=KebaVehiclePlugged
+  Switch  item=KebaPlugLocked
+  Slider  item=KebaCurrentRange
+  Text  item=KebaCurrent
+  Text  item=KebaSystemCurrent
+  Text  item=KebaFailSafeCurrent
+  Text  item=KebaSessionEnergy
+  Text  item=KebaTotalEnergy
+  Switch  item=KebaSetEnergyLimit
+ }
 }
 ```
 
@@ -112,28 +111,32 @@ sitemap demo label="Main Menu"
 
 Enable `DEBUG` or `TRACE` (even more verbose) logging for the logger named:
 
-    org.openhab.binding.keba
+```text
+org.openhab.binding.keba
+```
 
 If everything is working fine, you see the cyclic reception of `report 1`, `2` & `3` from the station. The frequency is according to the `refreshInterval` configuration.
 
 ### UDP Ports used
 
-	Send port = UDP 7090
+```text
+Send port = UDP 7090
+```
 
 The Keba station is the server
 
-	Receive port = UDP 7090
+```text
+Receive port = UDP 7090
+```
 
 This binding is providing the server
 
 UDP port 7090 needs to be available/free on the openHAB server.
 
-
 In order to enable the UDP port 7090 on the Keba station with full functionality, `DIP switch 1.3` must be `ON`.
 With `DIP switch 1.3 OFF` only ident-data can be read (`i` and `report 1`) but not the other reports as well as the commands needed for the write access.
 After setting the DIP switch, you need to `power OFF` and `ON` the station. SW-reset via WebGUI seems not to be sufficient in order to apply the new configuration.
 
-
 The right configuration can be validated as follows:
 
 - WebGUI DSW Settings:
diff --git a/bundles/org.openhab.binding.km200/README.md b/bundles/org.openhab.binding.km200/README.md
index 68c332cc991fb..8290eb80d1d20 100644
--- a/bundles/org.openhab.binding.km200/README.md
+++ b/bundles/org.openhab.binding.km200/README.md
@@ -1,9 +1,9 @@
 # KM200 Binding
 
-The KM200 Binding is communicating with a [Buderus Logamatic web KM200 / KM100 / KM50](https://www.buderus.de/de/produkte/catalogue/alle-produkte/7719_gateway-logamatic-web-km200-km100-km50). 
+The KM200 Binding is communicating with a [Buderus Logamatic web KM200 / KM100 / KM50](https://www.buderus.de/de/produkte/catalogue/alle-produkte/7719_gateway-logamatic-web-km200-km100-km50).
 It is possible to receive and send parameters like string or float values.
 
-**Important**: If the communication is not working and you see in the logfile errors like "illegal key size" then you have to change the [Java Cryptography Extension to the Unlimited Strength Jurisdiction](https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html). 
+**Important**: If the communication is not working and you see in the logfile errors like "illegal key size" then you have to change the [Java Cryptography Extension to the Unlimited Strength Jurisdiction](https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html).
 
 ## Supported Things
 
@@ -35,7 +35,7 @@ This binding discovers KM devices through mDNS in the local network.
 
 ### kmdevice
 
-The *kmdevice* bridge requires the following configuration parameters:
+The _kmdevice_ bridge requires the following configuration parameters:
 
 | Parameter Label           | Parameter ID    | Description                                                                       | Required | Default              | Example                                                          |
 |---------------------------|-----------------|-----------------------------------------------------------------------------------|----------|----------------------|------------------------------------------------------------------|
@@ -58,16 +58,16 @@ This example reads different values of items from a KMXXX Device.
 
 `things/kmxxx.things`:
 
-```xtend
+```java
 Bridge km200:kmdevice:0815 "testKMDevice" @ "Room" [ privateKey= "1234567890abcdef1234567890abcdef", maxnbrrepeats=10.0, readDelay=100, refreshInterval=30, maxNbrRepeats=10, ip4Address="192.168.1.111", refreshinterval=30.0, readdelay=100.0 ] {
-	heatingCircuit 1 "TestHC1"
-	sensor 1 "TestSensors"
+ heatingCircuit 1 "TestHC1"
+ sensor 1 "TestSensors"
 }
 ```
 
 `items/kmxxx.items`:
 
-```xtend
+```java
 Number  budWater  "Water temperature  [%.1f °C]"    {channel="km200:dhwCircuit:0815:1:actualTemp"}
 Number  budOutdoor  "Outdoor temperature  [%.1f °C]"    {channel="km200:sensor:0815:1:outdoor_t1"}
 ```
diff --git a/bundles/org.openhab.binding.knx/README.md b/bundles/org.openhab.binding.knx/README.md
index 7b448f1be71b6..ffd2e146f276f 100644
--- a/bundles/org.openhab.binding.knx/README.md
+++ b/bundles/org.openhab.binding.knx/README.md
@@ -13,7 +13,7 @@ Since the protocol is identical, the KNX binding can also communicate with it tr
 ## Supported Things
 
 The KNX binding supports two types of bridges, and one type of things to access the KNX bus.
-There is an *ip* bridge to connect to KNX IP Gateways, and a *serial* bridge for connection over a serial port to a host-attached gateway.
+There is an _ip_ bridge to connect to KNX IP Gateways, and a _serial_ bridge for connection over a serial port to a host-attached gateway.
 
 ## Binding Configuration
 
@@ -25,7 +25,7 @@ The following two bridge types are supported. Bridges don't have channels on the
 
 ### IP Gateway
 
-The IP Gateway is the most commonly used way to connect to the KNX bus. At its base, the *ip* bridge accepts the following configuration parameters:
+The IP Gateway is the most commonly used way to connect to the KNX bus. At its base, the _ip_ bridge accepts the following configuration parameters:
 
 | Name                | Required     | Description                                                                                                  | Default value                                        |
 |---------------------|--------------|--------------------------------------------------------------------------------------------------------------|------------------------------------------------------|
@@ -44,10 +44,9 @@ The IP Gateway is the most commonly used way to connect to the KNX bus. At its b
 | tunnelUserPassword  | No           | KNX secure: Tunnel user key for secure tunnel mode                                                           | -                                                    |
 | tunnelDeviceAuthentication  | No   | KNX secure: Tunnel device authentication for secure tunnel mode                                              | -                                                    |
 
-
 ### Serial Gateway
 
-The *serial* bridge accepts the following configuration parameters:
+The _serial_ bridge accepts the following configuration parameters:
 
 | Name                | Required | Description                                                                                                  | Default value |
 |---------------------|----------|--------------------------------------------------------------------------------------------------------------|---------------|
@@ -60,13 +59,13 @@ The *serial* bridge accepts the following configuration parameters:
 
 ## Things
 
-### *device* Things
+### _device_ Things
 
-*basic* Things are wrappers around arbitrary group addresses on the KNX bus.
-They have no specific function in the KNX binding, except that if the *address* is defined, the binding will actively poll the Individual Address on the KNX bus to detect that the KNX actuator is reachable.
+_basic_ Things are wrappers around arbitrary group addresses on the KNX bus.
+They have no specific function in the KNX binding, except that if the _address_ is defined, the binding will actively poll the Individual Address on the KNX bus to detect that the KNX actuator is reachable.
 Under normal real-world circumstances, either all devices on a bus are reachable, or the entire bus is down.
 If line couplers are installed, physical device addressing might be filtered; in this case please do not specify the addresses for devices on this line.
-When *fetch* is set to true, the binding will read-out the memory of the KNX actuator in order to detect configuration data and so forth.
+When _fetch_ is set to true, the binding will read-out the memory of the KNX actuator in order to detect configuration data and so forth.
 This is however an experimental feature, very prone to the actual on the KNX bus.
 
 | Name         | Required | Description                                                                                                              | Default value                                                               |
@@ -77,7 +76,7 @@ This is however an experimental feature, very prone to the actual on the KNX bus
 | readInterval | N        | Interval (in seconds) to actively request reading of values from the bus (0 if they should only be read once at startup) | 0                                                                           |
 
 Different kinds of channels are defined and can be used to group together Group Addresses.
-All channels of a device share one configuration parameter defined on device level: *readInterval*, an optional parameter which indicates if 'readable' group addresses of that Channel should be read periodically at the given interval, in seconds.
+All channels of a device share one configuration parameter defined on device level: _readInterval_, an optional parameter which indicates if 'readable' group addresses of that Channel should be read periodically at the given interval, in seconds.
 'Readable' group addresses are marked with an `<` in the group address definition of a Channel, see below.
 All readable group addresses are queried by openHAB during startup.
 If readInterval is not specified or set to 0, no further periodic reading will be triggered (default: 0).
@@ -95,7 +94,6 @@ Note: After changing the DPT of already existing Channels, openHAB needs to be r
 |-----------|-------------------------------------|-------------|
 | ga        | Group address for the binary switch | 1.001       |
 
-
 ##### Channel Type "dimmer"
 
 | Parameter        | Description                            | Default DPT |
@@ -124,7 +122,6 @@ Note: After changing the DPT of already existing Channels, openHAB needs to be r
 |-----------|---------------|-------------|
 | ga        | Group address | 9.001       |
 
-
 Note: Using the Units Of Measurement feature of openHAB (Quantitytype) requires that the DPT value is set correctly.
 Automatic type conversion will be applied if required.
 
@@ -140,7 +137,6 @@ Automatic type conversion will be applied if required.
 |-----------|---------------|-------------|
 | ga        | Group address | 19.001      |
 
-
 #### Control Channel Types
 
 In contrast to the standard channels above, the control channel types are used for cases where the KNX bus does not own the physical state of a device.
@@ -153,7 +149,6 @@ If from the KNX bus a `GroupValueRead` telegram is sent to a *-control Channel,
 |-----------|-------------------------------------|-------------|
 | ga        | Group address for the binary switch | 1.001       |
 
-
 ##### Channel Type "dimmer-control"
 
 | Parameter        | Description                                                                                                                                   | Default DPT |
@@ -197,7 +192,7 @@ If from the KNX bus a `GroupValueRead` telegram is sent to a *-control Channel,
 
 #### Group Address Notation
 
-```
+```text
 <config>="[<dpt>:][<]<mainGA>[[+[<]<listeningGA>][+[<]<listeningGA>..]]"
 ```
 
@@ -211,7 +206,6 @@ Each configuration parameter has a `mainGA` where commands are written to and op
 
 The `dpt` element is optional. If omitted, the corresponding default value will be used (see the channel descriptions above).
 
-
 ## KNX Secure
 
 > NOTE: Support for KNX Secure is partly implemented for openHAB and should be considered as experimental.
@@ -221,12 +215,12 @@ The `dpt` element is optional. If omitted, the corresponding default value will
 KNX IP Secure protects the traffic between openHAB and your KNX installation.
 It **requires a KNX Secure Router or a Secure IP Interface** and a KNX installation **with security features enabled in ETS tool**.
 
-For *Secure routing* mode, the so called `backbone key` needs to be configured in openHAB.
+For _Secure routing_ mode, the so called `backbone key` needs to be configured in openHAB.
 It is created by the ETS tool and cannot be changed via the ETS user interface.
 
 - The backbone key can be extracted from Security report (ETS, Reports, Security, look for a 32-digit key) and specified in parameter `routerBackboneKey`.
 
-For *Secure tunneling* with a Secure IP Interface (or a router in tunneling mode), more parameters are required.
+For _Secure tunneling_ with a Secure IP Interface (or a router in tunneling mode), more parameters are required.
 A unique device authentication key, and a specific tunnel identifier and password need to be available.
 
 - All information can be looked up in ETS and provided separately: `tunnelDeviceAuthentication`, `tunnelUserPassword`.
@@ -240,7 +234,6 @@ Data Secure does _not_ necessarily require a KNX Secure Router or a Secure IP In
 
 > NOTE: **openHAB currently ignores messages with secure group addresses.**
 
-
 ## Examples
 
 The following two templates are sufficient for almost all purposes.
@@ -250,7 +243,7 @@ Only add parameters to the Bridge and Thing configuration if you know exactly wh
 
 knx.things:
 
-```xtend
+```java
 Bridge knx:ip:bridge [
     type="ROUTER",
     autoReconnectPeriod=60 //optional, do not set <30 sec.
@@ -267,7 +260,7 @@ Bridge knx:ip:bridge [
 
 knx.things:
 
-```xtend
+```java
 Bridge knx:ip:bridge [
     type="TUNNEL",
     ipAddress="192.168.0.111",
@@ -283,7 +276,7 @@ Bridge knx:ip:bridge [
 
 ### Full Example
 
-```xtend
+```java
 //TUNNEL
 Bridge knx:ip:bridge [
     type="TUNNEL",
@@ -328,7 +321,7 @@ Bridge knx:ip:bridge [
 
 knx.items:
 
-```xtend
+```java
 Switch        demoSwitch         "Light [%s]"               <light>          { channel="knx:device:bridge:generic:demoSwitch" }
 Dimmer        demoDimmer         "Dimmer [%d %%]"           <light>          { channel="knx:device:bridge:generic:demoDimmer" }
 Rollershutter demoRollershutter  "Shade [%d %%]"            <rollershutter>  { channel="knx:device:bridge:generic:demoRollershutter" }
@@ -340,7 +333,7 @@ DateTime      demoDatetime       "Alarm [%1$tH:%1$tM]"                       { c
 
 knx.sitemap:
 
-```xtend
+```perl
 sitemap knx label="KNX Demo Sitemap" {
   Frame label="Demo Elements" {
     Switch item=demoSwitch
@@ -359,7 +352,7 @@ sitemap knx label="KNX Demo Sitemap" {
 
 control.things:
 
-```xtend
+```java
 Bridge knx:serial:bridge [
     serialPort="/dev/ttyAMA0",
     readingPause=50,
@@ -387,7 +380,7 @@ Bridge hue:bridge:bridge "Philips Hue Bridge" [
 
 knx.items:
 
-```xtend
+```java
 Switch        demoSwitch         "Light [%s]"               <light>          { channel="hue:0210:bridge:1:color", channel="knx:device:bridge:generic:controlSwitch" }
 Dimmer        demoDimmer         "Dimmer [%d %%]"           <light>          { channel="hue:0210:bridge:1:color", channel="knx:device:bridge:generic:controlDimmer" }
 ```
diff --git a/bundles/org.openhab.binding.kodi/README.md b/bundles/org.openhab.binding.kodi/README.md
index 60ce5b4e84ae6..b0036ab2e0165 100644
--- a/bundles/org.openhab.binding.kodi/README.md
+++ b/bundles/org.openhab.binding.kodi/README.md
@@ -13,13 +13,13 @@ The Kodi binding is the successor to the openHAB 1.x xbmc binding.
 In order to allow Kodi to be controlled through this binding, you need to enable the Kodi application remote control feature.
 Please enable "Allow remote control from applications on this/other systems" in the Kodi settings menu under:
 
-*   Settings ➔ Services ➔ Control ➔
-    * Allow remote control from applications on **this** systems
-    * Allow remote control from applications on **other** systems
+- Settings ➔ Services ➔ Control ➔
+  - Allow remote control from applications on **this** systems
+  - Allow remote control from applications on **other** systems
 
 To make use of the auto-discovery feature, you additionally need to enable "Allow control of Kodi via UPnP" in the Kodi settings menu.
 
-*   Settings ➔ Services ➔ UPnP / DLNA ➔ Allow remote control via UPnP
+- Settings ➔ Services ➔ UPnP / DLNA ➔ Allow remote control via UPnP
 
 ## Supported Things
 
@@ -34,7 +34,7 @@ The binding supports auto-discovery for available and prepared (see above) insta
 Auto-discovery is enabled by default.
 To disable it, you can add the following line to `<openHAB-conf>/services/runtime.cfg`:
 
-```
+```text
 discovery.kodi:background=false
 ```
 
@@ -55,7 +55,7 @@ You can use the `notificationVolume` property for setting a default volume (in %
 
 A manual setup through a `things/kodi.things` file could look like this:
 
-```
+```java
 Thing kodi:kodi:myKodi "Kodi" @ "Living Room" [ipAddress="192.168.1.100", port=9090, httpPort=8080]
 ```
 
@@ -83,7 +83,7 @@ The Kodi thing supports the following channels:
 | input                 | String               | Sends a key stroke to Kodi to navigate in the UI. Valid commands are: `Back`, `ContextMenu`, `Down`, `Home`, `Info`, `Left`, `Right`, `Select`, `ShowCodec`, `ShowOSD`, `ShowPlayerProcessInfo` and `Up`. `ExecuteAction` and `SendText` should be used with the dedicated channels `inputaction` and `inputtext`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | inputtext             | String               | Sends a generic input (unicode) text to Kodi.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | inputaction           | String               | Sends a predefined action to Kodi to control the UI and/or perform other tasks. Valid commands are: `left`, `right`, `up`, `down`, `pageup`, `pagedown`, `select`, `highlight`, `parentdir`, `parentfolder`, `back`, `menu`, `previousmenu`, `info`, `pause`, `stop`, `skipnext`, `skipprevious`, `fullscreen`, `aspectratio`, `stepforward`, `stepback`, `bigstepforward`, `bigstepback`, `chapterorbigstepforward`, `chapterorbigstepback`, `osd`, `showsubtitles`, `nextsubtitle`, `cyclesubtitle`, `playerdebug`, `codecinfo`, `playerprocessinfo`, `nextpicture`, `previouspicture`, `zoomout`, `zoomin`, `playlist`, `queue`, `zoomnormal`, `zoomlevel1`, `zoomlevel2`, `zoomlevel3`, `zoomlevel4`, `zoomlevel5`, `zoomlevel6`, `zoomlevel7`, `zoomlevel8`, `zoomlevel9`, `nextcalibration`, `resetcalibration`, `analogmove`, `analogmovex`, `analogmovey`, `rotate`, `rotateccw`, `close`, `subtitledelayminus`, `subtitledelay`, `subtitledelayplus`, `audiodelayminus`, `audiodelay`, `audiodelayplus`, `subtitleshiftup`, `subtitleshiftdown`, `subtitlealign`, `audionextlanguage`, `verticalshiftup`, `verticalshiftdown`, `nextresolution`, `audiotoggledigital`, `number0`, `number1`, `number2`, `number3`, `number4`, `number5`, `number6`, `number7`, `number8`, `number9`, `smallstepback`, `fastforward`, `rewind`, `play`, `playpause`, `switchplayer`, `delete`, `copy`, `move`, `screenshot`, `rename`, `togglewatched`, `scanitem`, `reloadkeymaps`, `volumeup`, `volumedown`, `mute`, `backspace`, `scrollup`, `scrolldown`, `analogfastforward`, `analogrewind`, `moveitemup`, `moveitemdown`, `contextmenu`, `shift`, `symbols`, `cursorleft`, `cursorright`, `showtime`, `analogseekforward`, `analogseekback`, `showpreset`, `nextpreset`, `previouspreset`, `lockpreset`, `randompreset`, `increasevisrating`, `decreasevisrating`, `showvideomenu`, `enter`, `increaserating`, `decreaserating`, `setrating`, `togglefullscreen`, `nextscene`, `previousscene`, `nextletter`, `prevletter`, `jumpsms2`, `jumpsms3`, `jumpsms4`, `jumpsms5`, `jumpsms6`, `jumpsms7`, `jumpsms8`, `jumpsms9`, `filter`, `filterclear`, `filtersms2`, `filtersms3`, `filtersms4`, `filtersms5`, `filtersms6`, `filtersms7`, `filtersms8`, `filtersms9`, `firstpage`, `lastpage`, `guiprofile`, `red`, `green`, `yellow`, `blue`, `increasepar`, `decreasepar`, `volampup`, `volampdown`, `volumeamplification`, `createbookmark`, `createepisodebookmark`, `settingsreset`, `settingslevelchange`, `stereomode`, `nextstereomode`, `previousstereomode`, `togglestereomode`, `stereomodetomono`, `channelup`, `channeldown`, `previouschannelgroup`, `nextchannelgroup`, `playpvr`, `playpvrtv`, `playpvrradio`, `record`, `togglecommskip`, `showtimerrule`, `leftclick`, `rightclick`, `middleclick`, `doubleclick`, `longclick`, `wheelup`, `wheeldown`, `mousedrag`, `mousemove`, `tap`, `longpress`, `pangesture`, `zoomgesture`, `rotategesture`, `swipeleft`, `swiperight`, `swipeup`, `swipedown`, `error`, `noop`. |
-| inputbuttonevent      | String               | Send a button press event. The parameter can have the format "`<button>`", "`<button>;<keymap>`" or "`<button>;<keymap>;<holdtime>`". For details see https://kodi.wiki/view/JSON-RPC_API/v12#Input.ButtonEvent                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| inputbuttonevent      | String               | Send a button press event. The parameter can have the format "`<button>`", "`<button>;<keymap>`" or "`<button>;<keymap>;<holdtime>`". For details see <https://kodi.wiki/view/JSON-RPC_API/v12#Input.ButtonEvent>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | inputrequested        | Switch               | Indicates whether Kodi is currently asking the user for input |
 | screensaver           | Switch               | Current state of the Screensaver |
 | systemcommand         | String               | This channel allows to send system commands to `Shutdown`, `Suspend`, `Hibernate`, `Reboot` or `Quit` Kodi (channel's state options contains available system commands)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
@@ -105,12 +105,12 @@ The Kodi thing supports the following channels:
 | subtitle-enabled      | Switch               | Display/hidden subtitle                                                        |
 | subtitle-index        | Number               | Set or get subtitle index of currently playing media                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | subtitle-language        | String               | Display subtitle language of currently playing media                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| subtitle-name		| String               | Display subtitle title of currently playing media                |
+| subtitle-name  | String               | Display subtitle title of currently playing media                |
 | audio-index           | Number               | Audio stream index of currently playing media                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | audio-codec           | String               | Audio codec of currently playing media **(Advanced)**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | audio-language        | String               | Display language of currently playing audio stream **(Advanced)**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| audio-name		| String               | Display title of currently playing audio stream **(Advanced)**                  |
-| audio-channels		| Number               | Display channels of currently playing audio stream **(Advanced)**                 |
+| audio-name  | String               | Display title of currently playing audio stream **(Advanced)**                  |
+| audio-channels  | Number               | Display channels of currently playing audio stream **(Advanced)**                 |
 | video-codec           | String               | Video codec of currently playing media **(Advanced)**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | video-index           | Number               | Index of currently playing multi stream video **(Advanced)**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 | video-height           | Number               | Height of currently playing video **(Advanced)**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
@@ -125,7 +125,6 @@ The Kodi thing supports the following channels:
 
 Kodi things are extensible by channels of type `shownotification`, so that different notification pop-ups can be configured for different use cases.
 
-
 ### Channel Configuration
 
 **group** The PVR channels can be put into user-defined PVR channel groups.
diff --git a/bundles/org.openhab.binding.konnected/README.md b/bundles/org.openhab.binding.konnected/README.md
index 62c698a13b410..29e420b17c70a 100644
--- a/bundles/org.openhab.binding.konnected/README.md
+++ b/bundles/org.openhab.binding.konnected/README.md
@@ -1,8 +1,8 @@
 # Konnected Binding
 
-This binding is for interacting with a [Konnected Alarm Panel](https://konnected.io/). 
-Konnected Alarm Panels can connect to security sensors directly or interface with existing alarm panels. 
-Konnected is an open-source firmware and software that runs on a NodeMCU. 
+This binding is for interacting with a [Konnected Alarm Panel](https://konnected.io/).
+Konnected Alarm Panels can connect to security sensors directly or interface with existing alarm panels.
+Konnected is an open-source firmware and software that runs on a NodeMCU.
 The Konnected hardware is designed for an alarm panel installation, but the general purpose firmware/software can be run on a generic NodeMCU device.
 
 ## Supported Things
@@ -16,24 +16,23 @@ The binding will then create things for each module discovered which can be adde
 
 ## Thing Configuration
 
-The binding attempts to discover The Konnected Alarm Panels via the UPnP service. 
-The auto-discovery service of the binding will detect the base URL of the Konnected Alarm Panel. 
-When manually adding things, the base URL of the Konnected Alarm Panel will need to be configured. 
-The base URL should include scheme, address and port (for example http://192.168.1.123:9123).
+The binding attempts to discover The Konnected Alarm Panels via the UPnP service.
+The auto-discovery service of the binding will detect the base URL of the Konnected Alarm Panel.
+When manually adding things, the base URL of the Konnected Alarm Panel will need to be configured.
+The base URL should include scheme, address and port (for example `http://192.168.1.123:9123`).
 
 The binding will attempt to obtain the ip address of your openHAB server as configured in the OSGi framework.
 If it is unable to determine the IP address it will also attempt to use the network address service to obtain the IP address and port.
-Auto-discovery of the callback URL will fail if you are using reverse proxies and/or HTTPS for your openHAB server. 
-In this case you will need to configure the callback URL in the advanced configuration section. 
-The callback URL will normally end with /konnected (for example https://192.168.1.2/konnected).
+Auto-discovery of the callback URL will fail if you are using reverse proxies and/or HTTPS for your openHAB server.
+In this case you will need to configure the callback URL in the advanced configuration section.
+The callback URL will normally end with /konnected (for example `https://192.168.1.2/konnected`).
 
 In addition you can also turn off discovery which when this setting is synced to the module will cause the device to no longer respond to UPnP requests as documented.
-https://help.konnected.io/support/solutions/articles/32000023968-disabling-device-discovery
+<https://help.konnected.io/support/solutions/articles/32000023968-disabling-device-discovery>
 Please use this setting with caution and do not disable until a static ip address has been provided for your Konnected Alarm Panel via DHCP, router or otherwise.
 
 The blink setting will disable the transmission LED on the Konnected Alarm Panel.
 
-
 ## Channels
 
 You will need to add channels for the zones that you have connected and configure them with the appropriate configuration parameters for each channel.
@@ -64,7 +63,7 @@ It can also be used to blink lights.
 A note about the Alarm Panel Pro.
 Zones 1-8 can be configured for any Channel-Types.  
 Zones 9-12, out1, alarm1 and out2/alarm2 can only be configured as an actuator.
-For more information, see: https://help.konnected.io/support/solutions/articles/32000028978-alarm-panel-pro-inputs-and-outputs 
+For more information, see: <https://help.konnected.io/support/solutions/articles/32000028978-alarm-panel-pro-inputs-and-outputs>
 
 DSB1820 temperature probes.
 These are one wire devices which can all be Konnected to the same "Zone" on the Konnected Alarm Panel.
@@ -73,26 +72,25 @@ This needs to be added to the channel if there are multiple probes connected.
 The default behavior in absence of this configuration will be to simply log the address of the received event.
 A channel should be added for each probe, as indicated above and configured with the appropriate address.
 
-
 ## Full Example
 
 *.items
 
-```
+```java
 Switch Siren "Siren" {channel="konnected:wifi-module:generic:siren"}
 Switch Back_Door_Sensor "Back Door" {channel="konnected:pro-module:generic:backd"}
 ```
 
 *.sitemap
 
-```
+```perl
 Switch item=Back_Door_Sensor label="Back Door" icon="door" mappings=[OPEN="Open", CLOSED="Closed"]
 Switch item=Siren label="Alarm Siren" icon="Siren" mappings=[ON="Open", OFF="Closed"]
 ```
 
 *.things
 
-```
+```java
 Thing konnected:wifi-module:generic "Konnected Module" [baseUrl="http://192.168.30.153:9586", macAddress="1586517"]{
    Type switch-wifi     : frontd    "Front Door"                        [zone="1"]
    Type actuator-wifi   : siren     "Siren"                             [zone="2", momentary = 50, times = 2, pause = 50]
@@ -109,4 +107,3 @@ Thing konnected:pro-module:generic "Konnected Module" [baseUrl="http://192.168.3
    Type temperature-pro : outhum    "Outside Temperature (DS18B20)" [zone="4", dht22 = false, pollInterval = 1, ds18b20Address = "XX:XX:XX:XX:XX:XX:XX"]
 }
 ```
-
diff --git a/bundles/org.openhab.binding.kostalinverter/README.md b/bundles/org.openhab.binding.kostalinverter/README.md
index c2cabb09aa0a7..cc1d24ff18cb8 100644
--- a/bundles/org.openhab.binding.kostalinverter/README.md
+++ b/bundles/org.openhab.binding.kostalinverter/README.md
@@ -25,22 +25,22 @@ All of these devices contain the same communication board (SCB = **S**mart**C**o
 
 Currently supported things are:
 
-* PIKO IQ 4.2
-* PIKO IQ 5.5
-* PIKO IQ 7.0
-* PIKO IQ 8.5
-* PIKO IQ 10.0
-* PLENTICORE plus 4.2 (with or without battery attached)
-* PLENTICORE plus 5.5 (with or without battery attached)
-* PLENTICORE plus 7.0 (with or without battery attached)
-* PLENTICORE plus 8.5 (with or without battery attached)
-* PLENTICORE plus 10.0 (with or without battery attached)
+- PIKO IQ 4.2
+- PIKO IQ 5.5
+- PIKO IQ 7.0
+- PIKO IQ 8.5
+- PIKO IQ 10.0
+- PLENTICORE plus 4.2 (with or without battery attached)
+- PLENTICORE plus 5.5 (with or without battery attached)
+- PLENTICORE plus 7.0 (with or without battery attached)
+- PLENTICORE plus 8.5 (with or without battery attached)
+- PLENTICORE plus 10.0 (with or without battery attached)
 
 Others may be supported (like future devices using the same SCB or offering the same Web API, branded OEM devices, ...), but they were not tested!
 
-Kostal bindings to third generation devices require Java's strong cryptography to be enabled in order to establish connections. In case you are allowed to use 
-strong cryptography in your country, you can achieve this by modifying the $JAVA_HOME/jre/lib/security/java.security file (find the line *crypto.policy=limited* and set it to *unlimited*). 
-If you're using the official openHAB docker image you may also enable Java's strong cryptography by specifying an environment variable *CRYPTO_POLICY="unlimited"*.
+Kostal bindings to third generation devices require Java's strong cryptography to be enabled in order to establish connections. In case you are allowed to use
+strong cryptography in your country, you can achieve this by modifying the $JAVA_HOME/jre/lib/security/java.security file (find the line _crypto.policy=limited_ and set it to _unlimited_).
+If you're using the official openHAB docker image you may also enable Java's strong cryptography by specifying an environment variable _CRYPTO_POLICY="unlimited"_.
 
 ## Discovery
 
@@ -50,27 +50,27 @@ None
 
 ### First generation devices (PIKO)
 
--   acPower
--   totalEnergy
--   dayEnergy
--   status
--   str1Voltage
--   str1Current
--   str2Voltage
--   str2Current
--   l1Voltage
--   l1Power
--   l2Voltage
--   l2Power
--   l3Voltage
--   l3Power
+- acPower
+- totalEnergy
+- dayEnergy
+- status
+- str1Voltage
+- str1Current
+- str2Voltage
+- str2Current
+- l1Voltage
+- l1Power
+- l2Voltage
+- l2Power
+- l3Voltage
+- l3Power
 
 ### Second generation devices (PIKO 10-20, PIKO NEW GENERATION)
 
 | Channel Type ID                          | Item Type                | Description                                                                      | Read Write |
-|------------------------------------------|--------------------------|----------------------------------------------------------------------------------|:----------:|    
-| device-local-grid-output-power           | Number:Power             | Current output power to the grid                                                 |     R      |              
-| statistic-yield-day-second-gen           | Number:Energy            | Total produced power today                                                       |     R      |                
+|------------------------------------------|--------------------------|----------------------------------------------------------------------------------|:----------:|
+| device-local-grid-output-power           | Number:Power             | Current output power to the grid                                                 |     R      |
+| statistic-yield-day-second-gen           | Number:Energy            | Total produced power today                                                       |     R      |
 | statistic-yield-total-second-gen         | Number:Energy            | Total produced power                                                             |     R      |
 | device-local-operating-status            | Number:Dimensionless     | Current operating status, 0 = Standby, 3 = WO-IDLE                               |     R      |
 | device-local-grid-voltage-l1             | Number:ElectricPotential | Current output voltage to the grid, L1                                           |     R      |
@@ -109,10 +109,10 @@ None
 | statistic-operating-time-total           | Number:Time              | Total operating time                                                             |     R      |
 | device-local-current                     | Number:ElectricCurrent   | Current                                                                          |     R      |
 | device-local-current-dir                 | Number:Dimensionless     | Current direction of loading/unloading the battery                               |     R      |
-| device-local-charge-cycles               | Number:Dimensionless     | Total number of charge cycles                                                    |     R      |       
+| device-local-charge-cycles               | Number:Dimensionless     | Total number of charge cycles                                                    |     R      |
 | device-local-battery-temperature         | Number:Temperature       | Battery current temperature                                                      |     R      |
 | device-local-loginterval                 | Number:Time              | Value for loginterval                                                            |     R      |
-| device-local-s0-inpulse-cnt              | Number:Dimensionless     | S0-pulse counter                                                                 |     R      | 
+| device-local-s0-inpulse-cnt              | Number:Dimensionless     | S0-pulse counter                                                                 |     R      |
 | statistic-own-cons-rate-total            | Number:Dimensionless     | Total own comsumption rate                                                       |     R      |
 | statistic-autonomy-degree-total          | Number:Dimensionless     | Total autonomy degree                                                            |     R      |
 | device-local-battery-voltage             | Number:ElectricPotential | Battery current voltage                                                          |     R      |
@@ -126,9 +126,9 @@ None
 The following Channels are writeable
 
 | Channel Type ID                          | Item Type                | Description                                                                      | Read Write |
-|------------------------------------------|--------------------------|----------------------------------------------------------------------------------|:----------:|    
+|------------------------------------------|--------------------------|----------------------------------------------------------------------------------|:----------:|
 | device-local-battery-usage-consumption-set| String                  | Battery usage consumption level for power-consumption from battery, value = 100 (W)                                                                                                                                                         |     W      |
-| device-local-battery-usage-strategy-set  | String                   | Battery usage strategy, Value = 1 = Automatic, Value = 2 = Automatic economical  |     W      |             
+| device-local-battery-usage-strategy-set  | String                   | Battery usage strategy, Value = 1 = Automatic, Value = 2 = Automatic economical  |     W      |
 | device-local-smart-battery-control-set   | Switch                   | Smart battery control, Value = OFF / ON                                          |     W      |
 | device-local-battery-charge-time-from-set| String                   | Battery charge time from, Value = 00:00                                          |     W      |
 | device-local-battery-charge-time-to-set  | String                   | Battery charge time to, Value = 23:59                                            |     W      |
@@ -136,7 +136,6 @@ The following Channels are writeable
 | device-local-shadow-management-set       | String                   | Shadow management, Value = 0 = No shadow management enabled, Value = 1 = Shadow management enabled for DC-Input String 1, Value = 2 = Shadow  management enabled for DC-Input String 2,  Value = 3 = Shadow management enabled for DC-Input String 1 and 2               |     W      |
 | device-local-external-module-control-set | String                   | External module control, Value = 0 = Not Activated, Value = 1 = Activated                                        |     W      |
 
-
 ### Third generation devices (PIKO IQ / PLENTICORE plus)
 
 | Channel Type ID                          | Item Type                | Description                                                                      | Read Write |
@@ -218,7 +217,7 @@ The following Channels are writeable
 
 demo.things
 
-```
+```java
 Thing kostalinverter:kostalinverter:inverter [ url="http://192.168.0.128" ]
 ```
 
@@ -226,7 +225,6 @@ If the thing goes online then the connection to the web interface is successful.
 In case it is offline you should see an error message.
 You optionally can define a `userName` and a `password` parameter if the access to the webinterface is protected and a desired `refreshInterval` (the time interval between updates, default 60 seconds).
 
-
 ### Second generation devices (PIKO 10-20, PIKO NEW GENERATION)
 
 Second generation inverters require 4 mandatory parameters and 1 optional (hasBattery):
@@ -237,20 +235,16 @@ Second generation inverters require 4 mandatory parameters and 1 optional (hasBa
 | username                 | Username for your inverter                             | Text    | ---     | ---           | myUsername    |
 | password                 | Password for your inverter                             | Text    | ---     | ---           | myPassword    |
 | refreshInterval          | Pollingintervall of your inverter                      | Integer | Seconds | 60            | 60            |
-| hasBattery               | Type of PIKO 10-20 inverter, with or without battery   | boolean | ---     | --            | false/true    |   
+| hasBattery               | Type of PIKO 10-20 inverter, with or without battery   | boolean | ---     | --            | false/true    |
 
 demo.things
 
-```
-
+```java
 Thing kostalinverter:piko1020:mypiko1020 [ url="http://'inverter-ip'", username="'myUsername'", password="'myPassword'", refreshInterval=60, hasBattery=false]
-
 ```
 
 You can define which type of PIKO10-20 inverter you will connect to with parameter hasBattery.
 
-
-
 ### Third generation devices (PIKO IQ / PLENTICORE plus)
 
 All third generation inverters require to define 3 mandatory configuration parameters:
@@ -268,7 +262,7 @@ It is recommended to use an interval of 30 seconds.
 
 Full sample of thing configuration:
 
-```
+```java
 Thing kostalinverter:PLENTICOREPLUS100WITHBATTERY:MyPlentiCore100WithBattery [ url = "192.168.1.2", userPassword="myPassword", refreshInternalInSeconds="30"]
 ```
 
@@ -278,19 +272,18 @@ Thing kostalinverter:PLENTICOREPLUS100WITHBATTERY:MyPlentiCore100WithBattery [ u
 
 demo.items:
 
-```
+```java
 Number:Power SolarPower "Solar power [%.1f %unit%]" <energy> { channel="kostalinverter:kostalinverter:inverter:acPower" }
 Number:Energy SolarEnergyDay "Solar day energy [%.3f %unit%]" <energy> { channel="kostalinverter:kostalinverter:inverter:dayEnergy" }
 Number:Energy SolarTotalEnergy "Solar total energy [%.3f %unit%]" <energy> { channel="kostalinverter:kostalinverter:inverter:totalEnergy" }
 String SolarStatus "Solar status [%s]" <energy> { channel="kostalinverter:kostalinverter:inverter:status" }
 ```
 
-
 ### Second generation devices (PIKO NEW GENERATION)
 
 demo.items:
 
-```
+```java
 Number:Power                GridOutputPower             "Grid Output Power"                         <energy> { channel="kostalinverter:piko1020:mypiko1020:gridOutputPower" }
 Number:Energy               YieldDaySecondGen           "PV Output Power Day"                       <energy> { channel="kostalinverter:piko1020:mypiko1020:yieldDaySecondGen" }
 Number:Energy               YieldTotalSecondGen         "PV Output Power Total"                     <energy> { channel="kostalinverter:piko1020:mypiko1020:yieldTotalSecondgen" }  
@@ -353,8 +346,7 @@ Number:Dimensionless        ExternalModuleControl       "External Module Control
 
 demo.items:
 
-```
-
+```java
 Number:Energy                MyPlentiCore100WithBattery_DEVICE_LOCAL_DC_POWER                         <energy> { channel="kostalinverter:PLENTICOREPLUS100WITHBATTERY:MyPlentiCore100WithBattery:deviceLocalDCPower"}
 Number:Energy                MyPlentiCore100WithBattery_DEVICE_LOCAL_HOMECONSUMPTION_FROM_BATTERY     <energy> { channel="kostalinverter:PLENTICOREPLUS100WITHBATTERY:MyPlentiCore100WithBattery:deviceLocalHomeconsumptionFromBattery"}
 Number:Energy                MyPlentiCore100WithBattery_DEVICE_LOCAL_HOMECONSUMPTION_FROM_GRID        <energy> { channel="kostalinverter:PLENTICOREPLUS100WITHBATTERY:MyPlentiCore100WithBattery:deviceLocalHomeconsumptionFromGrid"}
@@ -425,15 +417,12 @@ Number:Energy                MyPlentiCore100WithBattery_STATISTIC_YIELD_YEAR
 
 ```
 
-
 ### Rules
 
 Second generation devices (PIKO 10-20, PIKO NEW GENERATION)
-
-```
-
 Ex. Set Smart battery control OFF with cron trigger:
 
+```yaml
 triggers:
    id: "1"
     configuration:
@@ -447,5 +436,4 @@ actions:
       type: application/vnd.openhab.dsl.rule
       script: KOSTALPIKO1020_SmartBatteryControlSet.sendCommand("OFF")
     type: script.ScriptAction
-    
-
+```
diff --git a/bundles/org.openhab.binding.kvv/README.md b/bundles/org.openhab.binding.kvv/README.md
index 612d0528573fe..c34ae2c8c8cb4 100644
--- a/bundles/org.openhab.binding.kvv/README.md
+++ b/bundles/org.openhab.binding.kvv/README.md
@@ -15,7 +15,7 @@ Since every stop is represented by a KVV-provided id, this id has to be figured
 
 ### Example Call for Stop 'Gottesauer Platz/BGV'
 
-```bash
+```shell
 export QUERY="gottesauer"
 curl https://www.kvv.de/tunnelEfaDirect.php?action=XSLT_STOPFINDER_REQUEST&name_sf=${QUERY}&outputFormat=JSON&type_sf=any
 ```
diff --git a/bundles/org.openhab.binding.lametrictime/README.md b/bundles/org.openhab.binding.lametrictime/README.md
index c05bea7a2bb5d..4fe8fb4434dac 100644
--- a/bundles/org.openhab.binding.lametrictime/README.md
+++ b/bundles/org.openhab.binding.lametrictime/README.md
@@ -2,13 +2,13 @@
 
 The LaMetric binding allows to connect openHAB to LaMetric Time connected clock devices, providing following features:
 
-* Control the LaMetric Time Device
-    * Control Display Brightness
-    * Change Audio Volume
-    * Enable / Disable Bluetooth
-    * Activate an Application
-* Send notifications messages
-* Control the core (built-in) apps
+- Control the LaMetric Time Device
+  - Control Display Brightness
+  - Change Audio Volume
+  - Enable / Disable Bluetooth
+  - Activate an Application
+- Send notifications messages
+- Control the core (built-in) apps
 
 ## Supported Things
 
@@ -59,7 +59,7 @@ For example, if you duplicated the weather app for two locations, the app would
 
 ### Sample Thing Configuration
 
-```
+```java
 Bridge lametrictime:device:demo [ host="somehost", apiKey="ksfjsdkfsksjfs" ]
 {
     Thing clockApp     clock       [ widgetId="generatedcorewidgetid1" ]
@@ -135,23 +135,23 @@ The binding provides three simple notification channels for info messages (chann
 
 To post messages to these channels, simply map them to a String item, e.g. like this:
 
-```
+```java
 String DeviceNotifyInfo "Info Message" {channel="lametrictime:device:demo:info"}
 ```
 
-By setting a text on the item, the binding will send the notification which is then shown on the LaMetric device. 
+By setting a text on the item, the binding will send the notification which is then shown on the LaMetric device.
 
 In a rule this can be done the following way:
 
-``` 
+```java
 DeviceNotifyInfo.sendCommand("My Information Message to be displayed")
 ```
 
 ## Items
- 
+
 Sample item configuration:
- 
-```
+
+```java
 Dimmer DeviceBrightness         "Brightness"                                { channel="lametrictime:device:demo:brightness" }
 String DeviceBrightnessMode     "Brightness Mode"                           { channel="lametrictime:device:demo:brightnessMode" }
 Dimmer DeviceVolume             "Volume"                                    { channel="lametrictime:device:demo:volume" }
@@ -187,7 +187,7 @@ Sample sitemap configuration:
 **Note:** Populating switch or selection options automatically from the state description is not currently possible with sitemaps.
 For this reason, the brightness modes and example applications are repeated here.
 
-```
+```perl
   Text label="LaMetric Time Demo" {
       Frame label="Device Controls" {
           Slider item=DeviceBrightness
@@ -225,7 +225,7 @@ For this reason, the brightness modes and example applications are repeated here
 
 Sample rules:
 
-```
+```java
 import java.util.Calendar
 
 rule "Notify Info"
diff --git a/bundles/org.openhab.binding.lcn/README.md b/bundles/org.openhab.binding.lcn/README.md
index 03534af0de4fe..3ee307a599d4e 100644
--- a/bundles/org.openhab.binding.lcn/README.md
+++ b/bundles/org.openhab.binding.lcn/README.md
@@ -21,7 +21,7 @@ This binding uses TCP/IP to access the LCN bus via the software LCN-PCHK (Window
 
 ### Thing: LCN Module
 
-Any LCN module that should be controlled or visualized, need to be added to openHAB as a *Thing*.
+Any LCN module that should be controlled or visualized, need to be added to openHAB as a _Thing_.
 
 LCN modules with firmware versions 120612 (2008), 170602 (2013) and 1F080A (2021) were tested with this binding.
 Modules with older and newer firmware should work, too.
@@ -40,9 +40,9 @@ See [Discover LCN Modules](#discover-lcn-modules).
 ### Bridge: LCN PCK Gateway
 
 PCK is the protocol spoken over TCP/IP with a PCK gateway to communicate with the LCN bus.
-Examples for PCK gateways are the *LCN-PCHK* software running on Windows or Linux and the DIN rail mounting device *LCN-VISU*.
+Examples for PCK gateways are the _LCN-PCHK_ software running on Windows or Linux and the DIN rail mounting device _LCN-VISU_.
 
-For each LCN bus, interfaced to openHAB, a PCK gateway needs to be added to openHAB as a *Thing*.
+For each LCN bus, interfaced to openHAB, a PCK gateway needs to be added to openHAB as a _Thing_.
 
 Several PCK gateways can be added to openHAB to control multiple LCN busses in distinct locations.
 
@@ -72,12 +72,12 @@ Please see the following LCN-PRO screenshot to determine the dimmer output resol
 
 ### Thing: LCN Group
 
-LCN modules can be assigned to groups with the programming software *LCN-PRO*.
+LCN modules can be assigned to groups with the programming software _LCN-PRO_.
 
-To send commands to an LCN group, the group needs to be added to openHAB as a *Thing*.
+To send commands to an LCN group, the group needs to be added to openHAB as a _Thing_.
 
 One LCN module within the group is used to represent the status of the whole group.
-For example, when a Dimmer Output is controlled via a LCN group *Thing*, openHAB will always visualize the state of the Dimmer Output of the chosen module. The states of the other modules in the group are ignored for visualization.
+For example, when a Dimmer Output is controlled via a LCN group _Thing_, openHAB will always visualize the state of the Dimmer Output of the chosen module. The states of the other modules in the group are ignored for visualization.
 
 Thing Type ID: `group`
 
@@ -87,7 +87,7 @@ Thing Type ID: `group`
 | `moduleId`  | The module ID of any module in the group. The state of this module is used for visualization of the group as representative for all modules. | Integer | Yes      |
 | `segmentId` | The segment ID of all modules in this group (0 if no segments are present)                                                                   | Integer | Yes      |
 
-The `groupId` must match the previously configured group number in the programming software *LCN-PRO*.
+The `groupId` must match the previously configured group number in the programming software _LCN-PRO_.
 
 ## Discovery
 
@@ -97,7 +97,7 @@ Basic data like the names of all LCN modules in the bus, can be read out by open
 
 If not all LCN modules get listed on the first run, click on the refresh button to start another scan.
 
-When adding a module by discovery, the new *Thing*'s UID will be a combination of segment and module id using the following format:
+When adding a module by discovery, the new _Thing_'s UID will be a combination of segment and module id using the following format:
 `S<segmentId>M<moduleId>` where `segmentId` and `moduleId` are formatted as three-digit numbers with leading zeros.
 
 ### Discover PCK Gateways
@@ -106,8 +106,8 @@ PCK gateways in the LAN can be found automatically by openHAB. This is done by U
 The discovery works only if the firewall of the PCK gateway is not configured too strictly.
 This means on Windows PCs, that the network must be configured as 'private' and not as 'public'.
 Also, some network switches may block multicast packets.
-Unfortunately, *LCN-PCHK* listens only on the first network interface of the computer for discovery packets.
-If your PCK gateway has multiple network interfaces, *LCN-PCHK* may listen on the wrong interface and fails to respond to the discovery request.
+Unfortunately, _LCN-PCHK_ listens only on the first network interface of the computer for discovery packets.
+If your PCK gateway has multiple network interfaces, _LCN-PCHK_ may listen on the wrong interface and fails to respond to the discovery request.
 
 Discovery has successfully been tested with LCN-PCHK 3.2.2 running on a Raspberry Pi with Raspbian and openHAB running on Windows 10.
 
@@ -116,12 +116,12 @@ If discovery fails, you can add a PCK gateway manually. See [Thing: PCK Gateway]
 Please be aware that you **have to configure** username, password and the dimmer output resolution also if you use discovery.
 See [Thing: PCK Gateway](#bridge-lcn-pck-gateway).
 
-When adding a PCK gateway by discovery, the new *Thing*'s UID is the MAC address of the device, running the PCK gateway.
+When adding a PCK gateway by discovery, the new _Thing_'s UID is the MAC address of the device, running the PCK gateway.
 
 ## Supported LCN Features and openHAB Channels
 
 The following table lists all features of LCN and their mappings to openHAB Channels.
-These Channels are available for the *Thing* LCN module (`module`).
+These Channels are available for the _Thing_ LCN module (`module`).
 LCN group (`group`) has the same Channels, except status-only Channels like binary sensors or transponders.
 The PCK gateway (`pckGateway`) has no Channels.
 
@@ -162,7 +162,7 @@ If a special command is needed, the [Hit Key](#hit-key) action (German: "Sende T
 | Remote Control                  | Fernbedienung                    | code#remotecontrolkey  |      | Trigger                        | Receive commands from remote control                                                                                          |
 | Access Control                  | Zutrittskontrolle                | code#remotecontrolcode |      | Trigger                        | Receive serial numbers from remote control                                                                                    |
 | Remote Control Battery Low      | Fernbedienung Batterie schwach   | code#remotecontrolbatterylow | | Trigger                       | Triggered when the sending remote control has a low battery                                                                   |
-| Host Command (Send Keys)        | Kommando an Host (Sende Tasten)  | hostcommand#sendKeys   | -    | Trigger                        | Receive *send keys* command from LCN module                                                                                   |
+| Host Command (Send Keys)        | Kommando an Host (Sende Tasten)  | hostcommand#sendKeys   | -    | Trigger                        | Receive _send keys_ command from LCN module                                                                                   |
 | Operating Hours Counter Outputs             | Betriebsstundenzähler Ausgänge                | operatinghourscounter | output[1-4]             | Number:Time | Visualize Operating Hours Counter for outputs                                                         |
 | Operating Hours Counter Outputs (rel. Work) | Betriebsstundenzähler Ausgänge (rel. Arbeit)  | operatinghourscounter | outputrelativework[1-4] | Number:Time | Visualize Operating Hours Counter for outputs (relative work)                                         |
 | Operating Hours Counter Relays              | Betriebsstundenzähler Relais                  | operatinghourscounter | relay[1-8]              | Number:Time | Visualize Operating Hours Counter for relays                                                          |
@@ -194,9 +194,9 @@ If a special command is needed, the [Hit Key](#hit-key) action (German: "Sende T
 | Set S0 Counters                 | S0-Zähler setzen                 | -                      | -    | -                              | Not implemented                                                                                                               |
 | Status Command                  | Statuskommandos                  | -                      | -    | -                              | Not implemented                                                                                                               |
 
-*Notes:*
+_Notes:_
 
-- **For some *Channel*s (e.g. temperature) a unit should be configured in the channel configuration.** By default the native LCN value is used.
+- **For some _Channel_s (e.g. temperature) a unit should be configured in the channel configuration.** By default the native LCN value is used.
 - S0 counter Channels need to be the pulses per kWh configured. If the value is left blank, a default value of 1000 pulses/kWh is set.
 - When setting a variable via openHAB, the variable must be configured as counter in LCN-PRO. The variable must be set initially by the module after power up.
 - The Rollershutter Channels provide the boolean parameter `invertUpDown`, which can be set to 'true' if the Up/Down wires are interchanged.
@@ -205,11 +205,11 @@ If a special command is needed, the [Hit Key](#hit-key) action (German: "Sende T
 ### Transponder/Fingerprints
 
 LCN transponder readers or fingerprint readers can be integrated in openHAB e.g. for access control.
-The transponder function must be enabled in the module's I-port properties within *LCN-PRO*.
+The transponder function must be enabled in the module's I-port properties within _LCN-PRO_.
 
 Example: When the transponder card with the ID "12ABCD" is seen by the reader connected to LCN module "S000M011", the item "M10_Relay7" is switched on:
 
-```
+```java
 rule "My Transponder"
 when
     Channel "lcn:module:b827ebfea4bb:S000M011:code#transponder" triggered "12ABCD"
@@ -220,7 +220,7 @@ end
 
 Example: When fingerprint with ID "AFFE12" is seen by reader connected to LCN module "S000M011", the item "M10_Relay7" is switched on:
 
-```
+```java
 rule "My Fingerprint"
 when
     Channel "lcn:module:b827ebfea4bb:S000M011:code#fingerprint" triggered "AFFE12"
@@ -233,18 +233,18 @@ end
 
 LCN modules can send commands to openHAB, e.g. by pressing a physical LCN key.
 The command must be programmed into the LCN module by the programming software LCN-PRO.
-Only the *send keys* command (German: "Sende Tasten") is supported.
+Only the _send keys_ command (German: "Sende Tasten") is supported.
 
 Program a command to a key of an LCN module via LCN-PRO.
 When LCN-PRO asks you for the target address, don't select any module, but manually enter the PCK host ID, configured within PCHK (default: 4).
-Select the *send keys* command and "A-C (former command)", as PCHK 3.2.2 only supports the old command.
+Select the _send keys_ command and "A-C (former command)", as PCHK 3.2.2 only supports the old command.
 Then, select any key(s) you want to send to openHAB. These can be freely chosen, as they are only evaluated by openHAB.
 
 ![Screenshot, showing the send keys command](doc/host_command_send_keys.png)
 
 The following rule can be used to trigger any action:
 
-```
+```java
 rule "Module 12 sent A1 Hit"
 when
     Channel "lcn:module:b827ebfea4bb:S000M012:hostcommand#sendKeys" triggered "A1:HIT"
@@ -253,7 +253,7 @@ then
 end
 ```
 
-`A1` is the key of the *send keys* command, programmed by LCN-PRO.
+`A1` is the key of the _send keys_ command, programmed by LCN-PRO.
 After the colon, the LCN "hit type" follows: HIT, MAKE or BREAK (German: kurz, lang, los)
 
 If multiple keys or key tables are programmed in a single "send keys" command, multiple triggers will be executed.
@@ -264,15 +264,15 @@ Simply press the physical button at the module for testing.
 
 ### Remote Control
 
-To evaluate commands from LCN remote controls (e.g. LCN-RT or LCN-RT16), the module's I-port behavior must be configured as "IR access control" within *LCN-PRO*:
+To evaluate commands from LCN remote controls (e.g. LCN-RT or LCN-RT16), the module's I-port behavior must be configured as "IR access control" within _LCN-PRO_:
 
 ![Screenshot, showing the I-port properties for remote controls](doc/ir.png)
 
 #### Remote Control Keys
 
-The trigger *Channel* `lcn:module:<pckThing>:<moduleThing>:code#remotecontrolkey` can be used to execute commands, when a specific key on a remote control is pressed:
+The trigger _Channel_ `lcn:module:<pckThing>:<moduleThing>:code#remotecontrolkey` can be used to execute commands, when a specific key on a remote control is pressed:
 
-```
+```java
 rule "Remote Control Key 3 on Layer 1 hit"
 when
     Channel "lcn:module:b827ebfea4bb:S000M012:code#remotecontrolkey" triggered "A3:HIT"
@@ -287,7 +287,7 @@ end
 
 The serial number of a remote control can be used for access control via the channel `lcn:module:<pckThing>:<moduleThing>:code#remotecontrolcode`. See the following example:
 
-```
+```java
 rule "Remote Control Key 3 on Layer 1 hit (only executed for serial number AB1234)"
 when
     Channel "lcn:module:b827ebfea4bb:S000M012:code#remotecontrolcode" triggered "AB1234:A3:HIT" or
@@ -301,24 +301,24 @@ The command will be executed when the remote control button A3 is either pressed
 
 ## Dimmer Outputs with Ramp and Multiple Outputs
 
-The *output* profile can be used to control multiple dimmer outputs of the *same* module simultaneously or control a dimmer output with a ramp (slowly dimming).
+The _output_ profile can be used to control multiple dimmer outputs of the _same_ module simultaneously or control a dimmer output with a ramp (slowly dimming).
 
-The optional *ramp* parameter must be float or integer.
+The optional _ramp_ parameter must be float or integer.
 The lowest value is 0.25, which corresponds to 0.25s. The highest value is 486s.
-When no *ramp* parameter is specified or no profile is configured, the ramp is 0 (behavior like a switch).
-The ramp parameter is not available for Color *Item*s.
+When no _ramp_ parameter is specified or no profile is configured, the ramp is 0 (behavior like a switch).
+The ramp parameter is not available for Color _Item_s.
 
-```
+```java
 // Dim output 2 in 0.25s
 Switch M10_Output2 {channel="lcn:module:b827ebfea4bb:S000M010:output#2"[profile="lcn:output", ramp=0.25]} // with ramp of 0.25s (smallest value)
 // Dim output 3 in 486s
 Dimmer M10_Output3 {channel="lcn:module:b827ebfea4bb:S000M010:output#3"[profile="lcn:output", ramp=486]}  // with ramp of 486s (biggest value)
 ```
 
-The optional parameters *controlAllOutputs* and *controlOutputs12* can be used to control multiple outputs simultaneously.
-Please note that the combination of these parameters with the *ramp* parameter is limited:
+The optional parameters _controlAllOutputs_ and _controlOutputs12_ can be used to control multiple outputs simultaneously.
+Please note that the combination of these parameters with the _ramp_ parameter is limited:
 
-```
+```java
 // Control outputs 1+2 simultaneously. Status of Output 1 is visualized. Only ramps of 0s or 0.25s are supported.
 Dimmer M10_Outputs12a {channel="lcn:module:b827ebfea4bb:S000M010:output#1"[profile="lcn:output", controlOutputs12=true]}
 Dimmer M10_Outputs12b {channel="lcn:module:b827ebfea4bb:S000M010:output#1"[profile="lcn:output", controlOutputs12=true, ramp=0.25]}
@@ -334,20 +334,20 @@ Actions are special commands that can be sent to LCN modules or LCN groups.
 
 ### Hit Key
 
-This *Action* virtually hits a key of a key table in an LCN module.
+This _Action_ virtually hits a key of a key table in an LCN module.
 Simply spoken, openHAB acts as a push button switch connected to an LCN module.
 
-This *Action* can be used to execute commands which are not natively supported by this binding.
-The function can be programmed via the software *LCN-PRO* onto a key in a module's key table.
-Then, the programmed key can be "hit" by this *Action* and the command will be executed.
+This _Action_ can be used to execute commands which are not natively supported by this binding.
+The function can be programmed via the software _LCN-PRO_ onto a key in a module's key table.
+Then, the programmed key can be "hit" by this _Action_ and the command will be executed.
 
-When programming a "Hit Key" *Action*, the following parameters need to be set:
+When programming a "Hit Key" _Action_, the following parameters need to be set:
 
-*table* - The module's key table: A, B, C or D<br />
-*key* - The number of the key within the key table: 1-8<br />
-*action* - The key's action: HIT (German: "kurz"), MAKE ("lang") or BREAK ("los")
+_table_ - The module's key table: A, B, C or D<br />
+_key_ - The number of the key within the key table: 1-8<br />
+_action_ - The key's action: HIT (German: "kurz"), MAKE ("lang") or BREAK ("los")
 
-```
+```java
 rule "Hit key C4 hourly"
 when
     Time cron "0 0 * * * ?"
@@ -359,20 +359,20 @@ end
 
 ### Dynamic Text
 
-This *Action* can be used to send custom texts to an LCN-GTxD display.
-To make this function work, the row of the display has to be configured to allow dynamic text within *LCN-PRO*:
+This _Action_ can be used to send custom texts to an LCN-GTxD display.
+To make this function work, the row of the display has to be configured to allow dynamic text within _LCN-PRO_:
 
 ![Screenshot of LCN-PRO, showing the dynamic text setting of an LCN-GT10D](doc/dyn_text.png)
 
-When programming a "Dynamic Text" *Action*, the following parameters need to be set:
+When programming a "Dynamic Text" _Action_, the following parameters need to be set:
 
-*row* - The number of the row in the display: 1-4<br />
-*text* - The text to be displayed (UTF-8)
+_row_ - The number of the row in the display: 1-4<br />
+_text_ - The text to be displayed (UTF-8)
 
 The length of the text may not exceed 60 bytes of characters.
 Bear in mind that unicode characters can take more than one byte (e.g. umlauts (äöü) take two bytes).
 
-```
+```java
 rule "Send dynamic Text to GT10D hourly"
 when
     Time cron "0 0 * * * ?"
@@ -384,19 +384,19 @@ end
 
 ### Flicker Output
 
-This *Action* realizes the LCN command "Output: Flicker" (German: "Ausgang: Flackern").
+This _Action_ realizes the LCN command "Output: Flicker" (German: "Ausgang: Flackern").
 The command let a dimmer output flash a given number of times. This feature can be used e.g. for alert signals or visual door bells.
 
-When programming a "Flicker Output" *Action*, the following parameters need to be set:
+When programming a "Flicker Output" _Action_, the following parameters need to be set:
 
-*output* - The dimmer output number: 1-4<br />
-*depth* - The depth of the flickering: 0-2 (0=25% 1=50% 2=100% Example: When the output is fully on (100%), and 0 is selected, flashes will dim from 100% to 75% and back)<br />
-*ramp* - The duration/ramp of one flash: 0-2 (0=2sec 1=1sec 2=0.5sec)<br />
-*count* - The number of flashes: 1-15
+_output_ - The dimmer output number: 1-4<br />
+_depth_ - The depth of the flickering: 0-2 (0=25% 1=50% 2=100% Example: When the output is fully on (100%), and 0 is selected, flashes will dim from 100% to 75% and back)<br />
+_ramp_ - The duration/ramp of one flash: 0-2 (0=2sec 1=1sec 2=0.5sec)<br />
+_count_ - The number of flashes: 1-15
 
-This action has also effect, if the given output is off. The output will be dimmed from 0% to *depth* and back, then.
+This action has also effect, if the given output is off. The output will be dimmed from 0% to _depth_ and back, then.
 
-```
+```java
 rule "Flicker output 1 when window opens"
 when
     Item M10_BinarySensor5 changed to OPEN
@@ -409,15 +409,15 @@ end
 
 ### Relay Timer
 
-This *Action* realizes the LCN commmand "Relay Timer" (German: "Relais-Timer").
+This _Action_ realizes the LCN commmand "Relay Timer" (German: "Relais-Timer").
 The command switches the given relay immediately to on and after a given time back to off.
 
-When programming a "Relay Timer" *Action*, the following parameters need to be set:
+When programming a "Relay Timer" _Action_, the following parameters need to be set:
 
-*relayNumber* - The relay number: 1-8<br />
-*duration* - Timer duration in milliseconds: 30-240.000 ms<br />
+_relayNumber_ - The relay number: 1-8<br />
+_duration_ - Timer duration in milliseconds: 30-240.000 ms<br />
 
-```
+```java
 rule "Start relay timer for led driver when dummy switch changed"
 when
     Item Dummy_Switch changed
@@ -430,14 +430,14 @@ end
 
 ### Beep
 
-This *Action* realizes the LCN commmand "audio" (German: "Piepen").
+This _Action_ realizes the LCN commmand "audio" (German: "Piepen").
 It lets the beeper connected to the LCN module beep.
 
-When programming an "audio" *Action*, the following parameters can be set:
+When programming an "audio" _Action_, the following parameters can be set:
 
-*volume* - Sound volume in percent (if null, the previous volume will be used)<br />
-*tonality* - The tonality as a String. You need to use quotes. See below.<br />
-*count* - Number of beeps (max. 50)
+_volume_ - Sound volume in percent (if null, the previous volume will be used)<br />
+_tonality_ - The tonality as a String. You need to use quotes. See below.<br />
+_count_ - Number of beeps (max. 50)
 
 Tonalities:
 
@@ -451,7 +451,7 @@ Tonalities:
 - "6"=error
 - "7"=long
 
-```
+```java
 rule "Beep when dummy switch changed"
 when
     Item Dummy_Switch changed
@@ -466,27 +466,27 @@ end
 
 LCN segments are supported by this binding, but could not be tested, due to lack of hardware.
 
-LEDs do not support the *OnOffCommand* and respectively the *Switch* Item type, because they have the additional states *BLINK* and *FLICKER*. They must be configured as *String* Item. When used in rules, the parameter must be of type string. Example: `M10_LED1.sendCommand("ON")`. Note the quotation marks.
+LEDs do not support the _OnOffCommand_ and respectively the _Switch_ Item type, because they have the additional states _BLINK_ and _FLICKER_. They must be configured as _String_ Item. When used in rules, the parameter must be of type string. Example: `M10_LED1.sendCommand("ON")`. Note the quotation marks.
 
 ## Full Example
 
 Config `.things`
 
-```
+```java
 Bridge lcn:pckGateway:myPCHK [ hostname="192.168.123.123", port=4114, username="myUser", password="myPassword", mode="native200" ] {
-	Thing module M99 "M99 MyModule" [ moduleId=99, segmentId=0 ] {
-	Channels:
+ Thing module M99 "M99 MyModule" [ moduleId=99, segmentId=0 ] {
+ Channels:
         Rollershutter : rollershutterrelay#1 "My twisted rollershutter relay" [ invertUpDown = true ]
-		Contact : binarysensor#6 [ invertState=true ]
-		Number  : rvarsetpoint#1 [ unit="temperature" ]
-		Number  : variable#3     [ unit="temperature" ]
-	}
+  Contact : binarysensor#6 [ invertState=true ]
+  Number  : rvarsetpoint#1 [ unit="temperature" ]
+  Number  : variable#3     [ unit="temperature" ]
+ }
 }
 ```
 
 Config `.items`
 
-```
+```java
 // Dimmer Outputs
 Dimmer M10_Output1 {channel="lcn:module:b827ebfea4bb:S000M010:output#1"}
 Switch M10_Output2 {channel="lcn:module:b827ebfea4bb:S000M010:output#2"[profile="lcn:output", ramp=0.25]} // with ramp of 0.25s (smallest value)
@@ -560,7 +560,7 @@ Switch M10_KeyLockD5 {channel="lcn:module:b827ebfea4bb:S000M010:keylocktabled#5"
 
 Config `.sitemap`
 
-```
+```perl
 sitemap lcn label="My home automation" {
     Frame label="Demo Items" {
         // Dimmer Outputs
diff --git a/bundles/org.openhab.binding.leapmotion/README.md b/bundles/org.openhab.binding.leapmotion/README.md
index 05248bab468ca..500b1f67d02bb 100644
--- a/bundles/org.openhab.binding.leapmotion/README.md
+++ b/bundles/org.openhab.binding.leapmotion/README.md
@@ -43,13 +43,13 @@ This binding specifies 3 profiles for the `gesture` channel to make it easy to l
 
 demo.things:
 
-```
+```java
 Thing leapmotion:controller:1 MyLeapMotion
 ```
 
 demo.items:
 
-```
+```java
 Switch DemoSwitch  "Switch"         { channel="leapmotion:controller:1:gesture" }
 Color  RGBLight    "RGB Light"      { channel="leapmotion:controller:1:gesture" }
 Dimmer DimmedLight "Dimmer [%d %%]" { channel="leapmotion:controller:1:gesture"[profile="leapmotion:dimmer", mode="fingers"] } 
diff --git a/bundles/org.openhab.binding.lghombot/README.md b/bundles/org.openhab.binding.lghombot/README.md
index 6bf73bc9bb18b..a821afe668c94 100644
--- a/bundles/org.openhab.binding.lghombot/README.md
+++ b/bundles/org.openhab.binding.lghombot/README.md
@@ -26,7 +26,6 @@ You can also configure the polling interval in seconds by setting "pollingPeriod
 
 ## Channels
 
-
 | Channel Type ID | Item Type | Description                                                              | Read/Write |
 |-----------------|-----------|--------------------------------------------------------------------------|------------|
 | state           | String    | Current state of the HomBot.                                             | R          |
@@ -59,7 +58,7 @@ Example of how to configure a thing.
 
 demo.thing
 
-```
+```java
 Thing lghombot:LGHomBot:mycleanerbot "LGHomBot" @ "Living Room" [ ipAdress="192.168.0.2", pollingPeriod="3", port="6260" ]
 ```
 
@@ -67,7 +66,7 @@ Here are some examples on how to map the channels to items.
 
 demo.items:
 
-```
+```java
 String HomBot_State "State [%s]" <CleaningRobot> { channel="lghombot:LGHomBot:a4_24_56_8f_2c_5b:state" }
 Number HomBot_Battery "Battery [%d%%]"           { channel="lghombot:LGHomBot:a4_24_56_8f_2c_5b:battery" }
 Switch HomBot_Clean "Clean"                      { channel="lghombot:LGHomBot:a4_24_56_8f_2c_5b:clean" }
@@ -85,7 +84,7 @@ Image HomBot_Map                                 { channel="lghombot:LGHomBot:a4
 
 demo.sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu"
 {
     Frame label="HomBot" {
diff --git a/bundles/org.openhab.binding.lgwebos/README.md b/bundles/org.openhab.binding.lgwebos/README.md
index ae1ef859ba3ed..1c0b9d1525b4f 100644
--- a/bundles/org.openhab.binding.lgwebos/README.md
+++ b/bundles/org.openhab.binding.lgwebos/README.md
@@ -20,7 +20,7 @@ If channel `power` receives `ON`, the binding will attempt to power on the TV by
 
 ## Binding Configuration
 
-The binding has no configuration parameter. 
+The binding has no configuration parameter.
 
 ## Discovery
 
@@ -46,7 +46,7 @@ Parameters:
 
 Set host and key parameter as in the following example:
 
-```
+```java
 Thing lgwebos:WebOSTV:tv1 [host="192.168.2.119", key="6ef1dff6c7c936c8dc5056fc85ea3aef", macAddress="3c:cd:93:c2:20:e0"]
 ```
 
@@ -92,7 +92,6 @@ This list has been compiled mostly through trial and error, but the codes applic
 | PAUSE       | "PAUSE" button                                           |
 | STOP        | "STOP" button                                            |
 
-
 A sample HABPanel remote control widget can be found [in this GitHub repository.](https://github.com/bbrodt/openhab2-misc)
 
 ## Console Commands
@@ -100,7 +99,7 @@ A sample HABPanel remote control widget can be found [in this GitHub repository.
 The binding provides a few commands you can use in the console.
 Enter the command `openhab:lgwebos` to get the usage.
 
-```
+```shell
 Usage: openhab:lgwebos <thingUID> applications - list applications
 Usage: openhab:lgwebos <thingUID> channels - list channels
 Usage: openhab:lgwebos <thingUID> accesskey - show the access key
@@ -114,13 +113,13 @@ The command `accesskey` reports in the console the access key used to connect to
 
 demo.things:
 
-```
+```java
 Thing lgwebos:WebOSTV:3aab9eea-953b-4272-bdbd-f0cd0ecf4a46 [host="192.168.2.119", key="6ef1dff6c7c936c8dc5056fc85ea3aef", macAddress="3c:cd:93:c2:20:e0"]
 ```
 
 demo.items:
 
-```
+```java
 Switch LG_TV0_Power "TV Power" <television>  { autoupdate="false", channel="lgwebos:WebOSTV:3aab9eea-953b-4272-bdbd-f0cd0ecf4a46:power" }
 Switch LG_TV0_Mute  "TV Mute"                { channel="lgwebos:WebOSTV:3aab9eea-953b-4272-bdbd-f0cd0ecf4a46:mute"}
 Dimmer LG_TV0_Volume "Volume [%d]"           { channel="lgwebos:WebOSTV:3aab9eea-953b-4272-bdbd-f0cd0ecf4a46:volume" }
@@ -136,7 +135,7 @@ Player LG_TV0_Player                         { channel="lgwebos:WebOSTV:3aab9eea
 
 demo.sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu"
 {
     Frame label="TV" {
@@ -152,10 +151,9 @@ sitemap demo label="Main Menu"
 }
 ```
 
-
 demo.rules:
 
-```
+```java
 // for relative volume changes
 rule "VolumeUpDown"
 when Item LG_TV0_VolDummy received command
@@ -183,10 +181,9 @@ then
 end
 ```
 
-
 Example of a toast message.
 
-```
+```java
 LG_TV0_Toast.sendCommand("Hello World")
 ```
 
@@ -196,7 +193,7 @@ Multiple actions are supported by this binding. In classic rules these are acces
 
 Example
 
-```
+```java
  val actions = getActions("lgwebos","lgwebos:WebOSTV:3aab9eea-953b-4272-bdbd-f0cd0ecf4a46")
  if(null === actions) {
         logInfo("actions", "Actions not found, check thing ID")
@@ -216,7 +213,7 @@ Parameters:
 
 Example:
 
-```
+```java
 actions.showToast("Hello World")
 ```
 
@@ -233,7 +230,7 @@ Parameters:
 
 Example:
 
-```
+```java
 actions.showToast("http://localhost:8080/icon/energy?format=png","Hello World")
 ```
 
@@ -249,7 +246,7 @@ Parameters:
 
 Example:
 
-```
+```java
 actions.launchBrowser("https://www.openhab.org")
 ```
 
@@ -265,7 +262,7 @@ Parameters:
 
 Examples:
 
-```
+```java
 actions.launchApplication("com.webos.app.tvguide") // TV Guide
 actions.launchApplication("com.webos.app.livetv") // TV
 actions.launchApplication("com.webos.app.hdmi1") // HDMI1
@@ -286,7 +283,7 @@ Parameters:
 
 Examples:
 
-```
+```java
 actions.launchApplication("appId","{\"key\":\"value\"}")
 ```
 
@@ -304,7 +301,7 @@ Parameters:
 
 Example:
 
-```
+```java
 actions.sendText("Some text")
 ```
 
@@ -320,7 +317,7 @@ Parameters:
 
 Example:
 
-```
+```java
 actions.sendButton("HOME")
 ```
 
@@ -339,7 +336,7 @@ ENTER will remove the keyboard when on-screen keyboard is displayed with focus i
 
 Example:
 
-```
+```java
 actions.sendKeyboard("ENTER")
 ```
 
@@ -349,7 +346,7 @@ TV will switch one channel up in the current channel list.
 
 Example:
 
-```
+```java
 actions.increaseChannel
 ```
 
@@ -359,7 +356,7 @@ TV will switch one channel down in the current channel list.
 
 Example:
 
-```
+```java
 actions.decreaseChannel
 ```
 
@@ -367,7 +364,6 @@ actions.decreaseChannel
 
 In case of issues you may find it helpful to enable debug level logging and check you log file. Log into openHAB console and enable debug logging for this binding:
 
-```
+```shell
 log:set debug org.openhab.binding.lgwebos
 ```
-
diff --git a/bundles/org.openhab.binding.lifx/README.md b/bundles/org.openhab.binding.lifx/README.md
index 4c249e1ea4f33..1a2a9dd4a71e4 100644
--- a/bundles/org.openhab.binding.lifx/README.md
+++ b/bundles/org.openhab.binding.lifx/README.md
@@ -57,7 +57,7 @@ The following matrix lists the capabilities (channels) for each type:
 The binding is able to auto-discover all lights in a network over the LIFX UDP protocol.
 Therefore all lights must be turned on.
 
-*Note:* To get the binding working, all lights must be added to the WLAN network first with the help of the [LIFX smart phone applications](https://www.lifx.com/pages/app).
+_Note:_ To get the binding working, all lights must be added to the WLAN network first with the help of the [LIFX smart phone applications](https://www.lifx.com/pages/app).
 The binding is NOT able to add or detect lights outside the network.
 
 ## Thing Configuration
@@ -68,16 +68,16 @@ But usually the discovery works quite reliably, so that a manual configuration i
 
 However, in the thing file, a manual configuration looks e.g. like
 
-```
+```java
 Thing lifx:colorlight:living [ deviceId="D073D5A1A1A1", fadetime=200 ]
 ```
 
-The *fadetime* is an optional thing configuration parameter which configures the time to fade to a new color value (in ms).
-When the *fadetime* is not configured, the binding uses 300ms as default.
+The _fadetime_ is an optional thing configuration parameter which configures the time to fade to a new color value (in ms).
+When the _fadetime_ is not configured, the binding uses 300ms as default.
 
 You can optionally also configure a fixed Host or IP address when lights are in a different subnet and are not discovered.
 
-```
+```java
 Thing lifx:colorirlight:porch [ host="10.120.130.4", fadetime=0 ]
 ```
 
@@ -94,50 +94,49 @@ All devices support some of the following channels:
 | colorzone          | Color     | This channel supports full zone color control with hue, saturation and brightness values.                                                                        | colormzlight                                                                 |
 | effect             | String    | This channel represents a type of light effect (e.g. for tile light: off, morph, flame)                                                                          | tilelight                                                                    |
 | hevcycle           | Switch    | This channel supports starting and stopping the HEV clean cycle.                                                                                                 | colorhevlight                                                                |
-| infrared           | Dimmer    | This channel supports adjusting the infrared value. *Note:* IR capable lights only activate their infrared LEDs when the brightness drops below a certain level. | colorirlight                                                                 |
+| infrared           | Dimmer    | This channel supports adjusting the infrared value. _Note:_ IR capable lights only activate their infrared LEDs when the brightness drops below a certain level. | colorirlight                                                                 |
 | signalstrength     | Number    | This channel represents signal strength with values 0, 1, 2, 3 or 4; 0 being worst strength and 4 being best strength.                                           | colorlight, colorhevlight, colorirlight, colormzlight, tilelight, whitelight |
 | temperature        | Dimmer    | This channel supports adjusting the color temperature from cold (0%) to warm (100%).                                                                             | colorlight, colorhevlight, colorirlight, colormzlight, tilelight, whitelight |
 | temperaturezone    | Dimmer    | This channel supports adjusting the zone color temperature from cold (0%) to warm (100%).                                                                        | colormzlight                                                                 |
 
-The *color* and *brightness* channels have a "Power On Brightness" configuration option that is used to determine the brightness when a light is switched on.
+The _color_ and _brightness_ channels have a "Power On Brightness" configuration option that is used to determine the brightness when a light is switched on.
 When it is left empty, the brightness of a light remains unchanged when a light is switched on or off.
 
-The *color* channels have a "Power On Color" configuration option that is used to determine the hue, saturation, brightness levels when a light is switched on.
+The _color_ channels have a "Power On Color" configuration option that is used to determine the hue, saturation, brightness levels when a light is switched on.
 When it is left empty, the color of a light remains unchanged when a light is switched on or off.
 Configuration options contains 3 comma separated values, where first value is hue (0-360), second  saturation (0-100) and third brightness (0-100).
 If both "Power on brightness" and "Power On Color" configuration options are defined, "Power on brightness" option overrides the brightness level defined on the "Power on color" configuration option.
 
-The *temperature* channels have a "Power On Temperature" configuration option that is used to determine the color temperature when a light is switched on. When it is left empty, the color temperature of a light remains unchanged when a light is switched on or off.
+The _temperature_ channels have a "Power On Temperature" configuration option that is used to determine the color temperature when a light is switched on. When it is left empty, the color temperature of a light remains unchanged when a light is switched on or off.
 
-MultiZone lights (*colormzlight*) have several channels (e.g. *colorzone0*, *temperaturezone0*, *abstemperaturezone0*, etc.) that allow for controlling specific zones of the light.
-Changing the *color*, *temperature* and *abstemperature* channels will update the states of all zones.
-The *color*, *temperature* and *abstemperature* channels of MultiZone lights always return the same state as *colorzone0*, *temperaturezone0*, *abstemperaturezone0*.
+MultiZone lights (_colormzlight_) have several channels (e.g. _colorzone0_, _temperaturezone0_, _abstemperaturezone0_, etc.) that allow for controlling specific zones of the light.
+Changing the _color_, _temperature_ and _abstemperature_ channels will update the states of all zones.
+The _color_, _temperature_ and _abstemperature_ channels of MultiZone lights always return the same state as _colorzone0_, _temperaturezone0_, _abstemperaturezone0_.
 
-The *hevcycle* channels have an optional "HEV Cycle Duration" configuration option that can be used to override the cycle duration configured in the light. 
+The _hevcycle_ channels have an optional "HEV Cycle Duration" configuration option that can be used to override the cycle duration configured in the light.
 
-LIFX Tile (*tilelight*) supports special tile effects: morph and flame.
+LIFX Tile (_tilelight_) supports special tile effects: morph and flame.
 These effects are predefined to their appearance using LIFX application.
 Each effect has a separate speed configuration option.
 
 ## Full Example
 
-In this example **living** is a Color 1000 light that has a *colorlight* thing type which supports *color* and *temperature* channels.
-
-The **desk** light is a LIFX Clean that has a *colorhevlight* thing type which supports *color*, *temperature* and *hevcycle* channels.
+In this example **living** is a Color 1000 light that has a _colorlight_ thing type which supports _color_ and _temperature_ channels.
 
-The **porch** light is a LIFX+ BR30 that has a *colorirlight* thing type which supports *color*, *temperature* and *infrared* channels.
+The **desk** light is a LIFX Clean that has a _colorhevlight_ thing type which supports _color_, _temperature_ and _hevcycle_ channels.
 
-The **ceiling** light is a LIFX Z with 2 strips (16 zones) that has a *colormzlight* thing type which supports *color*, *colorzone*, *temperature* and *temperaturezone* channels.
+The **porch** light is a LIFX+ BR30 that has a _colorirlight_ thing type which supports _color_, _temperature_ and _infrared_ channels.
 
-Finally, **kitchen** is a White 800 (Low Voltage) light that has a *whitelight* thing type which supports *brightness* and *temperature* channels.
+The **ceiling** light is a LIFX Z with 2 strips (16 zones) that has a _colormzlight_ thing type which supports _color_, _colorzone_, _temperature_ and _temperaturezone_ channels.
 
-Either create a single *Color* item linked to the *color* channel and define *Switch*, *Slider* and *Colorpicker* entries with this item in the sitemap.
-Or create items for each type (*Color*, *Switch*, *Dimmer*) and define the correspondent entries in the sitemap.
+Finally, **kitchen** is a White 800 (Low Voltage) light that has a _whitelight_ thing type which supports _brightness_ and _temperature_ channels.
 
+Either create a single _Color_ item linked to the _color_ channel and define _Switch_, _Slider_ and _Colorpicker_ entries with this item in the sitemap.
+Or create items for each type (_Color_, _Switch_, _Dimmer_) and define the correspondent entries in the sitemap.
 
 ### demo.things:
 
-```
+```java
 Thing lifx:colorlight:living [ deviceId="D073D5A1A1A1" ]
 
 Thing lifx:colorlight:living2 [ deviceId="D073D5A2A2A2" ] {
@@ -172,7 +171,7 @@ Thing lifx:whitelight:kitchen [ deviceId="D073D5D4D4D4", fadetime=150 ]
 
 ### demo.items:
 
-```
+```java
 // Living
 Color Living_Color { channel="lifx:colorlight:living:color" }
 Dimmer Living_Temperature { channel="lifx:colorlight:living:temperature" }
@@ -218,7 +217,7 @@ Number Kitchen_Abs_Temperature { channel="lifx:whitelight:kitchen:abstemperature
 
 ### demo.sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu"
 {
     Frame label="Living" {
diff --git a/bundles/org.openhab.binding.linky/README.md b/bundles/org.openhab.binding.linky/README.md
index 7e3668ff502d8..637f687c24cbd 100644
--- a/bundles/org.openhab.binding.linky/README.md
+++ b/bundles/org.openhab.binding.linky/README.md
@@ -4,7 +4,7 @@ This binding uses the API provided by Enedis to retrieve your energy consumption
 You need to create an Enedis account [here](https://espace-client-connexion.enedis.fr/auth/UI/Login?realm=particuliers) if you don't have one already.
 
 Please ensure that you have accepted their conditions, and check that you can see graphs on the website.
-Especially, check hourly view/graph. Enedis may ask for permission the first time to start collecting hourly data. 
+Especially, check hourly view/graph. Enedis may ask for permission the first time to start collecting hourly data.
 The binding will not provide these informations unless this step is ok.
 
 ## Supported Things
@@ -32,16 +32,16 @@ The thing has the following configuration parameters:
 This version is now compatible with the new API of Enedis (deployed from june 2020).
 To avoid the captcha login, it is necessary to log before on a classical browser (e.g Chrome, Firefox) and to retrieve the user cookies (internalAuthId).
 
-Instructions given for Firefox : 
+Instructions given for Firefox :
 
-1. Go to https://mon-compte-client.enedis.fr/.
-2. Select "Particulier" in the drop down list and click on the "Connexion" button.
-3. You'll be redirected to a page where you'll have to enter you Enedis account email address and check the "Je ne suis pas un robot" checkbox.
-4. Clic on "Suivant".
-5. In the login page, prefilled with your mail address, enter your Enedis account password and click on "Connexion à Espace Client Enedis".
-6. You will be directed to your Enedis account environment. Get back to previous page in you browser.
-7. Disconnect from your Enedis account
-8. Repeat steps 1, 2. You should arrive directly on step 5, then open the developer tool window (F12) and select "Stockage" tab. In the "Cookies" entry, select "https://mon-compte-enedis.fr". You'll find an entry named "internalAuthId", copy this value in your openHAB configuration.
+1. Go to <https://mon-compte-client.enedis.fr/>.
+1. Select "Particulier" in the drop down list and click on the "Connexion" button.
+1. You'll be redirected to a page where you'll have to enter you Enedis account email address and check the "Je ne suis pas un robot" checkbox.
+1. Clic on "Suivant".
+1. In the login page, prefilled with your mail address, enter your Enedis account password and click on "Connexion à Espace Client Enedis".
+1. You will be directed to your Enedis account environment. Get back to previous page in you browser.
+1. Disconnect from your Enedis account
+1. Repeat steps 1, 2. You should arrive directly on step 5, then open the developer tool window (F12) and select "Stockage" tab. In the "Cookies" entry, select "https://mon-compte-enedis.fr". You'll find an entry named "internalAuthId", copy this value in your openHAB configuration.
 
 ## Channels
 
@@ -64,8 +64,8 @@ The information that is retrieved is available as these channels:
 The binding provides one specific command you can use in the console.
 Enter the command `openhab:linky` to get the usage.
 
-```
-Usage: openhab:linky <thingUID> report <start day> <end day> [<separator>] - report daily consumptions between two dates
+```shell
+openhab:linky <thingUID> report <start day> <end day> [<separator>] - report daily consumptions between two dates
 ```
 
 The command `report` reports in the console the daily consumptions between two dates.
@@ -82,13 +82,13 @@ In case you are running openHAB inside Docker, the binding will work only if you
 
 ### Thing
 
-```
+```java
 Thing linky:linky:local "Compteur Linky" [ username="example@domaine.fr", password="******" ]
 ```
 
 ### Items
 
-```
+```java
 Number:Energy ConsoHier "Conso hier [%.0f %unit%]" <energy> { channel="linky:linky:local:daily#yesterday" }
 Number:Energy ConsoSemaineEnCours "Conso cette semaine [%.0f %unit%]" <energy> { channel="linky:linky:local:weekly#thisWeek" }
 Number:Energy ConsoSemaineDerniere "Conso semaine dernière [%.0f %unit%]" <energy> { channel="linky:linky:local:weekly#lastWeek" }
diff --git a/bundles/org.openhab.binding.linuxinput/README.md b/bundles/org.openhab.binding.linuxinput/README.md
index 5723bab852766..7431eebcda65b 100644
--- a/bundles/org.openhab.binding.linuxinput/README.md
+++ b/bundles/org.openhab.binding.linuxinput/README.md
@@ -36,21 +36,20 @@ The `libevdev` library has to be installed for this plugin to work.
 ## Thing Configuration
 
 Each thing has has to be explicitly enabled after it is configured.
-While it is enabled *all* of the generated events will be consumed by openHAB.
+While it is enabled _all_ of the generated events will be consumed by openHAB.
 The device will not be available for normal input processing!
 
-
 ### Static configuration
 
 #### Thing
 
-```
+```java
 Thing linuxinput:input-device:some-keyboard [ enable=true, path="/dev/input/eventXX" ]
 ```
 
 #### Item
 
-```
+```java
 Contact SomeButton "Some Button" { channel="linuxinput:input-device:event17:keypresses#KEY_0" }
 ```
 
@@ -58,8 +57,8 @@ Contact SomeButton "Some Button" { channel="linuxinput:input-device:event17:keyp
 
 Each Thing provides multiple channels
 
-* A `key` channel that aggregates all events.
-* Per physical key channels.
+- A `key` channel that aggregates all events.
+- Per physical key channels.
 
 ### Events
 
@@ -67,16 +66,16 @@ The following happens when pressing and releasing a key:
 
 #### Press
 
-1) State of global key channel updated to new key.
-2) State of per-key channel updated to `"CLOSED"`.
-3) Global key channel triggered with the current key name.
-4) Per-key channel triggered with `"PRESSED"`".
-5) State of global key channel updated to `""` (Empty string)
+1. State of global key channel updated to new key.
+1. State of per-key channel updated to `"CLOSED"`.
+1. Global key channel triggered with the current key name.
+1. Per-key channel triggered with `"PRESSED"`".
+1. State of global key channel updated to `""` (Empty string)
 
 #### Release
 
-1) State of per-key channel updated to `"OPEN"`
-2) Per-key channel triggered with `"RELEASED"`
+1. State of per-key channel updated to `"OPEN"`
+1. Per-key channel triggered with `"RELEASED"`
 
 #### Rationale
 
diff --git a/bundles/org.openhab.binding.lirc/README.md b/bundles/org.openhab.binding.lirc/README.md
index c40c7711da2d0..30322f9040843 100644
--- a/bundles/org.openhab.binding.lirc/README.md
+++ b/bundles/org.openhab.binding.lirc/README.md
@@ -4,7 +4,6 @@ This binding integrates infrared transceivers through [LIRC](https://www.lirc.or
 
 A list of remote configuration files for LIRC is available [here](http://lirc-remotes.sourceforge.net/remotes-table.html).
 
-
 ## Supported Things
 
 This binding supports LIRC and WinLIRC as bridges for accessing the configured remotes.
@@ -29,7 +28,6 @@ WantedBy=multi-user.target
 By default, LIRC will listen on IP address 0.0.0.0 (any available IP address) and port 8765. If you would
 rather run LIRC on a specific port or IP address, you can use `--listen=192.168.1.100:9001` instead.
 
-
 ## Discovery
 
 Discovery of the LIRC bridge is not supported. However, remotes will be automatically discovered once
@@ -39,7 +37,7 @@ a bridge is configured.
 
 ### Things
 
-```xtend
+```java
 Bridge lirc:bridge:local [ host="192.168.1.120", portNumber="9001" ] {
     Thing remote Onkyo_RC_799M [ remote="Onkyo_RC-799M" ]
     Thing remote Samsung [ remote="Samsung" ]
@@ -48,23 +46,23 @@ Bridge lirc:bridge:local [ host="192.168.1.120", portNumber="9001" ] {
 
 Bridge:
 
-* **host**: IP address or hostname of the LIRC server. Defaults to localhost
-* **port**: The port number the LIRC server is listening on. Defaults to 8765
+- **host**: IP address or hostname of the LIRC server. Defaults to localhost
+- **port**: The port number the LIRC server is listening on. Defaults to 8765
 
 Remote:
 
-* **remote**: The name of the remote as known by LIRC
+- **remote**: The name of the remote as known by LIRC
 
 ### Items
 
-```xtend
+```java
 String Remote_AVReceiver { channel="lirc:remote:local:Onkyo_RC_799M:transmit" }
 String Remote_TV { channel="lirc:remote:local:Samsung:transmit" }
 ```
 
 ### Rules
 
-```xtend
+```java
 rule "LIRC Test"
 when
     Channel 'lirc:remote:local:Samsung:event' triggered KEY_DVD
@@ -76,7 +74,6 @@ then
 end
 ```
 
-
 ## Channels
 
 This binding currently supports following channels:
diff --git a/bundles/org.openhab.binding.livisismarthome/README.md b/bundles/org.openhab.binding.livisismarthome/README.md
index aa51c521af133..89bcbe170449a 100644
--- a/bundles/org.openhab.binding.livisismarthome/README.md
+++ b/bundles/org.openhab.binding.livisismarthome/README.md
@@ -105,7 +105,6 @@ It is `false` by default.
 This means `100` on LIVISI is `UP` and `0` is `DOWN`.
 When `invert` is `true` than `0` on LIVISI is `UP` and `100` is `DOWN`.
 
-
 ## Triggers
 
 | Trigger Type  | Description                                   | Available on thing                  |
@@ -114,7 +113,6 @@ When `invert` is `true` than `0` on LIVISI is `UP` and `100` is `DOWN`.
 | LONG_PRESSED  | Fired when you press a button longer          | BRC8, ISC2, ISD2, ISR2, ISS2, WSC2  |
 | PRESSED       | Fired when you press a button (short or long) | BRC8, ISC2, ISD2, ISR2, ISS2, WSC2  |
 
-
 ## Thing configuration
 
 ### Configuring the SmartHome Controller (SHC)
@@ -135,17 +133,17 @@ Now you can add all devices from your Inbox as things.
 As an alternative to the automatic discovery process and graphical configuration using the UI, LIVISI things can be configured manually.
 The LIVISI SmartHome Controller (SHC) can be configured using the following syntax:
 
-```
+```java
 Bridge livisismarthome:bridge:<bridge-id> "Livisi: SmartHome Controller (SHC)" [ host="192.168.0.99", password="SomethingSecret", webSocketIdleTimeout=900]
 ```
 
-** *Security warning!**
+** _Security warning!_*
 The communication between the binding and the SHC is not encrypted and can be traced.
 So be careful and secure your local network from unauthorized access.
 
 All other LIVISI devices can be added using the following syntax:
 
-```
+```java
 Thing WDS <thing-id> "<thing-name>" @ "<room-name>" [ id="<the-device-id>" ]
 ```
 
@@ -153,7 +151,7 @@ The device ID (e.g. e9a74941a3807b57332214f346fb1129) can be found in the UI inb
 
 However, a full example .things configuration look like this:
 
-```
+```java
 Bridge livisismarthome:bridge:mybride "LIVISI SmartHome Controller" {
     Thing ISD2 myDimmer "Dimmer Kitchen" @ "Kitchen" [ id="<device-id>" ]
     Thing ISS2 myLightSwitch "Light Livingroom" @ "Livingroom" [ id="<device-id>" ]
@@ -173,7 +171,7 @@ Bridge livisismarthome:bridge:mybride "LIVISI SmartHome Controller" {
 
 You can then configure your items in your *.items config files as usual, for example:
 
-```
+```java
 Contact myWindowContact        "Kitchen"                <window>      {channel="livisismarthome:WDS:mybridge:myWindowContact:contact"}
 Switch myWindowContactBattery  "Battery low"            <battery>     {channel="livisismarthome:WDS:mybridge:myWindowContact:batteryLow"}
 Number myHeatingTemp           "Bath [%.1f °C]"         <temperature> {channel="livisismarthome:RST:mybridge:myHeating:currentTemperature"}
@@ -187,7 +185,7 @@ Number myHeatingHumidity       "Bath [%.1f %%]"         <humidity>    {channel="
 
 Example:
 
-```
+```perl
 sitemap default label="Home" {
     Frame {
         Text item=myHeatingTemp label="Temperature"
@@ -203,7 +201,7 @@ sitemap default label="Home" {
 Push-buttons provide trigger channels, that can only be used in rules.
 Here is an example rule:
 
-```
+```java
 rule "Button triggered rule"
 when
     Channel 'livisismarthome:WSC2:mybridge:myPushButton:button1' triggered PRESSED
diff --git a/bundles/org.openhab.binding.logreader/README.md b/bundles/org.openhab.binding.logreader/README.md
index b38f5853299a8..be3117e69ec04 100644
--- a/bundles/org.openhab.binding.logreader/README.md
+++ b/bundles/org.openhab.binding.logreader/README.md
@@ -8,13 +8,13 @@ When certain log events are recognized, openHAB rules can be used to send notifi
 This binding supports one ThingType: `reader`.
 A reader supports 3 separate channels
 
-  * One for errors
-  * one for warnings
-  * one custom channel for other purposes.
+- One for errors
+- one for warnings
+- one custom channel for other purposes.
 
 ## Thing Configuration
 
-The `reader` Thing has the following configuration parameters: 
+The `reader` Thing has the following configuration parameters:
 
 | Parameter                     | Type    | Required | Default if omitted               | Description                                                                             |
 | ------------------------------| ------- | -------- | -------------------------------- |-----------------------------------------------------------------------------------------|
@@ -51,7 +51,7 @@ List of channels
 
 ### example.things
 
-```xtend
+```java
 
 logreader:reader:openhablog[ refreshRate=1000, errorPatterns="ERROR+", errorBlacklistingPatterns="annoying error which should be ignored|Another annoying error which should be ignored" ]
 
@@ -59,7 +59,7 @@ logreader:reader:openhablog[ refreshRate=1000, errorPatterns="ERROR+", errorBlac
 
 ### example.items
 
-```xtend
+```java
 
 DateTime logreaderLogRotated        "Last Log Rotation [%1$tY.%1$tm.%1$te %1$tR]"   <time>  { channel="logreader:reader:openhablog:logRotated" }
 Number   logreaderErrors            "Error events matched [%d]"                     <alarm> { channel="logreader:reader:openhablog:errorEvents" }
@@ -73,25 +73,25 @@ String   logreaderLastCustom        "Last Custom [%s]"
 
 ### example.sitemap
 
-```xtend
+```perl
 
 sitemap logreader_example label="Example" {
-	Frame label="openHAB Log Reader" {
-		Text item=logreaderErrors
-		Text item=logreaderLastError
-		Text item=logreaderWarnings
-		Text item=logreaderLastWarning
-		Text item=logreaderCustoms
-		Text item=logreaderLastCustom
-		Text item=logreaderLogRotated
-	}
+ Frame label="openHAB Log Reader" {
+  Text item=logreaderErrors
+  Text item=logreaderLastError
+  Text item=logreaderWarnings
+  Text item=logreaderLastWarning
+  Text item=logreaderCustoms
+  Text item=logreaderLastCustom
+  Text item=logreaderLogRotated
+ }
 }
 
 ```
 
 ### example.rules
 
-```xtend
+```java
 rule "LogReader"
     when
         Channel "logreader:reader:openhablog:newErrorEvent" triggered
@@ -102,7 +102,7 @@ rule "LogReader"
 
 Use the rules with your Telegram Bot (need openHAB Telegram Binding installed and configured)
 
-```xtend
+```java
 rule "LogReader"
     when
         Channel 'logreader:reader:openhablog:newErrorEvent' triggered
@@ -113,7 +113,7 @@ rule "LogReader"
 ```
 
 Be careful when sending e.g. email notifications.
-You could easily send thousand of *spam* emails in short period if e.g. one binding is in error loop.
+You could easily send thousand of _spam_ emails in short period if e.g. one binding is in error loop.
 
 ### Thing status
 
diff --git a/bundles/org.openhab.binding.loxone/README.md b/bundles/org.openhab.binding.loxone/README.md
index 29fd9e540e90b..3780288051af7 100644
--- a/bundles/org.openhab.binding.loxone/README.md
+++ b/bundles/org.openhab.binding.loxone/README.md
@@ -7,14 +7,15 @@ Miniserver is represented as a [Thing](https://www.openhab.org/docs/configuratio
 
 The following features are currently supported:
 
-*   [Discovery](https://en.wikipedia.org/wiki/Simple_Service_Discovery_Protocol) of Miniservers available on the local network
-*   Creation of channels for Loxone controls that are exposed in the Loxone [UI](https://www.loxone.com/enen/kb/user-interface-configuration/)
-*   Tagging of channels and [items](https://www.openhab.org/docs/configuration/items.html) with tags that can be recognized by [Alexa](https://en.wikipedia.org/wiki/Amazon_Alexa) openHAB [skill](https://www.amazon.com/openHAB-Foundation/dp/B01MTY7Z5L), so voice can be used to command Loxone controls
-*   Management of a Websocket connection to the Miniserver and updating Thing status accordingly
-*   Updates of openHAB channel's state in runtime according to control's state changes on the Miniserver
-*   Passing channel commands to the Miniserver's controls
-*   Hash-based and token-based authentication methods
-*   Command encryption and response decryption
+- [Discovery](https://en.wikipedia.org/wiki/Simple_Service_Discovery_Protocol) of Miniservers available on the local network
+
+- Creation of channels for Loxone controls that are exposed in the Loxone [UI](https://www.loxone.com/enen/kb/user-interface-configuration/)
+- Tagging of channels and [items](https://www.openhab.org/docs/configuration/items.html) with tags that can be recognized by [Alexa](https://en.wikipedia.org/wiki/Amazon_Alexa) openHAB [skill](https://www.amazon.com/openHAB-Foundation/dp/B01MTY7Z5L), so voice can be used to command Loxone controls
+- Management of a Websocket connection to the Miniserver and updating Thing status accordingly
+- Updates of openHAB channel's state in runtime according to control's state changes on the Miniserver
+- Passing channel commands to the Miniserver's controls
+- Hash-based and token-based authentication methods
+- Command encryption and response decryption
 
 ## Things
 
@@ -38,48 +39,52 @@ The entry should have the following syntax:
 
 Where:
 
-*   `<thing-id>` is a unique ID for your Miniserver (you can but do not have to use Miniserver's MAC address here)
-*   `<user>` and `<password>` are the credentials used to log into the Miniserver
-*   `<host>` is a host name or IP of the Miniserver
-*   `<port>` is a port of web services on the Miniserver (please notice that port, as a number, is not surrounded by quotation marks, while the other values described above are)
-*   `...` are optional advanced parameters - please refer to _Advanced parameters_ section at the end of this instruction for a list of available options
+- `<thing-id>` is a unique ID for your Miniserver (you can but do not have to use Miniserver's MAC address here)
+- `<user>` and `<password>` are the credentials used to log into the Miniserver
+- `<host>` is a host name or IP of the Miniserver
+- `<port>` is a port of web services on the Miniserver (please notice that port, as a number, is not surrounded by quotation marks, while the other values described above are)
+- `...` are optional advanced parameters - please refer to _Advanced parameters_ section at the end of this instruction for a list of available options
 
 Example 1 - minimal required configuration:
 
-        `loxone:miniserver:504F2414780F [ user="kryten", password="jmc2017", host="loxone.local", port=80 ]`
+```java
+loxone:miniserver:504F2414780F [ user="kryten", password="jmc2017", host="loxone.local", port=80 ]
+```
 
 Example 2 - additionally keep alive period is set to 2 minutes and Websocket maximum binary message size to 8MB:
 
-        `loxone:miniserver:504F2414780F [ user="kryten", password="jmc2017", host="192.168.0.210", port=80, keepAlivePeriod=120, maxBinMsgSize=8192 ]`
+```java
+loxone:miniserver:504F2414780F [ user="kryten", password="jmc2017", host="192.168.0.210", port=80, keepAlivePeriod=120, maxBinMsgSize=8192 ]
+```
 
 ### Thing Offline Reasons
 
 There can be following reasons why Miniserver status is `OFFLINE`:
 
-*   __Configuration Error__
-    *   _Unknown host_
-        *   Miniserver host/ip address can't be resolved. No connection attempt will be made.
-    *   _User authentication error_
-        *   Invalid user name or password or user not authorized to connect to the Miniserver. Binding will make another attempt to connect after some time.
-    *   _Too many failed login attempts - stopped trying_
-        *   Miniserver locked out user for too many failed login attempts. In this case binding will stop trying to connect to the Miniserver. A new connection will be attempted only when user corrects user name or password in the configuration parameters.
-    *  _Enter password to generate a new token_
-        * Authentication using stored token failed - either token is wrong or it. A password must be reentered in the binding settings to acquire a new token.
-    *   _Internal error_
-        *   Probably a code defect, collect debug data and submit an issue. Binding will try to reconnect, but with unknown chance for success.
-    *   _Other_
-        *   An exception occured and its details will be displayed
-*   __Communication Error__
-    *   _Error communicating with Miniserver_
-        *   I/O error occurred during established communication with the Miniserver, most likely due to network connectivity issues, Miniserver going offline or Loxone Config is uploading a new configuration. A reconnect attempt will be made soon. Please consult detailed message against one of the following:
-            *   _"Text message size &lsqbXX&rsqb exceeds maximum size &lsqbYY&rsqb"_ - adjust text message size in advanced parameters to be above XX value
-            *   _"Binary message size &lsqbXX&rsqb exceeds maximum size &lsqbYY&rsqb"_ - adjust binary message size in advanced parameters to be above XX value
-    *   _User authentication timeout_
-        *   Authentication procedure took too long time and Miniserver closed connection. It should not occur under normal conditions and may indicate performance issue on binding's OS side.
-    *   _Timeout due to no activity_
-        *   Miniserver closed connection because there was no activity from binding. It should not occur under normal conditions, as it is prevented by sending keep-alive messages from the binding to the Miniserver. By default Miniserver's timeout is 5 minutes and period between binding's keep-alive messages is 4 minutes. If you see this error, try changing the keep-alive period in binding's configuration to a smaller value.
-    *   _Other_
-        *   An exception occured and its details will be displayed
+- **Configuration Error**
+  - _Unknown host_
+    - Miniserver host/ip address can't be resolved. No connection attempt will be made.
+  - _User authentication error_
+    - Invalid user name or password or user not authorized to connect to the Miniserver. Binding will make another attempt to connect after some time.
+  - _Too many failed login attempts - stopped trying_
+    - Miniserver locked out user for too many failed login attempts. In this case binding will stop trying to connect to the Miniserver. A new connection will be attempted only when user corrects user name or password in the configuration parameters.
+  - _Enter password to generate a new token_
+    - Authentication using stored token failed - either token is wrong or it. A password must be reentered in the binding settings to acquire a new token.
+  - _Internal error_
+    - Probably a code defect, collect debug data and submit an issue. Binding will try to reconnect, but with unknown chance for success.
+  - _Other_
+    - An exception occured and its details will be displayed
+- **Communication Error**
+  - _Error communicating with Miniserver_
+    - I/O error occurred during established communication with the Miniserver, most likely due to network connectivity issues, Miniserver going offline or Loxone Config is uploading a new configuration. A reconnect attempt will be made soon. Please consult detailed message against one of the following:
+      - _"Text message size &lsqbXX&rsqb exceeds maximum size &lsqbYY&rsqb"_ - adjust text message size in advanced parameters to be above XX value
+      - _"Binary message size &lsqbXX&rsqb exceeds maximum size &lsqbYY&rsqb"_ - adjust binary message size in advanced parameters to be above XX value
+  - _User authentication timeout_
+    - Authentication procedure took too long time and Miniserver closed connection. It should not occur under normal conditions and may indicate performance issue on binding's OS side.
+  - _Timeout due to no activity_
+    - Miniserver closed connection because there was no activity from binding. It should not occur under normal conditions, as it is prevented by sending keep-alive messages from the binding to the Miniserver. By default Miniserver's timeout is 5 minutes and period between binding's keep-alive messages is 4 minutes. If you see this error, try changing the keep-alive period in binding's configuration to a smaller value.
+  - _Other_
+    - An exception occured and its details will be displayed
 
 ### Security
 
@@ -90,7 +95,7 @@ The binding supports the following authentication methods, which are selected au
 | Hash-based  | 8.x                 | HMAC-SHA1 hash on user and password                                            | None       | None                                                  |
 | Token-based | From 9.x                 | Token acquired on the first connection and used later instead of the password. | AES-256    | JRE must have unrestricted security policy configured |
 
-For the token-based authentication, the password is required only for the first login and acquiring the token. After the token is acquired, the password is cleared in the binding configuration. 
+For the token-based authentication, the password is required only for the first login and acquiring the token. After the token is acquired, the password is cleared in the binding configuration.
 
 The acquired token will remain active for several weeks following the last succesful authentication with this token. If the connection is not established used during that period and the token expires, a user password has to be re-entered in the binding settings to acquire a new token.
 
@@ -125,19 +130,19 @@ Currently supported controls are presented in the table below.
 | EIBDimmer                                                 | EIB Dimmer (undocumented)                                                                                                                                                                                                                                                                                                 | `Dimmer`                                                       | `OnOffType.*`, `PercentType`, `IncreaseDecreaseType.*`                                                                                                                                               |
 | InfoOnlyAnalog                                            | Analog [virtual inputs](https://www.loxone.com/enen/kb/virtual-inputs-outputs/) (virtual state)                                                                                                                                                                                                                           | `Number`                                                       | Read-only channel                                                                                                                                                                                    |
 | InfoOnlyDigital                                           | Digital [virtual inputs](https://www.loxone.com/enen/kb/virtual-inputs-outputs/) (virtual state)                                                                                                                                                                                                                          | `String`                                                       | Read-only channel                                                                                                                                                                                    |
-| IRoomControllerV2                                         | [Intelligent Room Controller V2](https://www.loxone.com/enen/kb/irc-v2/)                                                                                                                                                                                                                                                  | `Number` - active mode                                         | Read-only channel                                                                                                                                                                                    | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - operating mode                                      | `DecimalType` - operating mode                                                                                                                                                                       | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - prepare state                                       | Read-only channel                                                                                                                                                                                    | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Switch` - open window                                         | Read-only channel                                                                                                                                                                                    | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - current temperature                                 | Read-only channel                                                                                                                                                                                    | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - target temperature                                  | `DecimalType`                                                                                                                                                                                        | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - comfort temperature                                 | `DecimalType`                                                                                                                                                                                        | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - comfort temperature offset                          | `DecimalType`                                                                                                                                                                                        | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - comfort tolerance                                   | `DecimalType`                                                                                                                                                                                        | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - absent minimum temperature offset                   | `DecimalType`                                                                                                                                                                                        | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - absent maximum temperature offset                   | `DecimalType`                                                                                                                                                                                        | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - frost protect temperature                           | Read-only channel                                                                                                                                                                                    | 
-|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - heat protect temperature                            | Read-only channel                                                                                                                                                                                    | 
+| IRoomControllerV2                                         | [Intelligent Room Controller V2](https://www.loxone.com/enen/kb/irc-v2/)                                                                                                                                                                                                                                                  | `Number` - active mode                                         | Read-only channel                                                                                                                                                                                    |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - operating mode                                      | `DecimalType` - operating mode                                                                                                                                                                       |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - prepare state                                       | Read-only channel                                                                                                                                                                                    |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Switch` - open window                                         | Read-only channel                                                                                                                                                                                    |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - current temperature                                 | Read-only channel                                                                                                                                                                                    |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - target temperature                                  | `DecimalType`                                                                                                                                                                                        |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - comfort temperature                                 | `DecimalType`                                                                                                                                                                                        |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - comfort temperature offset                          | `DecimalType`                                                                                                                                                                                        |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - comfort tolerance                                   | `DecimalType`                                                                                                                                                                                        |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - absent minimum temperature offset                   | `DecimalType`                                                                                                                                                                                        |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - absent maximum temperature offset                   | `DecimalType`                                                                                                                                                                                        |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - frost protect temperature                           | Read-only channel                                                                                                                                                                                    |
+|                                                           |                                                                                                                                                                                                                                                                                                                           | `Number` - heat protect temperature                            | Read-only channel                                                                                                                                                                                    |
 | Jalousie                                                  | Blinds, [Automatic Blinds](https://www.loxone.com/enen/kb/automatic-blinds/), Automatic Blinds Integrated                                                                                                                                                                                                                 | `Rollershutter` - main control element                         | `UpDownType.*`, `StopMoveType.*`, `PercentType`                                                                                                                                                      |
 |                                                           |                                                                                                                                                                                                                                                                                                                           | `Switch` - shading                                             | `OnOffType.ON` - shade                                                                                                                                                                               |
 |                                                           |                                                                                                                                                                                                                                                                                                                           | `Switch` - automatic shading                                   | `OnOffType.*` - automatic shading enabled/disabled                                                                                                                                                   |
@@ -169,24 +174,24 @@ If your control is supported, but binding does not recognize it, please check if
 
 Most controls have a single channel. Such channel ID is defined in the following way:
 
-*   `loxone:miniserver:<serial>:<control-UUID>`
+- `loxone:miniserver:<serial>:<control-UUID>`
 
 Controls, which have more than one channel, define the channel ID of the extra channels in the following way:
 
-*    `loxone:miniserver:<serial>:<control-UUID>-<channel-index>`, where `<channel-index>` is equal to 1, 2, ...
+- `loxone:miniserver:<serial>:<control-UUID>-<channel-index>`, where `<channel-index>` is equal to 1, 2, ...
 
 Channel label is defined in the following way:
 
-*   For controls that belong to a room: `<Room name> / <Control name>`
-*   For controls without a room: `<Control name>`
+- For controls that belong to a room: `<Room name> / <Control name>`
+- For controls without a room: `<Control name>`
 
 Channels have the default tags as follows:
 
-*   **Dimmer**: when it belongs to a category of _Lights_ type, the channel will be tagged with _Lighting_ tag. 
-*   **InfoOnlyAnalog**: when it belongs to a category of _Indoor Temperature_ type, it will be tagger with _CurrentTemperature_ tag.
-*   **Jalousie**: main rollershutter channel will be tagged with _Blinds_ tag. Shade and automatic shade switch channels will be tagged with _Switchable_ tag.
-*   **LightController (V1 and V2)**: main channel with selected scene will be tagged with _Scene_ tag.
-*   **Switch**, **TimedSwitch** and **Pushbutton** controls: when it belongs to a category that is of a _Lights_ type, the channel will be tagged with _Lighting_ tag. Otherwise it will be tagged with _Switchable_ tag.
+- **Dimmer**: when it belongs to a category of _Lights_ type, the channel will be tagged with _Lighting_ tag.
+- **InfoOnlyAnalog**: when it belongs to a category of _Indoor Temperature_ type, it will be tagger with _CurrentTemperature_ tag.
+- **Jalousie**: main rollershutter channel will be tagged with _Blinds_ tag. Shade and automatic shade switch channels will be tagged with _Switchable_ tag.
+- **LightController (V1 and V2)**: main channel with selected scene will be tagged with _Scene_ tag.
+- **Switch**, **TimedSwitch** and **Pushbutton** controls: when it belongs to a category that is of a _Lights_ type, the channel will be tagged with _Lighting_ tag. Otherwise it will be tagged with _Switchable_ tag.
 
 ## Advanced Parameters
 
@@ -195,7 +200,9 @@ If a parameter is not explicitly defined, binding will use its default value.
 
 To define a parameter value in a .things file, please refer to it by parameter's ID, for example:
 
-        keepAlivePeriod=120
+```text
+keepAlivePeriod=120
+```
 
 ### Security
 
@@ -228,47 +235,47 @@ They can be tuned, when abnormal behavior of the binding is observed, which can
 
 ## Limitations
 
-*   As there is no push button item type in openHAB, Loxone's push button is an openHAB's switch, which always generates a short pulse on changing its state to on. If you use simple UI mode and framework generates items for you, switches for push buttons will still be toggle switches. To change it to the push button style, you have to create item manually with `autoupdate=false` parameter. An example of such item definition is given in the _Items_ section above.
+- As there is no push button item type in openHAB, Loxone's push button is an openHAB's switch, which always generates a short pulse on changing its state to on. If you use simple UI mode and framework generates items for you, switches for push buttons will still be toggle switches. To change it to the push button style, you have to create item manually with `autoupdate=false` parameter. An example of such item definition is given in the _Items_ section above.
 
 ## Automatic Configuration Example
 
 The simplest and quickest way of configuring a Loxone Miniserver with openHAB is to use automatic configuration features:
 
-*   Make sure your Miniserver is up and running and on the same network segment as openHAB server.
-*   Add Loxone binding from the available `Add-ons`.
-*   In `Configuration/System` page, set `Item Linking` to `Simple Mode` (don't forget to save your choice).
-*   Add your Miniserver Thing from the `Inbox`, after automatic discovery is performed by the framework during binding initialization.
-*   Configure your Miniserver by editing Miniserver Thing in `Configuration/Things` page and providing user name and password.
-*   Miniserver Thing should go online. Channels and Items will be automatically created and configured.
-*   On the `Control` page, you can test Miniserver Items and interact with them.
-*   As the user interface, you may use [HABPanel](https://www.openhab.org/docs/configuration/habpanel.html), where all Miniserver's items are ready for picking up, using entirely the graphical user interface.
+- Make sure your Miniserver is up and running and on the same network segment as openHAB server.
+- Add Loxone binding from the available `Add-ons`.
+- In `Configuration/System` page, set `Item Linking` to `Simple Mode` (don't forget to save your choice).
+- Add your Miniserver Thing from the `Inbox`, after automatic discovery is performed by the framework during binding initialization.
+- Configure your Miniserver by editing Miniserver Thing in `Configuration/Things` page and providing user name and password.
+- Miniserver Thing should go online. Channels and Items will be automatically created and configured.
+- On the `Control` page, you can test Miniserver Items and interact with them.
+- As the user interface, you may use [HABPanel](https://www.openhab.org/docs/configuration/habpanel.html), where all Miniserver's items are ready for picking up, using entirely the graphical user interface.
 
 ## Manual Configuration Example
 
 A more advanced setup requires manual creation and editing of openHAB configuration files, according to the instructions provided in [configuration user guide](https://www.openhab.org/docs/configuration/).
 In this example we will manually configure:
 
-*   A Miniserver with serial number 504F2414780F, available at IP 192.168.0.220 and with web services port 80
-*   A Miniserver's user named "kryten" and password "jmc2017"
-*   Items for:
-    *   Temperature of the Miniserver - a Virtual Analog State functional block
-    *   State of a garage door - a Virtual Digital State funtional block (ON=door open, OFF=door closed)
-    *   Kitchen lights switch - a Switch Subcontrol at the AI1 output of a Lighting Controller functional block (with a tag recognizable by Alexa service)
-    *   Pushbutton to switch all lights off - a Virtual Input of Pushbutton type functional block (pushbutton realized by adding `autoupdate="false"` parameter)
-    *   Kitchen blinds - a Jalousie functional block
-    *   Lighting scene - a Lighting Controller functional block
-    *   Output valve selection for garden watering - 8x Radio Button functional block, where only one valve can be open at a time
-    *   A text displaying current alarm's state - a State functional block
+- A Miniserver with serial number 504F2414780F, available at IP 192.168.0.220 and with web services port 80
+- A Miniserver's user named "kryten" and password "jmc2017"
+- Items for:
+  - Temperature of the Miniserver - a Virtual Analog State functional block
+  - State of a garage door - a Virtual Digital State funtional block (ON=door open, OFF=door closed)
+  - Kitchen lights switch - a Switch Subcontrol at the AI1 output of a Lighting Controller functional block (with a tag recognizable by Alexa service)
+  - Pushbutton to switch all lights off - a Virtual Input of Pushbutton type functional block (pushbutton realized by adding `autoupdate="false"` parameter)
+  - Kitchen blinds - a Jalousie functional block
+  - Lighting scene - a Lighting Controller functional block
+  - Output valve selection for garden watering - 8x Radio Button functional block, where only one valve can be open at a time
+  - A text displaying current alarm's state - a State functional block
 
 ### things/loxone.things:
 
-```
+```java
 loxone:miniserver:504F2414780F [ user="kryten", password="jmc2017", host="192.168.0.220", port=80 ]
 ```
 
 ### items/loxone.items:
 
-```
+```java
 // Type       ID              Label                                  Icon          Tags         Settings
 
 Number        Miniserver_Temp "Miniserver temperature: [%.1f °C]"    <temperature>              {channel="loxone:miniserver:504F2414780F:0F2F2133-017D-3C82-FFFF203EB0C34B9E"}
@@ -290,7 +297,7 @@ String        Alarm_State     "Alarm state [%s]"                     <alarm>
 
 ### sitemaps/loxone.sitemap:
 
-```
+```perl
 sitemap loxone label="Loxone Example Menu"
 {
     Frame label="Demo Controls" {
@@ -315,7 +322,7 @@ sitemap loxone label="Loxone Example Menu"
 
 ### transform/garagedoor.map:
 
-```java
+```text
 OFF=Closed
 ON=Open
 -=Unknown
diff --git a/bundles/org.openhab.binding.luftdateninfo/README.md b/bundles/org.openhab.binding.luftdateninfo/README.md
index ff076ced1d5d4..9cb7bceb98734 100644
--- a/bundles/org.openhab.binding.luftdateninfo/README.md
+++ b/bundles/org.openhab.binding.luftdateninfo/README.md
@@ -24,7 +24,7 @@ Choose either a local IP address of your personal owned sensor _or_ a sensor id
 | Parameter       | Description                                                          |
 |-----------------|----------------------------------------------------------------------|
 | ipAddress       | Local IP address of your personal owned sensor                       |
-| sensorid        | Sensor ID obtained from https://deutschland.maps.sensor.community/   |
+| sensorid        | Sensor ID obtained from <https://deutschland.maps.sensor.community/>   |
 
 ### Local Sensor
 
@@ -36,23 +36,23 @@ Please check in your browser if you can access your sensor with your local IP ad
 
 Perform the following steps to get the appropriate Sensor ID
 
-* Go to to [luftdaten.info map](https://deutschland.maps.sensor.community/)
-* Choose your desired value in bottom list - now only the Sensors are displayed which are supporting this
-* Click on your / any Sensor and the ID is displayed in the top right corner. Note: Sensor ID is just the number without beginning hash #
-* Enter this Sensor ID into the thing configuration
+- Go to to [luftdaten.info map](https://deutschland.maps.sensor.community/)
+- Choose your desired value in bottom list - now only the Sensors are displayed which are supporting this
+- Click on your / any Sensor and the ID is displayed in the top right corner. Note: Sensor ID is just the number without beginning hash #
+- Enter this Sensor ID into the thing configuration
 
 ![Luftdaten.info Logo](doc/LuftdatenInfo-Map.png)
 
 ## Channels
 
-### Particulate Sensor 
+### Particulate Sensor
 
 | Channel ID           | Item Type            | Description                              |
 |----------------------|----------------------|------------------------------------------|
 | pm25                 | Number:Density       | [Ultrafine particulates](https://en.wikipedia.org/wiki/Particulates#Size,_shape_and_solubility_matter) microgram per cubic meter |
 | pm100                | Number:Density       | [Coarse particulate matter](https://en.wikipedia.org/wiki/Particulates#Size,_shape_and_solubility_matter) microgram per cubic meter  |
 
-### Conditions Sensor 
+### Conditions Sensor
 
 | Channel ID           | Item Type            | Description                              |
 |----------------------|----------------------|------------------------------------------|
@@ -61,8 +61,7 @@ Perform the following steps to get the appropriate Sensor ID
 | pressure             | Number:Pressure      | Atmospheric Pressure (not supported by all sensors) |
 | pressure-sea         | Number:Pressure      | Atmospheric Pressure on sea level (not supported by all sensors)  |
 
-
-### Noise Sensor 
+### Noise Sensor
 
 | Channel ID           | Item Type            | Description                                          |
 |----------------------|----------------------|------------------------------------------------------|
@@ -70,14 +69,13 @@ Perform the following steps to get the appropriate Sensor ID
 | noise-min            | Number:Dimensionless | Minimum noise covered in the last 2.5 minutes in db  |
 | noise-main           | Number:Dimensionless | Maximum noise covered in the last 2.5 minutes in db  |
 
-
 ## Full Example
 
 ### Things
 
 luftdaten.things
 
-```
+```java
 Thing luftdateninfo:particulate:pm_sensor   "PM Sensor"         [ ipAddress=192.168.178.50 ]
 Thing luftdateninfo:conditions:cond_sensor  "Condition Sensor"  [ sensorid=28843 ]
 Thing luftdateninfo:noise:noise_sensor      "Noise Sensor"      [ sensorid=39745 ]
@@ -87,7 +85,7 @@ Thing luftdateninfo:noise:noise_sensor      "Noise Sensor"      [ sensorid=39745
 
 luftdaten.items
 
-```
+```java
 Number:Density PM_25                "PM2.5"                 { channel="luftdateninfo:particulate:pm_sensor:pm25" } 
 Number:Density PM_100               "PM10"                  { channel="luftdateninfo:particulate:pm_sensor:pm100" } 
 
@@ -105,7 +103,7 @@ Number:Dimensionless LDI_NoiseMax   "Noise max"             { channel="luftdaten
 
 LuftdatenInfo.sitemap
 
-```
+```perl
 sitemap LuftdatenInfo label="LuftdatenInfo" {
         Text item=PM_25                     label="Particulate Matter 2.5 [%.1f %unit%]"    
         Text item=PM_100                    label="Particulate Matter 10 [%.1f %unit%]"     
diff --git a/bundles/org.openhab.binding.lutron/README.md b/bundles/org.openhab.binding.lutron/README.md
index 8692bd4480bf2..6e4199f6c84d3 100644
--- a/bundles/org.openhab.binding.lutron/README.md
+++ b/bundles/org.openhab.binding.lutron/README.md
@@ -3,10 +3,10 @@
 This binding integrates with [Lutron](https://www.lutron.com) lighting control and home automation systems.
 It contains support for four different types of Lutron systems via different bridge things:
 
-* RadioRA 2, HomeWorks QS, Caseta, RA2 Select, and other current systems that can be controlled via Lutron Integration Protocol (LIP) or LEAP
-* The original RadioRA system, referred to here as RadioRA Classic
-* Legacy HomeWorks RS232 Processors
-* Grafik Eye 3x/4x systems with GRX-PRG or GRX-CI-PRG control interfaces
+- RadioRA 2, HomeWorks QS, Caseta, RA2 Select, and other current systems that can be controlled via Lutron Integration Protocol (LIP) or LEAP
+- The original RadioRA system, referred to here as RadioRA Classic
+- Legacy HomeWorks RS232 Processors
+- Grafik Eye 3x/4x systems with GRX-PRG or GRX-CI-PRG control interfaces
 
 Each is described in a separate section below.
 
@@ -22,29 +22,29 @@ The binding has not been tested with Quantum, QS Standalone, myRoom Plus, or Ath
 
 This binding currently supports the following thing types:
 
-* **ipbridge** - The Lutron main repeater/processor/hub
-* **leapbridge** - Experimental bridge that uses LEAP protocol (Caseta & RA2 Select only)
-* **dimmer** - Light dimmer
-* **switch** - Switch or relay module
-* **fan** - Fan controller
-* **occupancysensor** - Occupancy/vacancy sensor
-* **ogroup** - Occupancy group
-* **keypad** - Lutron seeTouch or Hybrid seeTouch Keypad
-* **ttkeypad** - Tabletop seeTouch Keypad
-* **intlkeypad** - International seeTouch Keypad (HomeWorks QS only)
-* **palladiomkeypad** - Palladiom Keypad (HomeWorks QS only)
-* **pico** - Pico Keypad
-* **grafikeyekeypad** - GRAFIK Eye QS Keypad (RadioRA 2/HomeWorks QS only)
-* **virtualkeypad** - Repeater/processor integration buttons or Caseta Smart Bridge scene buttons
-* **vcrx** - Visor control receiver module (VCRX)
-* **qsio** - QS IO Interface (HomeWorks QS only)
-* **wci** - QS Wallbox Closure Interface (WCI) (HomeWorks QS only)
-* **cco** - Contact closure output module or VCRX CCO
-* **shade** - Lutron shade, motorized drape, or motor controller
-* **blind** - Lutron venetian blind or horizontal sheer blind [**Experimental**]
-* **greenmode** - Green Mode subsystem
-* **timeclock** - Scheduling subsystem
-* **sysvar** - System state variable (HomeWorks QS only) [**Experimental**]
+- **ipbridge** - The Lutron main repeater/processor/hub
+- **leapbridge** - Experimental bridge that uses LEAP protocol (Caseta & RA2 Select only)
+- **dimmer** - Light dimmer
+- **switch** - Switch or relay module
+- **fan** - Fan controller
+- **occupancysensor** - Occupancy/vacancy sensor
+- **ogroup** - Occupancy group
+- **keypad** - Lutron seeTouch or Hybrid seeTouch Keypad
+- **ttkeypad** - Tabletop seeTouch Keypad
+- **intlkeypad** - International seeTouch Keypad (HomeWorks QS only)
+- **palladiomkeypad** - Palladiom Keypad (HomeWorks QS only)
+- **pico** - Pico Keypad
+- **grafikeyekeypad** - GRAFIK Eye QS Keypad (RadioRA 2/HomeWorks QS only)
+- **virtualkeypad** - Repeater/processor integration buttons or Caseta Smart Bridge scene buttons
+- **vcrx** - Visor control receiver module (VCRX)
+- **qsio** - QS IO Interface (HomeWorks QS only)
+- **wci** - QS Wallbox Closure Interface (WCI) (HomeWorks QS only)
+- **cco** - Contact closure output module or VCRX CCO
+- **shade** - Lutron shade, motorized drape, or motor controller
+- **blind** - Lutron venetian blind or horizontal sheer blind [**Experimental**]
+- **greenmode** - Green Mode subsystem
+- **timeclock** - Scheduling subsystem
+- **sysvar** - System state variable (HomeWorks QS only) [**Experimental**]
 
 ## Discovery
 
@@ -92,14 +92,14 @@ If you have a system that supports both protocols, you must decide which you wis
 
 You should be aware of the following functional differences between the protocols:
 
-* Using LIP on Caseta you can’t receive notifications of occupancy group status changes (occupied/unoccupied/unknown), but using LEAP you can.
-* Conversely, LIP provides notifications of keypad key presses, while LEAP does not (as far as is currently known).
+- Using LIP on Caseta you can’t receive notifications of occupancy group status changes (occupied/unoccupied/unknown), but using LEAP you can.
+- Conversely, LIP provides notifications of keypad key presses, while LEAP does not (as far as is currently known).
 This means that using ipbridge you can trigger rules and take actions on keypad key presses/releases, but using leapbridge you can’t.
-* Caseta and RA2 Select device discovery is supported via LEAP, but not via LIP.
-* The leapbridge is a bit more complicated to configure because LEAP uses an SSL connections and authenticates using certificates.
-* LIP is a publicly documented protocol, while LEAP is not. This means that Lutron could make a change that breaks LEAP support at any time.
+- Caseta and RA2 Select device discovery is supported via LEAP, but not via LIP.
+- The leapbridge is a bit more complicated to configure because LEAP uses an SSL connections and authenticates using certificates.
+- LIP is a publicly documented protocol, while LEAP is not. This means that Lutron could make a change that breaks LEAP support at any time.
 
-It is possible to run leapbridge and ipbridge at the same time, for the same bridge device, but each managed device (e.g. keypad or dimmer) should only be configured through *one* bridge.
+It is possible to run leapbridge and ipbridge at the same time, for the same bridge device, but each managed device (e.g. keypad or dimmer) should only be configured through _one_ bridge.
 Remember that LEAP device IDs and LIP integration IDs are not necessarily equal!
 
 #### ipbridge
@@ -131,7 +131,7 @@ Note that the user which openHAB runs under must have permission to read the fil
 
 Thing configuration file example:
 
-```
+```java
 Bridge lutron:ipbridge:radiora2 [ ipAddress="192.168.1.2", user="lutron", password="integration" ] {
     Thing ...
     Thing ...
@@ -167,7 +167,7 @@ It should not normally need to be changed.
 
 Thing configuration file example:
 
-```
+```java
 Bridge lutron:leapbridge:caseta [ ipAddress="192.168.1.3", keystore="/home/openhab/lutron.keystore", keystorePassword="secret" ] {
     Thing ...
     Thing ...
@@ -189,12 +189,12 @@ The `onToLast` parameter is a boolean that defaults to false.
 If set to "true", the dimmer will go to its last non-zero level when sent an ON command.
 If the last non-zero level cannot be determined, the value of `onLevel` will be used instead.
 
-A **dimmer** thing has a single channel *lightlevel* with type Dimmer and category DimmableLight.
+A **dimmer** thing has a single channel _lightlevel_ with type Dimmer and category DimmableLight.
 The **dimmer** thing was previously also used to control fan speed controllers, but now you should use the **fan** thing instead.
 
 Thing configuration file example:
 
-```
+```java
 Thing dimmer livingroom [ integrationId=8, fadeInTime=0.5, fadeOutTime=5 ]
 ```
 
@@ -202,9 +202,9 @@ The **dimmer** thing supports the thing action `setLevel(Double level, Double fa
 
 The parameters are:
 
-* `level` The new light level to set (0-100)
-* `fadeTime` The time in seconds over which the dimmer should fade to the new level
-* `delayTime` The time in seconds to delay before starting to fade to the new level
+- `level` The new light level to set (0-100)
+- `fadeTime` The time in seconds over which the dimmer should fade to the new level
+- `delayTime` The time in seconds to delay before starting to fade to the new level
 
 The fadeTime and delayTime parameters are significant to 2 digits after the decimal point (i.e. to hundredths of a second), but some Lutron systems may round the time to the nearest 0.25 seconds when processing the command.
 Times of 100 seconds or more will be rounded to the nearest integer value.
@@ -214,11 +214,11 @@ See below for an example rule using thing actions.
 #### Switches
 
 Switches take no additional parameters besides `integrationId`.
-A **switch** thing has a single channel *switchstatus* with type Switch and category Switch.
+A **switch** thing has a single channel _switchstatus_ with type Switch and category Switch.
 
 Thing configuration file example:
 
-```
+```java
 Thing switch porch [ integrationId=8 ]
 ```
 
@@ -226,11 +226,11 @@ Thing switch porch [ integrationId=8 ]
 
 Fan speed controllers are interfaced with using the **fan** thing.
 It accepts no additional parameters besides `integrationId`.
-A **fan** thing has two channels, *fanspeed* and *fanlevel*.
+A **fan** thing has two channels, _fanspeed_ and _fanlevel_.
 
 Thing configuration file example:
 
-```
+```java
 Thing fan porchfan [ integrationId=12 ]
 ```
 
@@ -242,14 +242,14 @@ For Caseta Smart Motion Sensors, you must use the **group** thing instead.
 
 It accepts no configuration parameters other than `integrationId`.
 
-The binding creates one *occupancystatus* channel, Item type Switch, category Motion.
+The binding creates one _occupancystatus_ channel, Item type Switch, category Motion.
 It is read-only, and ignores all commands.
 The channel state can be monitored for occupied (ON) or unoccupied (OFF) events coming from the sensor.
 The sensors cannot be queried for their state, so initial channel state at startup will be undefined (NULL).
 
 Thing configuration file example:
 
-```
+```java
 Thing occupancysensor shopsensor [ integrationId=7 ]
 ```
 
@@ -257,15 +257,15 @@ Thing occupancysensor shopsensor [ integrationId=7 ]
 
 A **ogroup** thing interfaces to an occupancy group, which shows occcupancy/vacancy status for an area or room with one or more occupancy sensors.
 On RadioRA2 and HomeWorks QS systems, you should generally choose to interface to either an occupancy group or individual occupancy sensors for a given area.
-On Caseta systems, you cannot interface to individual sensors and must use the *ogroup* thing.
+On Caseta systems, you cannot interface to individual sensors and must use the _ogroup_ thing.
 The `integrationId` parameter must be set to the occupancy group ID.
 
-The binding creates one read-only *groupstate* channel, item type String, category Motion.
+The binding creates one read-only _groupstate_ channel, item type String, category Motion.
 The value can be "OCCUPIED", "UNOCCUPIED", or "UNKNOWN".
 
 Thing configuration file example:
 
-```
+```java
 Thing ogroup lrgroup [ integrationId=7 ]
 ```
 
@@ -291,12 +291,12 @@ The `autorelease` parameter also effects behavior when sending an ON command to
 If `autorelease` is set, the handler will send action "release" to the device component immediately after sending action "press".
 When the controller responds, the channel state will be transitioned back to OFF.
 
-A channel *button[nn]* with item type Switch and category Switch is created for each button, and a channel *led[nn]* with item type Switch and category Light is created for each button indicator LED.
+A channel _button[nn]_ with item type Switch and category Switch is created for each button, and a channel _led[nn]_ with item type Switch and category Light is created for each button indicator LED.
 You can monitor button channels for ON and OFF state changes to indicate button presses and releases, and send ON and OFF commands to remotely press and release buttons.
 Ditto for the indicator LED channels.
 Note, however, that version 11.6 or higher of the RadioRA 2 software may be required in order to drive keypad LED states, and then this may only be done on unbound buttons.
 
-Component numbering: For button and LED layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.104 (https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf).
+Component numbering: For button and LED layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.104 (<https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf>).
 If you are having problems determining which channels have been created for a given keypad model, select the appropriate keypad thing under Settings/Things in the Administration UI and click on the Channels tab.
 You can also run the command `things show <thingUID>` (e.g. `things show lutron:keypad:radiora2:entrykeypad`) from the openHAB CLI to list the channels.
 
@@ -304,13 +304,13 @@ Supported settings for `model` parameter: H1RLD, H2RLD, H3BSRL, H3S, H4S, H5BRL,
 
 Thing configuration file example:
 
-```
+```java
 Thing keypad entrykeypad [ integrationId=10, model="W7B" autorelease=true ]
 ```
 
 Example rule triggered by a keypad button press:
 
-```
+```java
 rule ExampleScene
 when
   Item entrykeypad_button4 received update ON
@@ -325,16 +325,15 @@ Tabletop seeTouch keypads use the **ttkeypad** thing.
 It accepts the same `integrationId`, `model`, and `autorelease` parameters and creates the same channel types as the **keypad** thing.
 See the **keypad** section above for a full discussion of configuration and use.
 
-Component numbering: For button and LED layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.110 (https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf).
+Component numbering: For button and LED layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.110 (<https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf>).
 If you are having problems determining which channels have been created for a given keypad model, select the appropriate ttkeypad thing under Settings/Things in the Administration UI and click on the Channels tab.
 You can also run the command `things show <thingUID>` (e.g. `things show lutron:ttkeypad:radiora2:bedroomkeypad`) from the openHAB CLI to list the channels.
 
-
 Supported settings for `model` parameter: T5RL, T10RL, T15RL, T5CRL, T10CRL, T15CRL, Generic (default)
 
 Thing configuration file example:
 
-```
+```java
 Thing ttkeypad bedroomkeypad [ integrationId=11, model="T10RL" autorelease=true ]
 ```
 
@@ -344,11 +343,11 @@ International seeTouch keypads used in the HomeWorks QS system use the **intlkey
 It accepts the same `integrationId`, `model`, and `autorelease` parameters and creates the same button and LED channel types as the **keypad** thing.
 See the **keypad** section above for a full discussion of configuration and use.
 
-To support this keypad's contact closure inputs, CCI channels named *cci1* and *cci2* are created with item type Contact and category Switch.
+To support this keypad's contact closure inputs, CCI channels named _cci1_ and _cci2_ are created with item type Contact and category Switch.
 They are marked as Advanced, so you will need to check "Show advanced" in order to see them listed in the Administration UI.
 They present ON/OFF states the same as a keypad button.
 
-Component numbering: For button and LED layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.107 (https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf).
+Component numbering: For button and LED layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.107 (<https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf>).
 If you are having problems determining which channels have been created for a given keypad model, select the appropriate intlkeypad thing under Settings/Things in the Administration UI and click on the Channels tab.
 You can also run the command `things show <thingUID>` (e.g. `things show lutron:intlkeypad:hwprocessor:kitchenkeypad`) from the openHAB CLI to list the channels.
 
@@ -356,7 +355,7 @@ Supported settings for `model` parameter: 2B, 3B, 4B, 5BRL, 6BRL, 7BRL, 8BRL, 10
 
 Thing configuration file example:
 
-```
+```java
 Thing intlkeypad kitchenkeypad [ integrationId=15, model="10BRL" autorelease=true ]
 ```
 
@@ -366,7 +365,7 @@ Palladiom keypads used in the HomeWorks QS system use the **palladiomkeypad** th
 It accepts the same `integrationId`, `model`, and `autorelease` parameters and creates the same button and LED channel types as the **keypad** thing.
 See the **keypad** section above for a full discussion of configuration and use.
 
-Component numbering: For button and LED layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.95 (https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf).
+Component numbering: For button and LED layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.95 (<https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf>).
 If you are having problems determining which channels have been created for a given keypad model, select the appropriate palladiomkeypad thing under Settings/Things in the Administration UI and click on the Channels tab.
 You can also run the command `things show <thingUID>` (e.g. `things show lutron:palladiomkeypad:hwprocessor:kitchenkeypad`) from the openHAB CLI to list the channels.
 
@@ -374,11 +373,10 @@ Supported settings for `model` parameter: 2W, 3W, 4W, RW, 22W, 24W, 42W, 44W, 2R
 
 Thing configuration file example:
 
-```
+```java
 Thing palladiomkeypad kitchenkeypad [ integrationId=16, model="4W" autorelease=true ]
 ```
 
-
 #### Pico Keypads
 
 Pico keypads use the **pico** thing.
@@ -386,7 +384,7 @@ It accepts the same `integrationId`, `model`, and `autorelease` parameters and c
 The only difference is that no LED channels will be created, since Pico keypads have no indicator LEDs.
 See the discussion above for a full discussion of configuration and use.
 
-Component numbering: For button layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.113 (https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf).
+Component numbering: For button layouts and numbering, see the Lutron Integration Protocol Guide (rev. AA) p.113 (<https://www.lutron.com/TechnicalDocumentLibrary/040249.pdf>).
 If you are having problems determining which channels have been created for a given keypad model, select the appropriate pico thing under Settings/Things in the Administration UI and click on the Channels tab.
 You can also run the command `things show <thingUID>` (e.g. `things show lutron:pico:radiora2:hallpico`) from the openHAB CLI to list the channels.
 
@@ -394,7 +392,7 @@ Supported settings for `model` parameter: 2B, 2BRL, 3B, 3BRL, 4B, Generic (defau
 
 Thing configuration file example:
 
-```
+```java
 Thing pico hallpico [ integrationId=12, model="3BRL", autorelease=true ]
 ```
 
@@ -405,14 +403,14 @@ They can be used as peripheral devices in a RadioRA 2 or HomeWorks QS system, or
 The **grafikeyekeypad** thing is used to interface to the GRAFIK Eye QS front panel keypad when it is used in a RadioRA 2 or HomeWorks QS system.
 In this configuration, the integrated dimmers will appear to openHAB as separate output devices.
 
-If your GRAFIK Eye is being used as a stand-alone device and is not integrated in to a RadioRA 2 or HomeWorks QS system, then *this is not the thing you are looking for*.
+If your GRAFIK Eye is being used as a stand-alone device and is not integrated in to a RadioRA 2 or HomeWorks QS system, then _this is not the thing you are looking for_.
 You should instead be using the **grafikeye** thing (see below).
 
 The **grafikeyekeypad** thing accepts the same `integrationId`, `model`, and `autorelease` parameters and creates the same button, LED, and CCI, channel types as the other keypad things (see above).
 The model parameter should be set to indicate whether there are zero, one, two, or three columns of buttons on the left side of the panel.
 Note that this count does not include the column of 5 scene buttons always found on the right side of the panel.
 
-To support the GRAFIK Eye's contact closure input, a CCI channel named *cci1* will be created with item type Contact and category Switch.
+To support the GRAFIK Eye's contact closure input, a CCI channel named _cci1_ will be created with item type Contact and category Switch.
 It is marked as Advanced, so you will need to check "Show advanced" in order to see it listed in the Administration UI.
 It presents ON/OFF states the same as a keypad button.
 
@@ -424,7 +422,7 @@ Supported settings for `model` parameter: 0COL, 1COL, 2COL, 3COL (default)
 
 Thing configuration file example:
 
-```
+```java
 Thing lutron:grafikeyekeypad:theaterkeypad (lutron:ipbridge:radiora2) [ integrationId=12, model="3COL", autorelease="true" ]
 ```
 
@@ -448,7 +446,7 @@ Supported settings for `model` parameter: Caseta, Other (default)
 
 Thing configuration file example:
 
-```
+```java
 Thing virtualkeypad repeaterbuttons [ integrationId=1, autorelease=true ]
 ```
 
@@ -461,7 +459,7 @@ The contact closure outputs (CCOs) have their own integration IDs and are handle
 Supported options are `integrationId` and `autorelease`.
 Supplying a model is not required, as there is only one model.
 
-To support the contact closure inputs, CCI channels named *cci[n]* are created with item type Contact and category Switch.
+To support the contact closure inputs, CCI channels named _cci[n]_ are created with item type Contact and category Switch.
 The VCRX security (Full/Flash) input controls both the cci1 and cci2 channels, while input connections 1 and 2 map to the cci3 and cci4 channels respectively.
 The cci channels are marked as Advanced, so you will need to check "Show advanced" in order to see them listed in the Administration UI.
 They present OPEN/CLOSED states but do not accept commands since Contact items are read-only in openHAB.
@@ -469,7 +467,7 @@ Note that the `autorelease` option **does not** apply to CCI channels.
 
 Thing configuration file example:
 
-```
+```java
 Thing vcrx vcrx1 [ integrationId=13, autorelease=true ]
 ```
 
@@ -480,7 +478,7 @@ The 5 contact closure inputs (CCIs) are handled by the **qsio** thing.
 The 5 contact closure outputs (CCOs) are handled by the **cco** thing (see below).
 The only configuration option is `integrationId`
 
-To support the contact closure inputs, CCI channels named *cci[n]* are created with item type Contact and category Switch.
+To support the contact closure inputs, CCI channels named _cci[n]_ are created with item type Contact and category Switch.
 They are marked as Advanced, so you will need to check "Show advanced" in order to see them listed in the Administration UI.
 They present OPEN/CLOSED states but do not accept commands as Contact items are read-only in openHAB.
 
@@ -488,7 +486,7 @@ Some functionality may depend on QSE-IO DIP switch settings. See the Lutron docu
 
 Thing configuration file example:
 
-```
+```java
 Thing qsio sensorinputs [ integrationId=42 ]
 ```
 
@@ -506,7 +504,7 @@ See the Lutron documentation for more information.
 
 Thing configuration file example:
 
-```
+```java
 Thing wci specialkeypad [ integrationId=48, autorelease=true ]
 ```
 
@@ -522,7 +520,7 @@ Be aware that the Lutron controller may round the pulse length down to the neare
 **Note:** The **ccopulsed** and **ccomaintained** things are now deprecated.
 You should use the **cco** thing with the appropriate `outputType` setting instead.
 
-Each **cco** thing creates one switch channel called *switchstatus*.
+Each **cco** thing creates one switch channel called _switchstatus_.
 For pulsed CCOs, sending an ON command will close the output for the configured pulse time.
 Sending an OFF command does nothing.
 Because of limitations in RadioRA 2, you cannot monitor the state of a pulsed CCO.
@@ -532,7 +530,7 @@ For maintained CCOs, sending ON and OFF commands works as expected, and the chan
 
 Thing configuration file example:
 
-```
+```java
 Thing cco garage [ integrationId=5, outputType="Pulsed", pulseLength=0.5 ]
 Thing cco relay1 [ integrationId=7, outputType="Maintained"]
 ```
@@ -542,7 +540,7 @@ Thing cco relay1 [ integrationId=7, outputType="Maintained"]
 Each Lutron shade, motorized drape, or QS motor controller output (LQSE-4M-D) is controlled by a **shade** thing.
 The only configuration parameter it accepts is `integrationId`.
 
-A single channel *shadelevel* with item type Rollershutter and category Rollershutter will be created for each **shade** thing.
+A single channel _shadelevel_ with item type Rollershutter and category Rollershutter will be created for each **shade** thing.
 It accepts Percent, Up, Down, Stop and Refresh commands.
 Sending a Percent command will cause the shade to immediately move so as to be open the specified percentage.
 You can also read the current shade level from the channel.
@@ -551,14 +549,14 @@ The shade handler should be compatible with all Lutron devices which appear to t
 
 Motor controller outputs on a LQSE-4M-D (HomeWorks QS only) behave similarly to a shade.
 The only difference is that percentages other than 0% and 100% will be ignored, since arbitrary positioning is not supported by the hardware.
-The value of *shadelevel* for a motor will likewise always be either 0% or 100%, depending on whether the last command sent was Up or Down.
+The value of _shadelevel_ for a motor will likewise always be either 0% or 100%, depending on whether the last command sent was Up or Down.
 
 **Note:** While a shade is moving to a specific level because of a Percent command, the system will report the target level for the shade rather than the actual current level.
 While a shade is moving because of an Up or Down command, it will report the previous level until it stops moving.
 
 Thing configuration file example:
 
-```
+```java
 Thing shade libraryshade [ integrationId=33]
 ```
 
@@ -569,7 +567,7 @@ Besides `integrationId`, it requires that the parameter `type` be set to either
 There is no default.
 If discovery is used, the `type` parameter will set automatically when the **blind** thing is created.
 
-Two channels, *blindliftlevel* and *blindtiltlevel*, with item type Rollershutter and category Rollershutter will be created for each **blind** thing.
+Two channels, _blindliftlevel_ and _blindtiltlevel_, with item type Rollershutter and category Rollershutter will be created for each **blind** thing.
 They control the up/down motion and the slat tilt motions of the blinds, respectively.
 Each channel accepts Percent, Up, Down, Stop and Refresh commands.
 Sending a Percent command will cause the blind to immediately move so as to be open the specified percentage.
@@ -584,7 +582,7 @@ Please comment on your use of it in the openHAB community forum.
 
 Thing configuration file example:
 
-```
+```java
 Thing blind officeblinds [ integrationId=76, type="Venetian"]
 ```
 
@@ -597,7 +595,7 @@ Typically step 1 is "Off" or "Normal", and step 2 is "Green Mode", however other
 The **greenmode** thing is used to interface to the green mode subsystem.
 It requires that the `integrationId` parameter be set to the ID of the green mode subsystem.
 This should generally be 22.
-It creates a single channel *step* that can be used to set or query the active green mode step number.
+It creates a single channel _step_ that can be used to set or query the active green mode step number.
 
 Unlike other Lutron system state settings, the binding is not automatically notified by the bridge device of changes to the current green mode step.
 This may be due to a bug in the Lutron firmware.
@@ -610,7 +608,7 @@ Note that it should usually be unnecessary for the poll interval to be set to le
 
 Thing configuration file example:
 
-```
+```java
 Thing greenmode greenmode [ integrationId=22 ]
 ```
 
@@ -626,24 +624,24 @@ The `integrationId` parameter must be set to the ID of the timeclock subsystem.
 
 It creates the following six channels:
 
-* *clockmode* - Gets or sets the current timeclock mode.
-* *sunrise* - The timeclock's local sunrise time for the current day. Read only. You must send a refresh command (RefreshType.REFRESH) to query the system for the current day's sunrise time, as it is not automatically updated.
-* *sunset* - The timeclock's local sunset time for the current day. Read only. You must send a refresh command to query the system for the current day's sunset time, as it is not automatically updated.
-* *execevent* - Updates with the index number of each executing event. Send an event's index number to start execution of it.
-* *enableevent* - Updates with an event's index number when it is enabled. Send an event's index number to enable it.
-* *disableevent* - Updates with an event's index number when it is disabled. Send an event's index number to disable it.
+- _clockmode_ - Gets or sets the current timeclock mode.
+- _sunrise_ - The timeclock's local sunrise time for the current day. Read only. You must send a refresh command (RefreshType.REFRESH) to query the system for the current day's sunrise time, as it is not automatically updated.
+- _sunset_ - The timeclock's local sunset time for the current day. Read only. You must send a refresh command to query the system for the current day's sunset time, as it is not automatically updated.
+- _execevent_ - Updates with the index number of each executing event. Send an event's index number to start execution of it.
+- _enableevent_ - Updates with an event's index number when it is enabled. Send an event's index number to enable it.
+- _disableevent_ - Updates with an event's index number when it is disabled. Send an event's index number to disable it.
 
-All channels except *clockmode* are marked as advanced.
+All channels except _clockmode_ are marked as advanced.
 
 Thing configuration file example:
 
-```
+```java
 Thing timeclock timeclock [ integrationId=23 ]
 ```
 
 Example rule to refresh sunrise/sunset channels daily and at restart:
 
-```
+```java
 import org.openhab.core.types.RefreshType
 
 rule "Lutron sunrise/sunset daily refresh"
@@ -664,13 +662,13 @@ HomeWorks QS systems allow for conditional programming logic based on state vari
 The **sysvar** thing allows state variable values to be read and set from openHAB.
 This makes sophisticated integration schemes possible.
 Each **sysvar** thing represents one system state variable.
-It has a single channel *varstate* with type Number and category Number.
+It has a single channel _varstate_ with type Number and category Number.
 Automatic discovery of state variables is not yet supported.
 They must be manually configured.
 
 Thing configuration file example:
 
-```
+```java
 Thing sysvar qsstate [ integrationId=80 ]
 ```
 
@@ -713,34 +711,33 @@ Appropriate channels will be created automatically by the keypad, ttkeypad, intl
 |switch     |switchstatus   |OnOffType     |OnOffType                                              |
 |fan        |fanspeed       |StringType    |"OFF","LOW","MEDIUM","MEDIUMHIGH","HIGH"               |
 |fan        |fanlevel       |PercentType   |OnOffType, PercentType                                 |
-|occ. sensor|occupancystatus|OnOffType     |(*readonly*)                                           |
-|ogroup     |groupstate     |StringType    |"OCCUPIED","UNOCCUPIED","UNKNOWN" (*readonly*)         |
+|occ. sensor|occupancystatus|OnOffType     |(_readonly_)                                           |
+|ogroup     |groupstate     |StringType    |"OCCUPIED","UNOCCUPIED","UNKNOWN" (_readonly_)         |
 |cco        |switchstatus   |OnOffType     |OnOffType, RefreshType                                 |
 |keypads    |button*        |OnOffType     |OnOffType                                              |
 |           |led*           |OnOffType     |OnOffType, RefreshType                                 |
-|           |cci*           |OpenClosedType|(*readonly*)                                           |
+|           |cci*           |OpenClosedType|(_readonly_)                                           |
 |shade      |shadelevel     |PercentType   |PercentType, UpDownType, StopMoveType.STOP, RefreshType|
 |blind      |blindliftlevel |PercentType   |PercentType, UpDownType, StopMoveType.STOP, RefreshType|
 |           |blindtiltlevel |PercentType   |PercentType, UpDownType, StopMoveType.STOP, RefreshType|
 |greenmode  |step           |DecimalType   |DecimalType, OnOffType (ON=2,OFF=1), RefreshType       |
 |timeclock  |clockmode      |DecimalType   |DecimalType, RefreshType                               |
-|           |sunrise        |DateTimeType  |RefreshType (*readonly*)                               |
-|           |sunset         |DateTimeType  |RefreshType (*readonly*)                               |
+|           |sunrise        |DateTimeType  |RefreshType (_readonly_)                               |
+|           |sunset         |DateTimeType  |RefreshType (_readonly_)                               |
 |           |execevent      |DecimalType   |DecimalType                                            |
 |           |enableevent    |DecimalType   |DecimalType                                            |
 |           |disableevent   |DecimalType   |DecimalType                                            |
 |sysvar     |varstate       |DecimalType   |DecimalType (rounded/truncated to integer)             |
 
 Most channels receive immediate notifications of device state changes from the Lutron control system.
-The only exceptions are **greenmode** *step*, which is periodically polled and accepts REFRESH commands to initiate immediate polling, and **timeclock** *sunrise* and *sunset*, which must be polled daily using REFRESH commands to retrieve current values.
+The only exceptions are **greenmode** _step_, which is periodically polled and accepts REFRESH commands to initiate immediate polling, and **timeclock** _sunrise_ and _sunset_, which must be polled daily using REFRESH commands to retrieve current values.
 Many other channels accept REFRESH commands to initiate a poll, but sending one should not normally be necessary.
 
-
 ## RadioRA 2/HomeWorks QS Configuration File Examples:
 
 demo.things:
 
-```
+```java
 Bridge lutron:ipbridge:radiora2 [ ipAddress="192.168.1.123", user="lutron", password="integration" ] {
         Thing dimmer lrtable "Table Lamp" @ "Living Room" [ integrationId=45, fadeInTime=0.5, fadeOutTime=5 ]
         Thing dimmer lrtorch "Torch Lamp" @ "Living Room" [ integrationId=44, fadeInTime=0.5, fadeOutTime=5 ]
@@ -760,7 +757,7 @@ Bridge lutron:ipbridge:radiora2 [ ipAddress="192.168.1.123", user="lutron", pass
 
 demo.items:
 
-```
+```java
 Dimmer   LivingRm_TableLamp  "Table Lamp"      { channel="lutron:dimmer:radiora2:lrtable:lightlevel" }
 Switch   FrontYard_PathLight "Path Light"      { channel="lutron:switch:radiora2:path:switchstatus" }
 Switch   LaundryRm_Sensor    "Occ Sensor"      { channel="lutron:occupancysensor:radiora2:laundryocc:occupancystatus" }
@@ -778,7 +775,7 @@ Rollershutter Lib_Shade1     "Shade 1"         { channel="lutron:shade:radiora2:
 
 dimmerAction.rules:
 
-```
+```java
 rule "Test dimmer action"
 when
     Item TestSwitch received command ON
@@ -788,7 +785,6 @@ then
 end
 ```
 
-
 # Lutron RadioRA (Classic) Binding
 
 This binding integrates with the legacy Lutron RadioRA (Classic) lighting system.
@@ -812,7 +808,6 @@ This binding currently supports the following thing types:
 | ra-switch        | Thing   | Switch control                                       |
 | ra-phantomButton | Thing   | Phantom Button to control multiple controls (Scenes) |
 
-
 ## Thing Configuration Parameters
 
 | Thing            | Parameter    | Description                                                            |
@@ -841,7 +836,7 @@ The following channels are supported:
 
 lutronradiora.things
 
-```
+```java
 Bridge lutronradiora:ra-rs232:chronos1 [portName="/dev/ttys002"] {
     Thing ra-dimmer dimmer1 [ zoneNumber=1 ]
     Thing ra-dimmer dimmer2 [ zoneNumber=2 ]
@@ -853,7 +848,7 @@ Bridge lutronradiora:ra-rs232:chronos1 [portName="/dev/ttys002"] {
 
 lutronradiora.items
 
-```
+```java
 Dimmer Dimmer_Kitchen "Kitchen Lights" { channel="lutronradiora:dimmer:chronos1:dimmer1:lightlevel" }
 Dimmer Dimmer_FamilyRoom "Family Room Lights" { channel="lutronradiora:dimmer:chronos1:dimmer2:lightlevel" }
 Switch Switch_Patio "Patio Light" { channel="lutronradiora:dimmer:chronos1:switch1:switchstatus" }
@@ -870,13 +865,13 @@ Please see [HomeWorks RS232 Protocol Guide](https://www.lutron.com/TechnicalDocu
 
 ## Supported Things
 
-* HomeWorks RS232-connected Processor Units
-* Dimmers
+- HomeWorks RS232-connected Processor Units
+- Dimmers
 
 Supported in future updates:
 
-* Keypads
-* Keypad LEDs
+- Keypads
+- Keypad LEDs
 
 ## Discovery
 
@@ -887,13 +882,13 @@ It will detect dimmers as they are manually raised or lowered, or can be made to
 
 The bridge requires the port location (e.g., /dev/ttyUSB1 or COM1) and the baud rate.  The default baud rate for HomeWorks processors is set to 9600.
 
-```
+```java
 lutron:hwserialbridge:home [serialPort="/dev/ttyUSB1", baudRate="9600]
 ```
 
 Dimmers have one required parameter ``address`` that specifies the device address (e.g., [01:01:03:02:04]) and two optional parameters: ``fadeTime`` which sets the time it takes to set the light level when changed, and ``defaultLevel`` which sets the level to use for the dimmer when turning it on (with a switch rather than a slider).
 
-```
+```java
 lutron:hwdimmer:dimmer1 [address="[01:01:03:02:04]", fadeTime="1", defaultLevel="75"]
 ```
 
@@ -905,7 +900,6 @@ The following channels are supported:
 |-----------------|-------------------|--------------|--------------------------------------------- |
 | dimmer          | lightlevel        | Dimmer       | Increase/decrease the light level            |
 
-
 # Lutron Grafik Eye 3x/4x binding via GRX-PRG or GRX-CI-PRG
 
 This lutron binding will also work with Grafik Eye 3x/4x systems in conjuction with the GRX-PRG or GRX-CI-PRG interfaces.
@@ -926,7 +920,7 @@ The bridge requires the IP address/Host name of the bridge.
 Optionally, you may specify the username (defaults to 'nwk') and retryPolling (in seconds) to retry connections if the connection fails (defaults to 10 seconds).
 This bridge does support two way communication with the Grafik Eye units (if a scene is selected or a zone changed on the unit or via a keypad, that information is immediately available in openHAB).
 
-```
+```java
 lutron:prgbridge:home [ ipAddress="192.168.1.51", user="nwk", retryPolling=10 ]
 ```
 
@@ -935,7 +929,7 @@ Optionally you may specify the default fade time (when raising/lowering zones or
 If any of the zones control a QED shade (via the SG/SO-SVCN/SVCI keypad), those zones
 should be listed (comma separated list) in the shadeZones.
 
-```
+```java
 lutron:grafikeye:home (lutron:prgbridge:home) [ controlUnit=1, fade=10, polling=30, shadeZones="2,3,4" ]
 ```
 
@@ -960,8 +954,6 @@ lutron:grafikeye:home (lutron:prgbridge:home) [ controlUnit=1, fade=10, polling=
 | ssnextsecond    | Yes      | Number    | How many seconds until the next step in the Super Sequence    |
 | buttonpress     | Yes      | String    | Last keypad button pressed (see Appendix A) in protocol guide |
 
-
-
 ### Grafik Eye channels
 
 | Channel Type ID   | Readonly | Item Type     | Description                                                    |
@@ -978,28 +970,27 @@ lutron:grafikeye:home (lutron:prgbridge:home) [ controlUnit=1, fade=10, polling=
 
 ### Notes
 
-* The "buttonpress" channel reports which keypad button was pressed.  DIP switch 6 must be set on the interface for this to be reported.  The "buttonpress" channel is only useful in rules to take action when a specific button (on a specific keypad) has been pressed.
-* Sunset/sunrise will only be available if configured via the Liasion software
-* scenelock, sceneseq, zonelock cannot be determined from the API and will default to OFF on startup
-* Replace the "X" on zonelowerX, zoneraiseX, etc with the zone in question.  "zonelower1" will affect zone 1.  Specifying a zone larger than you have will have no effect (such as using zonelower8 on a Grafik Eye 3506 which only has 6 zones).
-* The zonefade value will only be used when zonelower/zonereaise/zoneintensity is issued.
-* zoneshade does not support PercentType nor StopMoveType.Move and those commands will be ignored
-* zoneintensity can be used on a shade zone if the intensity is from 0 to 5 and should be used if wanting to set a QED preset: 0=Stop, 1=Open, 2=Close, 3=Preset 1, 4=Preset 2, 5=Preset 3
-* If you started a zonelower or zoneraise, the only way to stop the action is by executing an all zone stop on the bridge (i.e. zonelowerstop or zoneraisestop).  The PRG API does not provide a way to stop the lowering/raising of any specific zone.
-
+- The "buttonpress" channel reports which keypad button was pressed.  DIP switch 6 must be set on the interface for this to be reported.  The "buttonpress" channel is only useful in rules to take action when a specific button (on a specific keypad) has been pressed.
+- Sunset/sunrise will only be available if configured via the Liasion software
+- scenelock, sceneseq, zonelock cannot be determined from the API and will default to OFF on startup
+- Replace the "X" on zonelowerX, zoneraiseX, etc with the zone in question.  "zonelower1" will affect zone 1.  Specifying a zone larger than you have will have no effect (such as using zonelower8 on a Grafik Eye 3506 which only has 6 zones).
+- The zonefade value will only be used when zonelower/zonereaise/zoneintensity is issued.
+- zoneshade does not support PercentType nor StopMoveType.Move and those commands will be ignored
+- zoneintensity can be used on a shade zone if the intensity is from 0 to 5 and should be used if wanting to set a QED preset: 0=Stop, 1=Open, 2=Close, 3=Preset 1, 4=Preset 2, 5=Preset 3
+- If you started a zonelower or zoneraise, the only way to stop the action is by executing an all zone stop on the bridge (i.e. zonelowerstop or zoneraisestop).  The PRG API does not provide a way to stop the lowering/raising of any specific zone.
 
 ## Example
 
 demo.Things:
 
-```
+```java
 lutron:prgbridge:home [ ipAddress="192.168.1.51", user="nwk", retryPolling=10 ]
 lutron:grafikeye:home (lutron:prgbridge:home) [ controlUnit=1, fade=10, polling=10 ]
 ```
 
 demo.items:
 
-```
+```java
 String Prg_ButtonPress "Last Button Press [%s]" { channel = "lutron:prgbridge:home:buttonpress" }
 Switch Prg_ZoneLowerStop "Zone Lower Stop" { channel = "lutron:prgbridge:home:zonelowerstop",autoupdate="false" }
 Switch Prg_ZoneRaiseStop "Zone Raise Stop" { channel = "lutron:prgbridge:home:zoneraisestop",autoupdate="false" }
diff --git a/bundles/org.openhab.binding.luxom/README.md b/bundles/org.openhab.binding.luxom/README.md
index 56a1a1d7f16e2..1149a0833b179 100644
--- a/bundles/org.openhab.binding.luxom/README.md
+++ b/bundles/org.openhab.binding.luxom/README.md
@@ -1,20 +1,21 @@
 # Luxom Binding
 
-This binding integrates with a https://luxom.io/ based system through a Luxom IP interface module.
+This binding integrates with a <https://luxom.io/> based system through a Luxom IP interface module.
 The binding has been tested with the DS65L IP interface, but it's not an official binding by Luxom.
 
-The API implementation is based on the following documentation: 
+The API implementation is based on the following documentation:
 
-* https://old.luxom.io/uploads/ppfiles/27/LUXOM_ASCII.pdf
-* https://old.luxom.io/uploads/ppfiles/28/LUXOM_ASCII_extended.pdf
+- <https://old.luxom.io/uploads/ppfiles/27/LUXOM_ASCII.pdf>
+
+- <https://old.luxom.io/uploads/ppfiles/28/LUXOM_ASCII_extended.pdf>
 
 ## Supported Things
 
 This binding currently supports the following thing types:
 
-* **ipbridge** - The Lutron main repeater/processor/hub
-* **dimmer** - Light dimmer
-* **switch** - Switch or relay module
+- **ipbridge** - The Lutron main repeater/processor/hub
+- **dimmer** - Light dimmer
+- **switch** - Switch or relay module
 
 ## Thing Configuration
 
@@ -22,10 +23,10 @@ This binding currently supports the following thing types:
 
 The Bridge thing has two parameters:
 
-- ipAddress: This is the IP address of the IP interface module 
+- ipAddress: This is the IP address of the IP interface module
 - port: The listening port (optional, defaults to 2300)
 
-```
+```java
 Bridge luxom:bridge:myhouse [ ipAddress="192.168.0.50", port="2300"] {
     ...
 }
@@ -33,37 +34,37 @@ Bridge luxom:bridge:myhouse [ ipAddress="192.168.0.50", port="2300"] {
 
 ### Devices
 
-Each device has an address on the Luxom bus, this address must be specified in the 'address' parameter. 
-You will have to look it up in your documentation or in the 'Luxom Plusconfig' software. 
+Each device has an address on the Luxom bus, this address must be specified in the 'address' parameter.
+You will have to look it up in your documentation or in the 'Luxom Plusconfig' software.
 
-Sometimes a device does not send back a confirmation over the bus having set the correct state. 
-Some dimmers do the dimming, but do not send back the set brightness level. 
+Sometimes a device does not send back a confirmation over the bus having set the correct state.
+Some dimmers do the dimming, but do not send back the set brightness level.
 To be able to use these devices, you can add the `doesNotReply=true` parameter so that the binding immediately sets the item's state and does not wait for confirmation.
   
 #### Dimmers
 
 Dimmers support the optional advanced parameters `onLevel`, `onToLast` and `stepPercentage`:
 
-* The `onLevel` parameter specifies the level to which the dimmer will go when sent an ON command. It defaults to 100.
-* The `onToLast` parameter is a boolean that defaults to false. If set to "true", the dimmer will go to its last non-zero level when sent an ON command. If the last non-zero level cannot be determined, the value of `onLevel` will be used instead.
-* The `stepPercentage` specifies the in-/decrease in percentage of brightness. Default is 5.
+- The `onLevel` parameter specifies the level to which the dimmer will go when sent an ON command. It defaults to 100.
+- The `onToLast` parameter is a boolean that defaults to false. If set to "true", the dimmer will go to its last non-zero level when sent an ON command. If the last non-zero level cannot be determined, the value of `onLevel` will be used instead.
+- The `stepPercentage` specifies the in-/decrease in percentage of brightness. Default is 5.
 
-A **dimmer** thing has a single channel *Lighting.Brightness* with type Dimmer and category DimmableLight.
+A **dimmer** thing has a single channel _Lighting.Brightness_ with type Dimmer and category DimmableLight.
 
 Thing configuration file example:
 
-```
+```java
 Thing dimmer dimmerLightLiving1 [address="A,02", onLevel="50", onToLast="false", stepPercentage="5"]
 ```
 
 #### Switches
 
 Switches take no additional parameters.
-A **switch** thing has a single channel *switch* with type Switch and category Switch.
+A _switch_ thing has a single channel **switch** with type Switch and category Switch.
 
 Thing configuration file example:
 
-```
+```java
 Thing switch switchLiving1 [address="A,02"]
 ```
 
@@ -76,12 +77,11 @@ The following is a summary of channels for all Luxom things:
 | dimmer              | brightness     | Dimmer        | Increase/decrease the light level |
 | switch              | switch         | Switch        | Switch the device on/off          |
 
-
 ### Full Example
 
 demo.things:
 
-```
+```java
 Bridge luxom:bridge:myhouse [ ipAddress="192.168.0.50", port="2300"] {
     Thing switch switchBedroom1 "Switch 1" @ "Bedroom" [address="1,01"]
     Thing dimmer dimmerBedroom1 "dimmer 1" @ "Bedroom" [address="A,02"]
@@ -91,7 +91,7 @@ Bridge luxom:bridge:myhouse [ ipAddress="192.168.0.50", port="2300"] {
 
 demo.items:
 
-```
+```java
 Dimmer          FF_Bedroom_Lights             "Bedroom dimmer light"   <light>            (FF_Living, gLight)      ["Lighting"] {channel="luxom:dimmer:myhouse:dimmerBedroom1:brightness", ga="Light", homekit="Lighting, Lighting.Brightness"}
 Switch          FF_Bedroom_PowerOutlet1       "Bedroom Power Outlet 1"   <poweroutlet>    (FF_Living, gPower)      ["Switchable"] {channel="luxom:switch:myhouse:switchBedroom1:switch", ga="Outlet"}
 Dimmer          FF_Kitchen_Lights             "Kitchen dimmer light"   <light>            (FF_Kitchen, gLight)     ["Lighting"] {channel="luxom:dimmer:myhouse:dimmerKitchen1:brightness", ga="Light", homekit="Lighting, Lighting.Brightness"}
diff --git a/bundles/org.openhab.binding.luxtronikheatpump/README.md b/bundles/org.openhab.binding.luxtronikheatpump/README.md
index 2d64c4117ea7a..0f49dfc34611d 100644
--- a/bundles/org.openhab.binding.luxtronikheatpump/README.md
+++ b/bundles/org.openhab.binding.luxtronikheatpump/README.md
@@ -2,20 +2,22 @@
 
 This binding gives the possibility to integrate any Heatpump that is based on the Luxtronik 2 contol unit of Alpha Innotec. This includes heatpumps of:
 
-* Alpha InnoTec
-* Buderus (Logamatic HMC20, HMC20 Z)
-* CTA All-In-One (Aeroplus)
-* Elco
-* Nibe (AP-AW10)
-* Roth (ThermoAura®, ThermoTerra)
-* (Siemens) Novelan (WPR NET)
-* Wolf Heiztechnik (BWL/BWS)
+- Alpha InnoTec
+- Buderus (Logamatic HMC20, HMC20 Z)
+- CTA All-In-One (Aeroplus)
+- Elco
+- Nibe (AP-AW10)
+- Roth (ThermoAura®, ThermoTerra)
+- (Siemens) Novelan (WPR NET)
+- Wolf Heiztechnik (BWL/BWS)
 
 This binding was tested with:
 
-* Siemens Novelan LD 7
+- Siemens Novelan LD 7
 
-_If you have another heatpump the binding works with, let us know, so we can extend the list_
+:::tip Note
+If you have another heatpump the binding works with, let us know, so we can extend the list
+:::
 
 Note: The whole functionality is based on data that was reverse engineered, so use it at your own risk.
 
@@ -283,7 +285,6 @@ The following channels are holding read only values:
 
 The usage of the numbered channels above is currently unknown. If you are able to directly match one of the values to any value reported by your heat pump, feel free to report back on the forum, so we are able to give the channel a proper name instead.
 
-
 The following channels are also writable:
 | channel  | type   | advanced | description                  |
 |----------|--------|----------|------------------------------|
@@ -306,14 +307,13 @@ The following channels are also writable:
 | comfortCoolingATExcess | Number:Time |   | AT Excess |
 | comfortCoolingATUndercut | Number:Time |   | AT undercut |
 
-
 ## Example
 
 Below you can find some example textual configuration for a heatpump with some basic functionallity. This can be extended/adjusted according to your needs and depending on the availability of channels (see list above).
 
 _heatpump.things:_
 
-```
+```java
 Thing luxtronikheatpump:heatpump:heatpump "Heatpump" [
     ipAddress="192.168.178.12",
     port="8889",
@@ -323,7 +323,7 @@ Thing luxtronikheatpump:heatpump:heatpump "Heatpump" [
 
 _heatpump.items:_
 
-```
+```java
 Group    gHeatpump   "Heatpump"   <temperature>
 
 Number:Temperature HeatPump_Temp_Outside   "Temperature outside [%.1f °C]"   <temperature> (gHeatpump) { channel="luxtronikheatpump:heatpump:heatpump:temperatureOutside" }
@@ -343,7 +343,7 @@ Number HeatPump_warmwater_temperature   "Hot water temperature [%.1f]"  (gHeatpu
 
 _heatpump.sitemap:_
 
-```
+```perl
 sitemap heatpump label="Heatpump" {
     Frame label="Heatpump" {
         Text item=HeatPump_State_Ext
diff --git a/bundles/org.openhab.binding.magentatv/README.md b/bundles/org.openhab.binding.magentatv/README.md
index 6d4748c9b3a31..29e279314abec 100644
--- a/bundles/org.openhab.binding.magentatv/README.md
+++ b/bundles/org.openhab.binding.magentatv/README.md
@@ -15,13 +15,15 @@ The binding provides device discovery, sending keys for the remote and also rece
 
 ### Supported Models
 
-* Deutsche Telekom Media Receiver MR401B - fully supported
-* Deutsche Telekom Media Receiver MR201  - fully supported
-* Deutsche Telekom Media Receiver MR400  - supported with minor restrictions (POWER key)
-* Deutsche Telekom Media Receiver MR200  - supported with minor restrictions (POWER key)
-* Deutsche Telekom Media Receiver MR601  - should be supported (not verified)
-* Deutsche Telekom Media Receiver MR3xx  - NOT supported (different platform)
-* Deutsche Telekom Media Receiver MR1xx  - NOT supported (different platform)
+| Model                                  | Status                                        |
+|----------------------------------------|-----------------------------------------------|
+| Deutsche Telekom Media Receiver MR401B | fully supported                               |
+| Deutsche Telekom Media Receiver MR201  | fully supported                               |
+| Deutsche Telekom Media Receiver MR400  | supported with minor restrictions (POWER key) |
+| Deutsche Telekom Media Receiver MR200  | supported with minor restrictions (POWER key) |
+| Deutsche Telekom Media Receiver MR601  | should be supported (not verified)            |
+| Deutsche Telekom Media Receiver MR3xx  | NOT supported (different platform)            |
+| Deutsche Telekom Media Receiver MR1xx  | NOT supported (different platform)            |
 
 ## Auto Discovery
 
@@ -84,7 +86,7 @@ There are different ways to setup the User ID:
 
 Run the following command on the console and provide your Telekom account credentials:
 
-```
+```shell
 openhab> openhab:magentatv login
 Username (email): mail@example.com
 Password: topsecret
@@ -97,7 +99,7 @@ Edit thing configuration and copy this value to the field userId
 On successful login the console will show the User ID value. Copy&amp;Paste this value to the Thing configuration (parameter `userId`) of the receiver.
 If you have multiple receivers under the same MagentaTV subscription you can use this value for all of them.
 
-2. Provide your credentials in the UI
+1. Provide your credentials in the UI
 
 If you do not want to use the openHAB console, you can also setup the credentials in the Thing configuration
 
@@ -199,18 +201,18 @@ In addition you could send any key code in the 0xHHHH format., refer to
 
 ### magentatv.things
 
-```
+```java
 Thing magentatv:receiver:XXXXXXXXXXX "MagentaTV" [
-udn="XXXXXXXXXXX",
-ipAddress="xxx.xxx.xxx.xxx",
-accountName="xxxxxx.xxxx@t-online.de",
-accountPassword="xxxxxxxxxx"
+  udn="XXXXXXXXXXX",
+  ipAddress="xxx.xxx.xxx.xxx",
+  accountName="xxxxxx.xxxx@t-online.de",
+  accountPassword="xxxxxxxxxx"
 ]
 ```
 
 ### magentatv.items
 
-```
+```java
 # MagentaTV Control
 Switch MagentaTV_Power        "Power"        {channel="magentatv:receiver:XXXXXXXXXXX:control#power"}
 Number MagentaTV_Channel      "Channel"      {channel="magentatv:receiver:XXXXXXXXXXX:status#channel"}
@@ -231,7 +233,7 @@ String MagentaTV_RunStatus "Run Status"      {channel="magentatv:receiver:XXXXXX
 
 or
 
-```
+```java
 Group    gRB_GF_LR_TVReceiver "RB_GF_LR: TV Receiver"
          (gRB_GF_LivingRoom, gMedia, gSpeechCmnd)
 
@@ -283,7 +285,7 @@ String   RB_GF_LR_TVReceiver_PlayMode
 
 ### sitemap
 
-```
+```perl
 Text label="TV" icon="it_television" {
   Frame label="Bedienung"  {
     Switch item=RB_GF_LR_TVReceiver_Power label="Ein/Aus []" icon="control_on_off" mappings=[ ON="Ein/Aus" ]
@@ -312,18 +314,18 @@ Due to the fact the POWER is a toggle button and the binding cannot detect the c
 
 Beginning with models 401/201 and new the binding is able to detect the Power-OFF condition, which can be used in a rule to improve this situation
 
-```
-        if (MagentaTV_Power.state != ON) {
-            sendCommand(MagentaTV_Power, ON)
-        }
+```java
+if (MagentaTV_Power.state != ON) {
+    sendCommand(MagentaTV_Power, ON)
+}
 ```
 
 to switch it ON and
 
-```
-        if (MagentaTV_Power.state != OFF) {
-            sendCommand(MagentaTV_Power, OFF)
-        }
+```java
+if (MagentaTV_Power.state != OFF) {
+    sendCommand(MagentaTV_Power, OFF)
+}
 ```
 
 to switch it off.
diff --git a/bundles/org.openhab.binding.mail/README.md b/bundles/org.openhab.binding.mail/README.md
index 1591281fa417b..a196c53a7c467 100644
--- a/bundles/org.openhab.binding.mail/README.md
+++ b/bundles/org.openhab.binding.mail/README.md
@@ -54,7 +54,7 @@ Channels with type `UNREAD` give the number on unread mails in that folder.
 
 mail.things:
 
-```
+```java
 Thing mail:smtp:samplesmtp [ hostname="smtp.example.com", sender="mail@example.com", security="SSL", username="user", password="pass" ]
 
 Thing mail:imap:sampleimap [ hostname="imap.example.com", security="SSL", username="user", password="pass" ] {
@@ -66,14 +66,14 @@ Thing mail:imap:sampleimap [ hostname="imap.example.com", security="SSL", userna
 
 mail.items:
 
-```
+```java
 Number InboxTotal  "INBOX [%d]"        { channel="mail:imap:sampleimap:inbox_total" }
 Number InboxUnread "INBOX Unread [%d]" { channel="mail:imap:sampleimap:inbox_unread" }
 ```
 
 mail.sitemap:
 
-```
+```perl
 sitemap demo label="Main Menu"
 {
     Frame {
@@ -88,12 +88,12 @@ sitemap demo label="Main Menu"
 This binding includes rule actions for sending email.
 Six different actions available:
 
-* `boolean success = sendMail(String recipient, String subject, String text)`
-* `boolean success = sendMailWithAttachment(String recipient, String subject, String text, String URL)`
-* `boolean success = sendMailWithAttachments(String recipient, String subject, String text, List<String> URL)`
-* `boolean success = sendHtmlMail(String recipient, String subject, String htmlContent)`
-* `boolean success = sendHtmlMailWithAttachment(String recipient, String subject, String htmlContent, String URL)`
-* `boolean success = sendHtmlMailWithAttachments(String recipient, String subject, String htmlContent, List<String> URL)`
+- `boolean success = sendMail(String recipient, String subject, String text)`
+- `boolean success = sendMailWithAttachment(String recipient, String subject, String text, String URL)`
+- `boolean success = sendMailWithAttachments(String recipient, String subject, String text, List<String> URL)`
+- `boolean success = sendHtmlMail(String recipient, String subject, String htmlContent)`
+- `boolean success = sendHtmlMailWithAttachment(String recipient, String subject, String htmlContent, String URL)`
+- `boolean success = sendHtmlMailWithAttachments(String recipient, String subject, String htmlContent, List<String> URL)`
 
 The `sendMail(...)` send a plain text mail (with attachments if supplied).
 The `sendHtmlMail(...)` send a HTML mail (with attachments if supplied).
@@ -111,14 +111,14 @@ Using different character sets may produce unwanted results.
 
 Examples:
 
-```
+```java
 val mailActions = getActions("mail","mail:smtp:samplesmtp")
 val success = mailActions.sendMail("mail@example.com", "Test subject", "This is the mail content.")
 success = mailActions.sendMail("mail1@example.com, mail2@example.com", "Test subject", "This is the mail content sent to multiple recipients.")
 
 ```
 
-```
+```java
 import java.util.List
 
 val List<String> attachmentUrlList = newArrayList(
@@ -135,7 +135,7 @@ For example if you want e-mails sent by this binding to be grouped into a "threa
 Headers can be added inside a rule by calling the `mailActions.addHeader()` method before calling the respective `mailActions.sendMail()` method.
 See the example below.
 
-```
+```java
 rule "Send Mail with a 'Reference' header; for threaded view in e-mail client"
 when
     ...
diff --git a/bundles/org.openhab.binding.max/README.md b/bundles/org.openhab.binding.max/README.md
index 0e281829a33d5..2a556725d47ab 100644
--- a/bundles/org.openhab.binding.max/README.md
+++ b/bundles/org.openhab.binding.max/README.md
@@ -74,7 +74,7 @@ Bridge max:bridge:KEQ0565026 [ ipAddress="192.168.3.9", serialNumber="KEQ0565026
 max.items:
 
 ```java
-Group gMAX 			"MAX Heating" 	<temperature>	[ "home-group" ]
+Group gMAX    "MAX Heating"  <temperature> [ "home-group" ]
 
 Switch maxBattery "Battery Low" (gMAX) {channel="max:thermostat:KEQ0565026:KEQ0648949:battery_low"}
 String maxMode "Thermostat Mode Setting" (gMAX) {channel="max:thermostat:KEQ0565026:KEQ0648949:mode"}
@@ -117,24 +117,24 @@ During this time, holding the _boost_ button on your device will link it to the
 In the _Configuration Parameters_ section of the device Things you can update some of the device configuration parameters.
 Currently the following parameters can be updated:
 
-*   _name_ Name of the thermostat stored in the Cube (also used by the eQ-3 software).
+- _name_ Name of the thermostat stored in the Cube (also used by the eQ-3 software).
 
-_Cube device configurable parameters_
+### Cube device configurable parameters
 
-*   _ntpServer1_ The hostname for NTP Server 1 used by the Cube to get the time
-*   _ntpServer2_ The hostname for NTP Server 2 used by the Cube to get the time
+- _ntpServer1_ The hostname for NTP Server 1 used by the Cube to get the time
+- _ntpServer2_ The hostname for NTP Server 2 used by the Cube to get the time
 
 ## Thing Actions
 
 Several Thing Actions are available to trigger special actions on the MAX! Cube
 
-*   `reset()`: _Reset Cube Configuration_ resets the MAX! Cube room and device information. Devices will need to be included again!
+- `reset()`: _Reset Cube Configuration_ resets the MAX! Cube room and device information. Devices will need to be included again!
 
-*   `reboot()`: _Restart Cube_ triggers the reboot of a Cube. This can be used if a Cube became unresponsive to commands or no connection can be made. (e.g. if you tried to connect to the Cube with multiple applications at the same time)
+- `reboot()`: _Restart Cube_ triggers the reboot of a Cube. This can be used if a Cube became unresponsive to commands or no connection can be made. (e.g. if you tried to connect to the Cube with multiple applications at the same time)
 
 On the MAX! devices you can trigger the following action
 
-*   `deleteFromCube()`: _Delete Device from Cube_ deletes the device from the MAX! Cube. Device will need to be included again!
+- `deleteFromCube()`: _Delete Device from Cube_ deletes the device from the MAX! Cube. Device will need to be included again!
 
 ### Example Rule
 
diff --git a/bundles/org.openhab.binding.mcd/README.md b/bundles/org.openhab.binding.mcd/README.md
index 17cc1ec11b3aa..55755e918ad85 100644
--- a/bundles/org.openhab.binding.mcd/README.md
+++ b/bundles/org.openhab.binding.mcd/README.md
@@ -1,22 +1,19 @@
 # MCD Binding
 
-This binding allows you to send sensor events from your openHAB environment to the cloud application Managing Care Digital (MCD) by [C&S Computer und Software GmbH](https://www.managingcare.de/). 
+This binding allows you to send sensor events from your openHAB environment to the cloud application Managing Care Digital (MCD) by [C&S Computer und Software GmbH](https://www.managingcare.de/).
 
-MCD is the platform for inpatient and outpatient nursing services. 
-Our REST API allows you to send a variety of sensor events to the system and thus being able to connect your Ambient Assisted Living (AAL) or smart home environment to the documentation software of your nursing service. 
+MCD is the platform for inpatient and outpatient nursing services.
+Our REST API allows you to send a variety of sensor events to the system and thus being able to connect your Ambient Assisted Living (AAL) or smart home environment to the documentation software of your nursing service.
 
 Please note that a valid account is needed to access MCD and the Sensor API.
 
-
 ## Supported Things
 
-There are two supported things: **MCD Bridge** and **MCD Sensor Thing**. 
-
+There are two supported things: **MCD Bridge** and **MCD Sensor Thing**.
 
 ## Discovery
 
-Discovery is not supported. 
-
+Discovery is not supported.
 
 ## Thing Configuration
 
@@ -24,7 +21,7 @@ This section shows the configuration parameters of both supported things.
 
 ### MCD Bridge
 
-The MCD Bridge (`mcdBridge`) needs to be configured with your valid C&S MCD / sync API credentials. 
+The MCD Bridge (`mcdBridge`) needs to be configured with your valid C&S MCD / sync API credentials.
 
 | parameter | description                        |
 |-----------|------------------------------------|
@@ -33,7 +30,7 @@ The MCD Bridge (`mcdBridge`) needs to be configured with your valid C&S MCD / sy
 
 ### MCD Sensor Thing
 
-Each sensor thing (`mcdSensor`) needs to be configured with the identical serial number, that is assigned to this sensor in MCD. 
+Each sensor thing (`mcdSensor`) needs to be configured with the identical serial number, that is assigned to this sensor in MCD.
 
 | parameter      | description                        |
 |----------------|------------------------------------|
@@ -41,16 +38,16 @@ Each sensor thing (`mcdSensor`) needs to be configured with the identical serial
 
 ## Channels
 
-The `mcdSensor` thing supports the following channels.  To see the sensors' events, please visit [Managing Care Digital](https://cundsdokumentation.de/) and navigate to the dashboard. 
+The `mcdSensor` thing supports the following channels.  To see the sensors' events, please visit [Managing Care Digital](https://cundsdokumentation.de/) and navigate to the dashboard.
 
 | channel     | type   | description                                   |
 |-------------|--------|-----------------------------------------------|
 | lastEvent | String | shows the last event that was sent with date and time |
 | sendEvent | String | stateless channel for sending events to the API, see list below for valid commands |
 
-The channel `sendEvent` accepts valid Sensor Event Definitions as well as the corresponding ID. 
-The following table contains all currently accepted Sensor Event Definitions that can be passed as String type commands. 
-As soon as new events are added to the API, you can use their ID, even if the Definition is not yet added to this list. 
+The channel `sendEvent` accepts valid Sensor Event Definitions as well as the corresponding ID.
+The following table contains all currently accepted Sensor Event Definitions that can be passed as String type commands.
+As soon as new events are added to the API, you can use their ID, even if the Definition is not yet added to this list.
 For more information about the API, you can have a look at the [C&S Sync API](https://cunds-syncapi.azurewebsites.net/ApiDocumentation).
 
 | Valid String Type Commands |
@@ -114,14 +111,13 @@ For more information about the API, you can have a look at the [C&S Sync API](ht
 | NUMBERPERSONS |
 | BRIGHTNESSZONE |
 
-
 ## Full Example
 
 Here is an example for the textual configuration. You can of course use the Administration section of the GUI as well.
 
 demo.things:
 
-```
+```java
 Bridge mcd:mcdBridge:exampleBridge [userEmail="your.email@examle.com", userPassword="your.password"]{
     Thing mcd:mcdSensor:examlpeSensor [serialNumber="123"]
     Thing mcd:mcdSensor:secondExamlpeSensor [serialNumber="456"]
@@ -130,14 +126,14 @@ Bridge mcd:mcdBridge:exampleBridge [userEmail="your.email@examle.com", userPassw
 
 demo.items:
 
-```
+```java
 String lastValue "Last Value" {channel="mcd:mcdSensor:examlpeSensor:lastValue"}
 String sendEvent "Send Event" {channel="mcd:mcdSensor:examlpeSensor:sendEvent"}
 ```
 
 demo.sitemap:
 
-```
+```perl
 Text item=sendEvent
 Text item=lastValue
 ```
diff --git a/bundles/org.openhab.binding.mcp23017/README.md b/bundles/org.openhab.binding.mcp23017/README.md
index 061a92daada7f..f0074a4e811c6 100644
--- a/bundles/org.openhab.binding.mcp23017/README.md
+++ b/bundles/org.openhab.binding.mcp23017/README.md
@@ -7,7 +7,7 @@ On Raspberry Pi the user on which openHAB is running (default user name is "open
 As the MCP23017 has 3 address pins, you are restricted to 8 devices on an I2C bus.
 To use more devices you have to open further I2C busses.
 Therefore you can use overlays to enable bit banging I2C busses on the Raspberry Pi connector, up to I2C6.
-(https://github.com/raspberrypi/firmware/tree/master/boot/overlays)
+<https://github.com/raspberrypi/firmware/tree/master/boot/overlays>
 
 ## Dependencies
 
@@ -23,7 +23,7 @@ mcp23017 - which is a mcp23017 chip connected to an I2C bus on specified HEX add
 
 ## Thing Configuration
 
-* Required configuration for mcp23017 thing:
+- Required configuration for mcp23017 thing:
 
 | Parameter  | Description                                                                                                                       | Default value |
 |------------|-----------------------------------------------------------------------------------------------------------------------------------|---------------|
@@ -52,23 +52,23 @@ When PIN should work as DIGITAL_OUTPUT, channel from group "output" should be us
 Let's imagine a setup with:
 
 1. a wall switch connected to pin B1 on the MCP23017 chip which should turn on/off your LED light when pressed (released).
-2. a relay which is connected to pin A0 on the MCP23017 chip. This relay takes care of turning on/off your light.
+1. a relay which is connected to pin A0 on the MCP23017 chip. This relay takes care of turning on/off your light.
 
 Pressing (and releasing) a wall switch should notify openHAB, and then openHAB should change state of relay to on/off the light.
 Your pin B1 should work as DIGITAL_INPUT, because it READS state of a PIN (state of wall switch). Your pin A0 should work as DIGITAL_OUTPUT
 because openHAB will SET state of this PIN. So your config should look like this:
 
-*   Things:
+- Things:
 
 Minimal configuration:
 
-```
+```java
 Thing mcp23017:mcp23017:chipA  "MCP23017 chip A" [address=20,bus=1]
 ```
 
 Configuration with default_state and pull_mode:
 
-```
+```java
 Thing mcp23017:mcp23017:chipA  "MCP23017 chip A" [address=20,bus=1] {
     Type output_pin : output#A0 [default_state="HIGH"]
     Type output_pin : output#A1 [default_state="LOW"]
@@ -80,16 +80,16 @@ Thing mcp23017:mcp23017:chipA  "MCP23017 chip A" [address=20,bus=1] {
 }
 ```
 
-*   Items:
+- Items:
 
-```
+```java
 Switch living_room_led_switch "Living room LED switch"  {channel="mcp23017:mcp23017:chipA:output#A0"}
 Contact living_room_led_contact "Living room LED contact"  {channel="mcp23017:mcp23017:chipA:input#B1"}
 ```
 
-*   Rules:
+- Rules:
 
-```
+```java
 rule "living_room_led contact"
 when
     Item living_room_led_contact changed to OPEN
diff --git a/bundles/org.openhab.binding.meater/README.md b/bundles/org.openhab.binding.meater/README.md
index adfdd842f19b0..1aaaa2e47adb9 100644
--- a/bundles/org.openhab.binding.meater/README.md
+++ b/bundles/org.openhab.binding.meater/README.md
@@ -6,15 +6,13 @@ This binding uses the MEATER Cloud REST API.
 
 ![Meater+ Probe](doc/meater-plus-side.png)
 
-
 ## Supported Things
 
 This binding supports the following thing types:
 
 - meaterapi: Bridge - Communicates with the MEATER Cloud REST API.
 
-
-- meaterprobe: The MEATER probe - Only support for cloud connected MEATER probes (MEATER Block and MEATER Plus) 
+- meaterprobe: The MEATER probe - Only support for cloud connected MEATER probes (MEATER Block and MEATER Plus)
 
 ## Discovery
 
@@ -37,7 +35,7 @@ This might help isolating an individual probe.
 
 #### Configuration Options
 
-| Parameter | Description                                                  | Type   | Default  | Required | 
+| Parameter | Description                                                  | Type   | Default  | Required |
 |-----------|--------------------------------------------------------------|--------|----------|----------|
 | email     | The email used to login to your MEATER Cloud account         | String | NA       | yes      |
 | password  | The password used to login to your MEATER Cloud account      | String | NA       | yes      |
@@ -55,15 +53,13 @@ The following channels are supported:
 
 #### Configuration Options
 
-| Parameter | Description                                                  | Type   | Default  | Required | 
+| Parameter | Description                                                  | Type   | Default  | Required |
 |-----------|--------------------------------------------------------------|--------|----------|----------|
 | deviceId  | Unique id for your MEATER Probe                              | String | NA       | yes      |
-    
-
 
 #### Channels
 
-| Channel Type ID       | Item Type          | Description                                          | 
+| Channel Type ID       | Item Type          | Description                                          |
 |-----------------------|--------------------|------------------------------------------------------|
 | internalTemperature   | Number:Temperature | Internal temperature reading of MEATER probe         |
 | ambientTemperature    | Number:Temperature | Ambient temperature reading of MEATER probe. If ambient is less than internal, ambient will equal internal                                                     |
@@ -71,29 +67,28 @@ The following channels are supported:
 | cookPeakTemperature   | Number:Temperature | Peak temperature of current cook                     |
 | lastConnection        | DateTime           | Date and time of last probe connection               |
 | cookId                | String             | Unique cook ID of current cook                       |
-| cookName              | String             | Name of selected meat or user given custom name      |   
+| cookName              | String             | Name of selected meat or user given custom name      |
 | cookState             | String             | One of Not Started, Configured, Started, Ready For Resting, Resting, Slightly Underdone, Finished, Slightly Overdone, OVERCOOK!                                 |
 | cookElapsedTime       | Number:Time        | Time since the start of cook in seconds. Default: 0  |
 | cookRemainingTime     | Number:Time        | Remaining time in seconds or UNDEF when unknown.                                                                                  |
 | cookEstimatedEndTime  | DateTime           | Date and time of estimated end time for current cook |
 
-
 ## Example
 
 ### Things-file
 
-````
+```java
 Bridge meater:meaterapi:block     "MEATER Block"   [email="", password="", refresh=30] {
   meaterprobe probe1 "Meater Probe 1" [deviceId=""]
   meaterprobe probe2 "Meater Probe 2" [deviceId=""]
   meaterprobe probe3 "Meater Probe 3" [deviceId=""]
   meaterprobe probe4 "Meater Probe 4" [deviceId=""]
 }
-````
+```
 
 ### Items-file
 
-````
+```java
 Number:Temperature Probe1InternalTemperature   {channel="meater:meaterprobe:block:probe1:internalTemperature"}
 Number:Temperature Probe1AmbientTemperature    {channel="meater:meaterprobe:block:probe1:ambientTemperature"}
 String             Probe1CookId                {channel="meater:meaterprobe:block:probe1:cookId"}
@@ -145,6 +140,4 @@ Number:Time        Probe4CookRemainingTime     {channel="meater:meaterprobe:bloc
 DateTime           Probe4CookEstimatedEndTime  {channel="meater:meaterprobe:block:probe4:cookEstimatedEndTime"}
 String             Probe4Status                {channel="meater:meaterprobe:block:probe4:status"}
 DateTime           Probe4LastConnection        {channel="meater:meaterprobe:block:probe4:lastConnection"}
-````
-
-
+```
diff --git a/bundles/org.openhab.binding.mecmeter/README.md b/bundles/org.openhab.binding.mecmeter/README.md
index aa8f2f8fbdcf7..3e5752d785c3f 100644
--- a/bundles/org.openhab.binding.mecmeter/README.md
+++ b/bundles/org.openhab.binding.mecmeter/README.md
@@ -2,7 +2,7 @@
 
 This binding reads data from MEC power meter for providing electrical information for the electric circuit.
 
-To use this binding the meter must be installed, initialized and connected to the same network as openHAB. 
+To use this binding the meter must be installed, initialized and connected to the same network as openHAB.
 
 ## Supported Things
 
@@ -12,7 +12,7 @@ Its unique ID is the serial number.
 
 ## Discovery
 
-MecMeters are automatically discovered via mDNS. 
+MecMeters are automatically discovered via mDNS.
 The IP of the Power Meter is automatically set and can be changed manually if needed.
 The default update interval is set to 5 seconds. Intervals from 1 to 300 seconds can be set manually.
 
@@ -26,10 +26,9 @@ The thing has a few configuration parameters:
 | ip              | The IP address of the meter. Mandatory.                               |
 | refreshInterval | Refresh interval in second. Optional, the default value is 5 seconds. |
 
-	
 ## Channels
 
-The meter has the following channels: 
+The meter has the following channels:
 
 | Channel Type ID                                              | Item Type                | Label                             | Description                              |
 |--------------------------------------------------------------|--------------------------|-----------------------------------|------------------------------------------|
@@ -115,13 +114,13 @@ The meter has the following channels:
 
 ### mecmeter.things
 
-```
+```java
 mecmeter:meter:1 [ password="Test1234", ip="192.168.1.16", refreshInterval="10" ]
 ```
 
 ### mecmeter.items
 
-```
+```java
 Number:Frequency    MainFrequency           { channel="mecmeter:meter:1:general_group#frequency" }
 Number:Temperature  InternalTemperature     { channel="mecmeter:meter:1:general_group#temperature" }
 Number:Time         TimeinOperation         { channel="mecmeter:meter:1:general_group#op_time" }
@@ -222,7 +221,7 @@ Number:Energy RevReactiveEnergyP3 { channel="mecmeter:meter:1:rev_reactive_energ
 
 ### mecmeter.sitemap
 
-```
+```perl
 sitemap mecmeter label="MecMeter"
 {
     Frame label="General" {
diff --git a/bundles/org.openhab.binding.melcloud/README.md b/bundles/org.openhab.binding.melcloud/README.md
index d81c44d7831ff..619e4da6921db 100644
--- a/bundles/org.openhab.binding.melcloud/README.md
+++ b/bundles/org.openhab.binding.melcloud/README.md
@@ -1,27 +1,26 @@
 # MELCloud Binding
 
-This is an openHAB binding for Mitsubishi MELCloud (https://www.melcloud.com/). 
+This is an openHAB binding for [Mitsubishi MELCloud](https://www.melcloud.com/).
 Installing this binding you can control your Mitsubishi devices from openHAB without accessing the MELCloud App and benefiting from all openHAB automations.
 
 ## Supported Things
 
 Supported thing types
 
-* melcloudaccount (bridge)
-* acdevice
-* heatpumpdevice
+- melcloudaccount (bridge)
+- acdevice
+- heatpumpdevice
 
 A bridge is required to connect to your MELCloud account.
 
-
 ## Discovery
 
 Discovery is used _after_ a bridge has been created and configured with your login information.
 
 1. Add the binding
-2. Add a new thing of type melcloudaccount and configure with username and password
-3. Go to Inbox and start discovery devices using MELCloud Binding
-4. Supported devices (A.C. Device, Heatpump Device) should appear in your inbox
+1. Add a new thing of type melcloudaccount and configure with username and password
+1. Go to Inbox and start discovery devices using MELCloud Binding
+1. Supported devices (A.C. Device, Heatpump Device) should appear in your inbox
 
 Binding support also manual thing configuration by thing files.
 
@@ -67,7 +66,6 @@ MELCloud account configuration:
 | 24          | Romanian          |
 | 25          | Slovenian         |
 
-
 A.C. device and Heatpump device configuration:
 
 | Config          | Mandatory | Description                                                                           |
@@ -76,8 +74,6 @@ A.C. device and Heatpump device configuration:
 | buildingID      |           | MELCloud building ID. If not defined, binding tries to find matching id by device ID. |
 | pollingInterval |           | Refresh time interval in seconds for updates from MELCloud.  Defaults to 60 seconds.  |
 
-
-
 ## Channels
 
 A.C. device channels
@@ -112,18 +108,18 @@ Heatpump device channels
 
 ## Full Example for items configuration
 
-**melcloud.things**
+### melcloud.things
 
-```
+```java
 Bridge melcloud:melcloudaccount:myaccount "My MELCloud account" [ username="user.name@example.com", password="xxxxxx", language="0" ] {
-	Thing acdevice livingroom "Livingroom A.C. device" [ deviceID=123456, pollingInterval=60 ]
-	Thing heatpumpdevice attic "Attic Heatpump device" [ deviceID=789012, pollingInterval=60 ]
+ Thing acdevice livingroom "Livingroom A.C. device" [ deviceID=123456, pollingInterval=60 ]
+ Thing heatpumpdevice attic "Attic Heatpump device" [ deviceID=789012, pollingInterval=60 ]
 }
 ```
 
-**melcloud.items**
+### melcloud.items
 
-```
+```java
 Switch      power               { channel="melcloud:acdevice:myaccount:livingroom:power" }
 String      operationMode       { channel="melcloud:acdevice:myaccount:livingroom:operationMode" }
 Number      setTemperature      { channel="melcloud:acdevice:myaccount:livingroom:setTemperature" }
diff --git a/bundles/org.openhab.binding.mercedesme/README.md b/bundles/org.openhab.binding.mercedesme/README.md
index 401e96384c4b6..6ac649b67440f 100644
--- a/bundles/org.openhab.binding.mercedesme/README.md
+++ b/bundles/org.openhab.binding.mercedesme/README.md
@@ -8,7 +8,7 @@ If you face some problems during setup or runtime please have a look into the [T
 
 ## Supported Things
 
-| Type            | ID            | Description                                     | 
+| Type            | ID            | Description                                     |
 |-----------------|---------------|-------------------------------------------------|
 | Bridge          | `account`     | Connect your Mercedes Me account                |
 | Thing           | `combustion`  | Conventional fuel vehicle                       |
@@ -17,7 +17,7 @@ If you face some problems during setup or runtime please have a look into the [T
 
 ## Bridge Configuration
 
-Bridge needs configuration in order to connect properly to your Mercedes Me Account. 
+Bridge needs configuration in order to connect properly to your Mercedes Me Account.
 
 ### Pre-Conditions
 
@@ -31,33 +31,33 @@ Bridge needs configuration in order to connect properly to your Mercedes Me Acco
 Perform the following steps to obtain the configuration data and perform the authorization flow.
 
 1. Go to [Mercedes Developer Page](https://developer.mercedes-benz.com/). Login with your Mercedes Me credentials.
-2. Create a project in the [console tab](https://developer.mercedes-benz.com/console)
+1. Create a project in the [console tab](https://developer.mercedes-benz.com/console)
     - _Project Name:_  unique name e.g. **openHAB Mercedes Me binding** plus **Your bridge ID**
     - _Purpose URL:_  use link towards [this binding description](https://www.openhab.org/addons/bindings/mercedesme/)
     - _Business Purpose:_  e.g. **Private usage in openHAB Smarthome system**
-3. After project is created subscribe [to these Mercedes Benz APIs](https://developer.mercedes-benz.com/products?vt=cars&vt=vans&vt=smart&p=BYOCAR) with _Add Products_ button 
-4. For all Products perform the same steps
+1. After project is created subscribe [to these Mercedes Benz APIs](https://developer.mercedes-benz.com/products?vt=cars&vt=vans&vt=smart&p=BYOCAR) with _Add Products_ button
+1. For all Products perform the same steps
     - Select product
     - Choose _Get For Free_
     - Choose _BYOCAR_ (Build Your Own Car)
     - Button _Confirm_
-5. Select the following products
+1. Select the following products
     - Vehicle Status
     - Vehicle Lock Status
     - Pay as you drive insurance
     - Electric Vehicle Status
     - Fuel Status
-6. Optional: Subscribe also to _Vehicle images_. Select the _Basic Trial_ version. The images will be stored so the API is used just a few times.
-7. Press _Subscribe_ button. Your project should have [these product subscriptions](#mb-product-subscriptions)
-8. Generate the [project credentials](#mb-credentials)
-9. Open in new browser tab your openHAB page. Add a new Thing _Mercedes Me Account_
-10. Copy paste _Client ID_ , _Client Secret_ and _API Key_ from the Mercedes tab into the openHAB configuration
-11. Check if the registered Mercedes products _excluding Vehicle Images_ are matching exactly with the openHab configuration switches
-12. Create Thing!
-13. The fresh created [account has one property](#openhab-configuration) `callbackUrl`. Copy it and paste it in a new browser tab
-14. A [simple HTML page is shown including a link towards the Authorization flow](#callback-page) - **don't click yet**. If page isn't shown please adapt IP and port in openHAB configuration with Advanced Options activated
-15. The copied URL needs to be added in your [Mercedes project credentials](#mb-credentials) from 8
-16. Now click onto the link from 14. You'll be asked one time if you [grant access](#mb-access-request) towards the API. Click OK and authorization is done!
+1. Optional: Subscribe also to _Vehicle images_. Select the _Basic Trial_ version. The images will be stored so the API is used just a few times.
+1. Press _Subscribe_ button. Your project should have [these product subscriptions](#mb-product-subscriptions)
+1. Generate the [project credentials](#mb-credentials)
+1. Open in new browser tab your openHAB page. Add a new Thing _Mercedes Me Account_
+1. Copy paste _Client ID_ , _Client Secret_ and _API Key_ from the Mercedes tab into the openHAB configuration
+1. Check if the registered Mercedes products _excluding Vehicle Images_ are matching exactly with the openHab configuration switches
+1. Create Thing!
+1. The fresh created [account has one property](#openhab-configuration) `callbackUrl`. Copy it and paste it in a new browser tab
+1. A [simple HTML page is shown including a link towards the Authorization flow](#callback-page) - **don't click yet**. If page isn't shown please adapt IP and port in openHAB configuration with Advanced Options activated
+1. The copied URL needs to be added in your [Mercedes project credentials](#mb-credentials) from 8
+1. Now click onto the link from 14. You'll be asked one time if you [grant access](#mb-access-request) towards the API. Click OK and authorization is done!
 
 Some supporting screenshots for the setup
 
@@ -81,7 +81,6 @@ Some supporting screenshots for the setup
 
 <img src="./doc/CallbackUrl_Page.png" width="500" height="350"/>
 
-
 ### Bridge Configuration Parameters
 
 | Name            | Type    | Description                           | Default     | Required | Advanced |
@@ -100,13 +99,12 @@ Some supporting screenshots for the setup
 The `callbackPort` needs to be unique for all created Mercedes Me account things. Otherwise token exchange will be corrupted.
 Set the advanced options by yourself if you know your IP and Port, otherwise give auto detect a try.
 
-
 ## Thing Configuration
 
 For vehicle images Mercedes Benz Developer offers only a trial version with limited calls.
 Check in **beforehand** if your vehicle has some restrictions or even if it's supported at all.
 Visit [Vehicle Image Details](https://developer.mercedes-benz.com/products/vehicle_images/details) in order to check your vehicle capabilities.
-Visit [Image Settings](https://developer.mercedes-benz.com/products/vehicle_images/docs#_default_image_settings) to get more information about 
+Visit [Image Settings](https://developer.mercedes-benz.com/products/vehicle_images/docs#_default_image_settings) to get more information about
 For example the EQA doesn't provide `night` images with `background`.
 If your configuration is set this way the API calls are wasted!
 
@@ -305,12 +303,12 @@ Images are stored in `jsondb` so if you requested all images the Mercedes Benz I
 If you're not satisfied e.g. you want a background you need to
 
 1. change the [Advanced Image Configuration Properties](#thing-configuration)
-2. Switch `clear-cache` channel item to `ON` to clear all images
-3. request them via `image-view` 
+1. Switch `clear-cache` channel item to `ON` to clear all images
+1. request them via `image-view`
 
 ### Image View Options
 
-You can access the options either in a rule via `YOUR_IMAGE_VIEW_ITEM.getStateDescription().getOptions()` or in UI in widget configuration as _Action: Command options_ and as _Action Item: YOUR_IMAGE_VIEW_ITEM_ 
+You can access the options either in a rule via `YOUR_IMAGE_VIEW_ITEM.getStateDescription().getOptions()` or in UI in widget configuration as _Action: Command options_ and as _Action Item: YOUR_IMAGE_VIEW_ITEM_
 
 <img src="./doc/ImageView-CommandOptions.png" width="400" height="350"/>
 
@@ -329,26 +327,26 @@ Otherwise you'll receive some error message when clicking the link after opening
 Most common errors:
 
 - redirect URL doesn't match: Double check if `callbackUrl` is really saved correctly in your Mercedes Benz Developer project
-- scope failure: the requested scope doesn't match with the subscribed products. 
-    - Check [openHab configuration switches](#openhab-configuration) 
-    - apply changes if necessary and don't forget to save
-    - after these steps refresh the `callbackUrl` in [your browser](#callback-page) to apply these changes
-    - try a new authorization clicking the link 
+- scope failure: the requested scope doesn't match with the subscribed products.
+  - Check [openHab configuration switches](#openhab-configuration)
+  - apply changes if necessary and don't forget to save
+  - after these steps refresh the `callbackUrl` in [your browser](#callback-page) to apply these changes
+  - try a new authorization clicking the link
 
 ### Receive no data
 
 Especially after setting the frist Mercedes Benz Developer Project you'll receive no data.
-It seems that the API isn't _filled_ yet. 
+It seems that the API isn't _filled_ yet.
 
-**Pre-Condition**
+#### Pre-Condition
 
 - The Mercedes Me bridge is online = authorization is fine
-- The Mercedes Me thing is online = API calls are fine 
+- The Mercedes Me thing is online = API calls are fine
 
-**Solution**
+#### Solution
 
 - Reduce `refreshInterval` to 1 minute
-- Go to your vehicle, open doors and windows, turn on lights, drive a bit  ... 
+- Go to your vehicle, open doors and windows, turn on lights, drive a bit  ...
 - wait until values are providing the right states
 
 ### Images
@@ -372,35 +370,34 @@ My personal experience during limited testing
 
 Data is stored in directory `%USER_DATA%/jsondb` for handling tokens and vehicle images.
 
- * _StorageHandler.For.OAuthClientService.json_ - token is stored with key `clientId` which is provided by `account` [Brige Configuration Parameters](#bridge-configuration-parameters)
- * _mercedesme_%VEHICLE_VIN%.json_ - images are stored per vehicle. File name contains `vin` configured by [vehicle Thing Configuration](#thing-configuration)
+- _StorageHandler.For.OAuthClientService.json_ - token is stored with key `clientId` which is provided by `account` [Brige Configuration Parameters](#bridge-configuration-parameters)
+- _mercedesme_%VEHICLE_VIN%.json_ - images are stored per vehicle. File name contains `vin` configured by [vehicle Thing Configuration](#thing-configuration)
 
 With this data the binding is able to operate without new authorization towards Mercedes each startup and reduces the restricted calls towards image API.
 Also these files are properly stored in your [backup](https://community.openhab.org/t/docs-on-how-to-backup-openhab/100182) e.g. if you perform `openhab-cli backup`
 
-
 ## Full example
 
-The example is based on a battery electric vehicle. 
+The example is based on a battery electric vehicle.
 Exchange configuration parameters in the Things section
 
 Bridge
 
-* 4711 - your desired bridge id
-* YOUR_CLIENT_ID - Client ID of the Mercedes Developer project
-* YOUR_CLIENT_SECRET - Client Secret of the Mercedes Developer project
-* YOUR_API_KEY - Image API Key of the Mercedes Developer project
-* YOUR_OPENHAB_SERVER_IP - IP address of your openHAB server
-* 8090 - a **unique** port number - each bridge in your openHAB installation needs to have different port number!
+- 4711 - your desired bridge id
+- YOUR_CLIENT_ID - Client ID of the Mercedes Developer project
+- YOUR_CLIENT_SECRET - Client Secret of the Mercedes Developer project
+- YOUR_API_KEY - Image API Key of the Mercedes Developer project
+- YOUR_OPENHAB_SERVER_IP - IP address of your openHAB server
+- 8090 - a **unique** port number - each bridge in your openHAB installation needs to have different port number!
 
 Thing
 
-* eqa - your desired vehicle thing id 
-* VEHICLE_VIN - your Vehicle Identification Number
+- eqa - your desired vehicle thing id
+- VEHICLE_VIN - your Vehicle Identification Number
 
 ### Things file
 
-```
+```java
 Bridge mercedesme:account:4711   "MercedesMe John Doe" [ clientId="YOUR_CLIENT_ID", clientSecret="YOUR_CLIENT_SECRET", imageApiKey="YOUR_API_KEY", callbackIP="YOUR_OPENHAB_SERVER_IP", callbackPort=8092, odoScope=true, vehicleScope=true, lockScope=true, fuelScope=true, evScope=true] {
          Thing bev eqa           "Mercedes EQA"        [ vin="VEHICLE_VIN", refreshInterval=5, background=false, night=false, cropped=false, roofOpen=false, format="webp"]
 }
@@ -408,7 +405,7 @@ Bridge mercedesme:account:4711   "MercedesMe John Doe" [ clientId="YOUR_CLIENT_I
 
 ### Items file
 
-```
+```java
 Number:Length           EQA_Mileage                 "Odometer [%d %unit%]"                        {channel="mercedesme:bev:4711:eqa:range#mileage" }                                                                           
 Number:Length           EQA_Range                   "Range [%d %unit%]"                           {channel="mercedesme:bev:4711:eqa:range#range-electric"}
 Number:Length           EQA_RangeRadius             "Range Radius [%d %unit%]"                    {channel="mercedesme:bev:4711:eqa:range#radius-electric"}   
@@ -446,7 +443,7 @@ Number                  EQA_LightSwitch             "Main Light Switch [%s]"
 
 ### Sitemap
 
-```
+```perl
 sitemap MB label="Mercedes Benz EQA" {
   Frame label="EQA Image" {
     Image  item=EQA_Image  
diff --git a/bundles/org.openhab.binding.meteoalerte/README.md b/bundles/org.openhab.binding.meteoalerte/README.md
index 6be47e9930cb6..160820015b2b2 100644
--- a/bundles/org.openhab.binding.meteoalerte/README.md
+++ b/bundles/org.openhab.binding.meteoalerte/README.md
@@ -49,7 +49,7 @@ The Météo Alerte information that are retrieved is available as these channels
 | avalanches-icon       | Image     | Pictogram of Avalanche alert level            |
 | vague-submersion-icon | Image     | Pictogram of Wave Submersion alert level      |
 
-(*) Each alert level is described by a color : 
+(*) Each alert level is described by a color :
 
 | Code | Color  | Description                               |
 |------|--------|-------------------------------------------|
@@ -58,18 +58,17 @@ The Météo Alerte information that are retrieved is available as these channels
 | 2    | Orange | Be "very vigilant" in the concerned areas |
 | 3    | Red    | Absolute vigilance required               |
 
-
 ## Full Example
 
 meteoalert.things:
 
-```
+```java
 Thing meteoalerte:department:yvelines @ "MyCity" [department="YVELINES", refresh=12]
 ```
 
 meteoalert.items:
 
-```
+```java
 Group gMeteoAlert "Alertes Météo" <weather> 
     String  MA_Dept78                    "Département 78 [%s]"   <aqi>       (gMeteoAlert)   {channel="meteoalerte:department:yvelines:comment"}
     Number  MA_etat_canicule             "Canicule [%s]"         <aqi>       (gMeteoAlert)   {channel="meteoalerte:department:yvelines:canicule"}
diff --git a/bundles/org.openhab.binding.meteoblue/README.md b/bundles/org.openhab.binding.meteoblue/README.md
index ffe134734bc56..30189659d17f6 100644
--- a/bundles/org.openhab.binding.meteoblue/README.md
+++ b/bundles/org.openhab.binding.meteoblue/README.md
@@ -3,7 +3,6 @@
 The meteoblue binding uses the [meteoblue weather service](https://content.meteoblue.com/en/content/view/full/4511)
 to provide weather information.
 
-
 ## Supported Things
 
 The binding has two thing types.
@@ -12,7 +11,6 @@ The first thing type is the weather thing. Each weather thing has the ID `weathe
 The second thing type is the bridge thing. The bridge thing, which has the ID `bridge`, holds the API key to be used for all of
 its child things.
 
-
 ## Thing Configuration
 
 ### Bridge Thing Configuration
@@ -21,7 +19,6 @@ its child things.
 | ------------- |:-------------:| :-------: | -------------------- |
 | apiKey        |               | Yes       | The api key to be used with the meteoblue service |
 
-
 ### Weather Thing Configuration
 
 | Property      | Default Value | Required? | Description          |
@@ -31,7 +28,6 @@ its child things.
 | serviceType   | NonCommercial | No        | The service type to be used.  Either 'Commercial' or 'NonCommercial' |
 | timeZone      |               | No        | The time zone to use for the location. Optional, but the service recommends it be specified. The service gets the time zone from a database if not specified. |
 
-
 ## Channels
 
 ### Channel Groups
@@ -87,7 +83,6 @@ Each of the following channels is supported in all of the channel groups.
 | precipitationHours       | Number             | Total hours of the day with precipitation |
 | humidityGreater90Hours   | Number             | Total hours of the day with relative humidity greater than 90% |
 
-
 ## Image Icons
 
 To show the weather image icons in the UI, the [image files](https://content.meteoblue.com/hu/service-specifications/standards/symbols-and-pictograms) need to be downloaded and installed in the `conf/icons/classic` folder.
@@ -96,21 +91,20 @@ In the "Downloads" section at the bottom of the page, download the file named `m
 
 The files to extract from the zip file and install in the folder will be named "iday*.png" or "iday*.svg".
 
-
 ## Full Example
 
 demo.things:
 
-```
+```java
 Bridge meteoblue:bridge:metBridge "metBridge" [ apiKey="XXXXXXXXXXXX" ] {
-	Thing weather A51 "Area 51" [ serviceType="NonCommercial", location="37.23,-115.5,1360", timeZone="America/Los_Angeles", refresh=240 ] {
-	}
+ Thing weather A51 "Area 51" [ serviceType="NonCommercial", location="37.23,-115.5,1360", timeZone="America/Los_Angeles", refresh=240 ] {
+ }
 }
 ```
 
 demo.items:
 
-```
+```java
 // ----------------- meteoblue GROUPS ------------------------------------------
 Group weatherDay0 "Today's Weather"
 Group weatherDay1 "Tomorrow's Weather"
@@ -127,8 +121,8 @@ String todayPCode    "Pictocode [%d]"  <iday>  (weatherDay0)  {channel="meteoblu
 String todayCond     "Condition [%s]"  <iday>  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#condition"}
 Image todayIcon     "Icon [%s]"       (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#icon"}
 Number todayUV       "UV Index [%d]"  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#UVIndex"}
-Number:Temperature  todayTempL  "Low Temp [%.2f �F]"   <temperature>  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#minTemperature"}
-Number:Temperature  todayTempH  "High Temp [%.2f �F]"  <temperature>  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#maxTemperature"}
+Number:Temperature  todayTempL  "Low Temp [%.2f °F]"   <temperature>  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#minTemperature"}
+Number:Temperature  todayTempH  "High Temp [%.2f °F]"  <temperature>  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#maxTemperature"}
 Number todayHumM     "Mean Humidity [%d %%]"  <humidity>  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#relativeHumidityMean"}
 Number todayPrecPr   "Prec. Prob. [%d %%]"  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#precipitationProbability"}
 Number:Length todayPrec     "Total Prec. [%.2f in]"  <rain>  (weatherDay0)  {channel="meteoblue:weather:metBridge:A51:forecastToday#precipitation"}
@@ -146,7 +140,7 @@ Number:Speed  todayWindSpH   "High Wind Speed [%.2f mph]"  <wind>  (weatherDay0)
 
 demo.sitemap:
 
-````
+````perl
 sitemap weather label="Weather"
 {
   Frame label="Weather" {
diff --git a/bundles/org.openhab.binding.meteostick/README.md b/bundles/org.openhab.binding.meteostick/README.md
index 67e6169c6cd9a..d572237f3a309 100644
--- a/bundles/org.openhab.binding.meteostick/README.md
+++ b/bundles/org.openhab.binding.meteostick/README.md
@@ -12,7 +12,6 @@ This binding support 2 different things types
 | meteostick_bridge    | Bridge | This is the Meteostick USB stick  |
 | meteostick_davis_iss | Thing  | This is the Davis Vue ISS         |
 
-
 ## Binding Configuration
 
 The Meteostick things need to be manually added - there is no discovery in the Meteostick binding.
@@ -90,11 +89,11 @@ Steps:
 1. [Register](https://www.wunderground.com/personal-weather-station/signup.asp) your personal weather station with Weather Underground and make note of the station ID and password issued.
 1. Add the following files to your openHAB configuration:
 
-### things/meteostick.things 
+### things/meteostick.things
 
 Things can be defined in the .things file as follows:
 
-```
+```java
 meteostick:meteostick_bridge:receiver [ port="/dev/tty.usbserial-AI02XA60", mode=1 ]
 meteostick:meteostick_davis_iss:iss (meteostick:meteostick_bridge:receiver) [ channel=1, spoon=0.2 ]
 ```
@@ -103,7 +102,7 @@ Note the configuration options for `port`, `mode`, `channel` and `spoon` above a
 
 ### items/meteostick.items
 
-```
+```java
 Number:Pressure MeteoStickPressure "Meteostick Pressure [%.1f hPa]"{ channel="meteostick:meteostick_bridge:receiver:pressure" }
 Number:Temperature DavisVantageVueOutdoorTemperature "ISS Outdoor Temp [%.1f °C]" { channel="meteostick:meteostick_davis_iss:iss:outdoor-temperature" }
 Number DavisVantageVueHumidity "ISS Humidity [%.0f %%]" { channel="meteostick:meteostick_davis_iss:iss:humidity" }
@@ -119,7 +118,7 @@ Number:Length DavisVantageVueRainCurrentHour "ISS Rain Current Hour [%.1f mm]" {
 
 Replace `YOUR_ID` and `your_password` below with the values from the the Weather Underground registration process.
 
-```
+```java
 import java.net.URLEncoder
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -133,46 +132,46 @@ import java.util.TimeZone
 
 rule PWS
 when
-	Item DavisVantageVueWindDirectionAverage received update
+ Item DavisVantageVueWindDirectionAverage received update
 then
-	val id = 'YOUR_ID'
-	val pw = 'your_password'
-	val sdf = new SimpleDateFormat('yyyy-MM-dd HH:mm:ss')
-	sdf.setTimeZone(TimeZone.getTimeZone('UTC'))
-	val double rh = DavisVantageVueHumidity.getStateAs(DecimalType).doubleValue
-	val double tempc = DavisVantageVueOutdoorTemperature.getStateAs(QuantityType).toUnit('°C').doubleValue
-	val double dewptc = 243.04 * (Math.log(rh/100) + ((17.625 * tempc) / (243.04 + tempc))) / (17.625 - Math.log(rh/100) - ((17.625 * tempc) / (243.04 + tempc)))
-	val double dewptf = new QuantityType(dewptc, CELSIUS).toUnit('°F').doubleValue
-	val Map<String, Object> params = newLinkedHashMap(
-		'action' ->           'updateraw',
-		'ID' ->               id,
-		'PASSWORD' ->         pw,
-		'dateutc' ->          sdf.format(new Date()),
-		'winddir' ->          DavisVantageVueWindDirection.getStateAs(QuantityType).toUnit('°').intValue,
-		'windspeedmph' ->     DavisVantageVueWindSpeed.getStateAs(QuantityType).toUnit('mph').doubleValue,
-		'windgustmph' ->      DavisVantageVueWindSpeedMaximum.getStateAs(QuantityType).toUnit('mph').doubleValue,
-		'windgustdir' ->      DavisVantageVueWindDirectionAverage.getStateAs(QuantityType).toUnit('°').intValue,
-		'windspdmph_avg2m' -> DavisVantageVueWindSpeedAverage.getStateAs(QuantityType).toUnit('mph').doubleValue,
-		'winddir_avg2m' ->    DavisVantageVueWindDirectionAverage.getStateAs(QuantityType).toUnit('°').intValue,
-		'humidity' ->         DavisVantageVueHumidity.state,
-		'dewptf' ->           dewptf,
-		'tempf' ->            DavisVantageVueOutdoorTemperature.getStateAs(QuantityType).toUnit('°F').doubleValue,
-		'rainin' ->           DavisVantageVueRainCurrentHour.getStateAs(QuantityType).toUnit('in').doubleValue,
-		'baromin' ->          MeteoStickPressure.getStateAs(QuantityType).toUnit('inHg').doubleValue,
-		'softwaretype' ->     'openHAB 2.4')
-
-	var url = 'https://weatherstation.wunderground.com/weatherstation/updateweatherstation.php?'
-	var first = true
-	for (key : params.keySet()) {
-		if (!first) {
-			url += '&'
-		}
-		url += key + '=' + URLEncoder::encode(params.get(key).toString, 'UTF-8')
-		first = false
-	}
-
-	logDebug('PWS', 'url is {}', url)
-	sendHttpGetRequest(url)
+ val id = 'YOUR_ID'
+ val pw = 'your_password'
+ val sdf = new SimpleDateFormat('yyyy-MM-dd HH:mm:ss')
+ sdf.setTimeZone(TimeZone.getTimeZone('UTC'))
+ val double rh = DavisVantageVueHumidity.getStateAs(DecimalType).doubleValue
+ val double tempc = DavisVantageVueOutdoorTemperature.getStateAs(QuantityType).toUnit('°C').doubleValue
+ val double dewptc = 243.04 * (Math.log(rh/100) + ((17.625 * tempc) / (243.04 + tempc))) / (17.625 - Math.log(rh/100) - ((17.625 * tempc) / (243.04 + tempc)))
+ val double dewptf = new QuantityType(dewptc, CELSIUS).toUnit('°F').doubleValue
+ val Map<String, Object> params = newLinkedHashMap(
+  'action' ->           'updateraw',
+  'ID' ->               id,
+  'PASSWORD' ->         pw,
+  'dateutc' ->          sdf.format(new Date()),
+  'winddir' ->          DavisVantageVueWindDirection.getStateAs(QuantityType).toUnit('°').intValue,
+  'windspeedmph' ->     DavisVantageVueWindSpeed.getStateAs(QuantityType).toUnit('mph').doubleValue,
+  'windgustmph' ->      DavisVantageVueWindSpeedMaximum.getStateAs(QuantityType).toUnit('mph').doubleValue,
+  'windgustdir' ->      DavisVantageVueWindDirectionAverage.getStateAs(QuantityType).toUnit('°').intValue,
+  'windspdmph_avg2m' -> DavisVantageVueWindSpeedAverage.getStateAs(QuantityType).toUnit('mph').doubleValue,
+  'winddir_avg2m' ->    DavisVantageVueWindDirectionAverage.getStateAs(QuantityType).toUnit('°').intValue,
+  'humidity' ->         DavisVantageVueHumidity.state,
+  'dewptf' ->           dewptf,
+  'tempf' ->            DavisVantageVueOutdoorTemperature.getStateAs(QuantityType).toUnit('°F').doubleValue,
+  'rainin' ->           DavisVantageVueRainCurrentHour.getStateAs(QuantityType).toUnit('in').doubleValue,
+  'baromin' ->          MeteoStickPressure.getStateAs(QuantityType).toUnit('inHg').doubleValue,
+  'softwaretype' ->     'openHAB 2.4')
+
+ var url = 'https://weatherstation.wunderground.com/weatherstation/updateweatherstation.php?'
+ var first = true
+ for (key : params.keySet()) {
+  if (!first) {
+   url += '&'
+  }
+  url += key + '=' + URLEncoder::encode(params.get(key).toString, 'UTF-8')
+  first = false
+ }
+
+ logDebug('PWS', 'url is {}', url)
+ sendHttpGetRequest(url)
 end
 ```
 
diff --git a/bundles/org.openhab.binding.miele/README.md b/bundles/org.openhab.binding.miele/README.md
index 2aa12ed7a5811..d87b25ccabdbb 100644
--- a/bundles/org.openhab.binding.miele/README.md
+++ b/bundles/org.openhab.binding.miele/README.md
@@ -1,7 +1,7 @@
 # Miele@home Binding
 
 This binding integrates Miele@home appliances.
-Miele@home allows controlling Miele appliances that are equipped with special communication modules. 
+Miele@home allows controlling Miele appliances that are equipped with special communication modules.
 There are devices that communicate through ZigBee and others that use WiFi.
 
 See [www.miele.de](https://www.miele.de) for the list of available appliances.
@@ -11,7 +11,7 @@ See [www.miele.de](https://www.miele.de) for the list of available appliances.
 This binding requires the XGW3000 gateway from Miele as all integration with openHAB is done through this gateway.
 While users with ZigBee-enabled Miele appliances usually own such a gateway, this is often not the case for people that have only WiFi-enabled appliances.
 
-The types of appliances that are supported by this binding are: 
+The types of appliances that are supported by this binding are:
 
 - Coffeemachine
 - Dishwasher
@@ -37,7 +37,7 @@ To avoid this, there is a discovery configuration parameter `removalGracePeriod`
 The default value is 15 seconds.
 If you want to change this value just add the following line to your `$OPENHAB_CONF/services/runtime.cfg` file.
 
-```
+```text
 discovery.miele:removalGracePeriod=30
 ```
 
@@ -407,7 +407,7 @@ See oven.
 
 ## things/miele.things
 
-```
+```java
 Bridge miele:xgw3000:home [ipAddress="192.168.0.18", interface="192.168.0.5"] {
     Things:
         Thing fridgefreezer freezer [uid="00124b000424be44#2"]
@@ -425,7 +425,7 @@ Bridge miele:xgw3000:home [ipAddress="192.168.0.18", interface="192.168.0.5"] {
 
 ## items/miele.items
 
-```
+```java
 String Dishwasher_State                                     {channel="miele:dishwasher:home:dishwasher:state"}
 Number Dishwasher_RawState                                  {channel="miele:dishwasher:home:dishwasher:rawState"}
 String Dishwasher_Program "Program [%s]"                    {channel="miele:dishwasher:home:dishwasher:program"}
@@ -473,7 +473,7 @@ DateTime TumbleDryer_FinishTime "Remaining time" <time>     {channel="miele:tumb
 
 ## sitemaps/miele.sitemap
 
-```
+```perl
 sitemap miele label="Miele" {
     Frame label="Miele" {
         Text item=Oven_State label="Oven [%s]" icon="kitchen" {
diff --git a/bundles/org.openhab.binding.mielecloud/README.md b/bundles/org.openhab.binding.mielecloud/README.md
index 9da358d69b6bc..82750a3ab6d9d 100644
--- a/bundles/org.openhab.binding.mielecloud/README.md
+++ b/bundles/org.openhab.binding.mielecloud/README.md
@@ -76,7 +76,6 @@ The account has the following parameters:
 | email       | required  | E-mail address identifying this account. This exists only to distinguish accounts. If the address is changed after authorization then the account needs to be authorized again. |
 | locale      | optional  | The locale to use for full text channels of things from this account. Possible values are `en`, `de`, `da`, `es`, `fr`, `it`, `nl`, `nb`. Default is `en`.                      |
 
-
 ### Appliance Configuration
 
 The binding configuration UI will show a things-file template containing things for all supported appliances from the paired account.
@@ -88,7 +87,6 @@ All Miele cloud appliance things have the following parameters:
 | ---------------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
 | deviceIdentifier | required  | Technical device identifier uniquely identifying the Miele appliance. Use the discovery result or the things-file template to obtain it. |
 
-
 ## Channels
 
 The following table lists all available channels.
@@ -493,7 +491,7 @@ The following chapters list the properties offered by appliances.
 
 ### demo.things:
 
-```
+```java
 Bridge mielecloud:account:home [ email="me@openhab.org", locale="en" ] {
     Thing coffee_system 000703261234 "Coffee machine CVA7440" [ deviceIdentifier="000703261234" ]
     Thing hob 000160102345 "Cooktop KM7677" [ deviceIdentifier="000160102345" ]
@@ -502,7 +500,7 @@ Bridge mielecloud:account:home [ email="me@openhab.org", locale="en" ] {
 
 ### demo.items:
 
-```
+```java
 // Coffee system
 Switch coffee_system_remote_control_can_be_started      { channel="mielecloud:coffee_system:home:000703261234:remote_control_can_be_started" }
 Switch coffee_system_remote_control_can_be_stopped      { channel="mielecloud:coffee_system:home:000703261234:remote_control_can_be_stopped" }
@@ -541,7 +539,7 @@ String hob_plate_6_power_step            { channel="mielecloud:hob:home:00016010
 
 ### demo.sitemap:
 
-```
+```perl
 sitemap demo label="Kitchen"
 {
     Frame {
@@ -620,4 +618,3 @@ Here are some ideas on what could be done with this binding. You have more ideas
 ## Acknowledgements
 
 The development of this binding was initiated and sponsored by Miele & Cie. KG.
-
diff --git a/bundles/org.openhab.binding.mihome/README.md b/bundles/org.openhab.binding.mihome/README.md
index 5a7e01f15e65b..38b838266d60f 100644
--- a/bundles/org.openhab.binding.mihome/README.md
+++ b/bundles/org.openhab.binding.mihome/README.md
@@ -1,12 +1,12 @@
 # Xiaomi Mi Smart Home Binding
 
 This binding allows your openHAB to communicate with the Xiaomi Smart Home Suite.
-It consists of devices communicating over a ZigBee network with a ZigBee - WiFi gateway. 
+It consists of devices communicating over a ZigBee network with a ZigBee - WiFi gateway.
 
 The devices are very affordable and you can get them from your favourite Chinese markets like [AliExpress](https://www.aliexpress.com/) or [GearBest](https://www.gearbest.com).
-The sensors run on a coin cell battery for over a year. 
+The sensors run on a coin cell battery for over a year.
 
-After setup, you can disconnect the gateway from the internet to keep your sensor information private. 
+After setup, you can disconnect the gateway from the internet to keep your sensor information private.
 
 Please note that using the Xiaomi gateway with openHAB requires enabling the developer mode and that multiple user reports suggest that it is no longer possible.
 Zigbee2Mqtt provides an alternative method to integrate Xiaomi devices.
@@ -15,90 +15,81 @@ Zigbee2Mqtt provides an alternative method to integrate Xiaomi devices.
 
 | Device | Picture |
 | --- | --- |
-| Gateway v2 (with radio support) or v3  | ![](https://ae01.alicdn.com/kf/HTB1gF76ciqAXuNjy1Xdq6yYcVXa4/Original-Xiaomi-Mi-Gateway-2-Smart-Home-Kit-Multi-functional-Gateway-Work-with-Mi-Door-Sensor.jpg_300x300.jpg) |
-| Mijia Temperature and Humidity Sensor | ![](https://ae01.alicdn.com/kf/HTB1ksk_MXXXXXcWXVXXq6xXFXXXz/Original-Xiaomi-Mi-Smart-Temperature-and-Humidity-Sensor-Put-the-baby-Home-office-Work-With-Android.jpg_300x300.jpg)|
-| Aqara Temperature, Humidity and Pressure Sensor | ![](https://ae01.alicdn.com/kf/HTB1fD1URVXXXXaDXFXXq6xXFXXXU/Neue-Original-Xiaomi-Aqara-Intelligente-Luftdruck-Temperatur-Luftfeuchtigkeit-Sensor-Arbeit-Mit-Android-IOS-APP-Fasten-schiff.jpg_300x300.jpg) |
-| Mijia Door/Window Sensor | ![](https://ae01.alicdn.com/kf/HTB1WQb3SpXXXXcLXpXXq6xXFXXXz/100-Original-Intelligent-Mini-Mijia-Xiaomi-MI-Door-Window-Sensor-for-Xiaomi-Smart-Home-Suite-Devices.jpg_300x300.jpg) |
-| Aqara Door/Window Sensor | ![](https://ae01.alicdn.com/kf/HTB1C2f7RVXXXXbNXpXXq6xXFXXX9/Auf-lager-Original-xiaomi-aqara-Smart-T-ren-und-Fenster-Sensor-Mijia-Smart-home-kit-Zigbee.jpg_300x300.jpg) |
-| Mijia Human Body Sensor | ![](https://ae01.alicdn.com/kf/HTB1mvasRXXXXXaZXVXXq6xXFXXXY/XIAOMI-Mi-mijia-Infrared-Motion-Sensor-Smart-Human-Body-Sensor-for-Home-Safety-Smart-Remote-Control.jpg_300x300.jpg) |
-| Aqara Motion Sensor (with light intensity support) | ![](https://ae01.alicdn.com/kf/HTB1LaENRFXXXXXNapXXq6xXFXXXZ/Xiaomi-Aqara-Body-Sensor-Light-Intensity-Sensors-ZigBee-wifi-Wireless-Connection-Work-for-xiaomi-smart-home.jpg_300x300.jpg) |
-| Smart Socket (Zigbee version) | ![](https://ae01.alicdn.com/kf/HTB17Fy2QXXXXXajaXXXq6xXFXXXQ/Original-Xiaomi-Smart-Socket-Plug-Mi-Zigbee-WiFi-APP-Wireless-Control-Switches-EU-US-AU-Timer.jpg_300x300.jpg) |
-| Magic Cube Controller | ![](https://ae01.alicdn.com/kf/HTB1IFoebPuhSKJjSspmq6AQDpXam/Xiaomi-Mi-Magic-Cube-Controller-Zigbee-Version-Controlled-by-Six-Actions-For-Smart-Home-Device-work.jpg_300x300.jpg) |
-| Aqara Magic Cube Controller | ![](https://ae01.alicdn.com/kf/HTB1ih7YsL9TBuNjy1zbq6xpepXal/Original-Xiaomi-Aqara-Cube-Magic-Cube-Smart-Home-Controller-Zigbee-Version-6-Gestures-Operation-Mijia-Smart.jpg_300x300.jpg) |
-| Aqara Vibration Sensor | ![](https://ae01.alicdn.com/kf/HTB1mjNTKXuWBuNjSszbq6AS7FXaS/Xiaomi-Aqara-Zigbee-Shock-Sensor-Mijia-Aqara-Smart-Motion-Sensor-Vibration-Detection-Alarm-Monitor-for-MiHome.jpg_300x300.jpg) |
-| Mijia Wireless Switch | ![](https://ae01.alicdn.com/kf/HTB1qoEAPVXXXXXdaVXXq6xXFXXXr/Original-Xiaomi-Smart-Wireless-Switch-App-Remote-Control-Smart-Home-Intelligent-Device-Accessories-For-Xiaomi-Smart.jpg_300x300.jpg) |
-| Aqara Wireless Switch | ![](https://ae01.alicdn.com/kf/HTB17DMORVXXXXbdXFXXq6xXFXXXe/Xiaomi-Mijia-AQara-Smart-Multifunktionale-Intelligente-Drahtlose-Schalter-Schl-ssel-Kreiselkompa-Errichtet-Funktion-Arbeit-Mit-Android.jpg_300x300.jpg) |
-| Aqara Wireless Switch (with acceleration sensor) | ![](https://ae01.alicdn.com/kf/HTB1YGiNaNsIL1JjSZFqq6AeCpXaX/Original-xiaomi-Mijia-aqara-wireless-key-Upgraded-with-acceleration-sensor-magic-Mi-cube-sensor-work-with.jpg_300x300.jpg) |
-| Aqara Wall Switch (1 & 2 Button / With or Without Neutral Line) | ![](https://ae01.alicdn.com/kf/HTB1VGfGXL9TBuNjy1zbq6xpepXam/Original-Xiaomi-Aqara-Smart-Light-Control-Fire-Wire-Zero-Line-Double-Single-Key-ZiGBee-Wall-Switch.jpg_300x300.jpg) |
-| Aqara Wireless Light Control (1 & 2 Button) | ![](https://ae01.alicdn.com/kf/HTB19u.tPVXXXXbbXVXXq6xXFXXXH/Original-Xiaomi-Aqara-Smart-Switch-Light-Control-ZiGBee-Wireless-Key-Wall-Switch-By-Smarphone-Mi-Home.jpg_300x300.jpg) |
-| Aqara Curtain Motor | ![](https://ae01.alicdn.com/kf/HTB1jaMXQVXXXXXBXVXXq6xXFXXXF/Original-xiaomi-Aqara-Curtain-motor-Zigbee-wifi-Remote-Control-work-for-Xiaomi-Smart-home-kit-Mi.jpg_300x300.jpg) |
-| Aqara Water Leak Sensor | ![](https://ae01.alicdn.com/kf/HTB1zWulSVXXXXaVXXXXq6xXFXXXW/2018-Newest-Xiaomi-Mijia-Aqara-Water-Immersing-Sensor-Flood-Water-Leak-Detector-for-Home-Remote-Alarm.jpg_300x300.jpg) |
-| Honeywell Gas Detector | ![](https://ae01.alicdn.com/kf/HTB1F_ffQpXXXXaxXpXXq6xXFXXXS/Xiaomi-Mijia-Honeywell-Smart-Gas-Alarm-CH4-berwachung-Decke-Wand-Montiert-Einfach-Installieren-Typ-Mihome-APP.jpg_300x300.jpg) |
-| Honeywell Smoke Detector | ![](https://ae01.alicdn.com/kf/HTB12DGKQpXXXXaeaXXXq6xXFXXXK/Xiaomi-Mijia-Honeywell-Smart-Fire-Alarm-Detector-Progressive-Sound-Photoelectric-Smoke-Sensor-Remote-Linkage-Mihome-APP.jpg_300x300.jpg) |
-| Aqara Fingerprint & Keyless Card & PIN Lock | ![](https://ae01.alicdn.com/kf/HTB1lsuqjjuhSKJjSspaq6xFgFXaD/Original-xiaomi-Mijia-aqara-Smart-door-lock-Digital-Touch-Screen-Keyless-Fingerprint-Password-work-to-mi.jpg_300x300.jpg) |
+| Gateway v2 (with radio support) or v3  | ![Device Picture](https://ae01.alicdn.com/kf/HTB1gF76ciqAXuNjy1Xdq6yYcVXa4/Original-Xiaomi-Mi-Gateway-2-Smart-Home-Kit-Multi-functional-Gateway-Work-with-Mi-Door-Sensor.jpg_300x300.jpg) |
+| Mijia Temperature and Humidity Sensor | ![Device Picture](https://ae01.alicdn.com/kf/HTB1ksk_MXXXXXcWXVXXq6xXFXXXz/Original-Xiaomi-Mi-Smart-Temperature-and-Humidity-Sensor-Put-the-baby-Home-office-Work-With-Android.jpg_300x300.jpg)|
+| Aqara Temperature, Humidity and Pressure Sensor | ![Device Picture](https://ae01.alicdn.com/kf/HTB1fD1URVXXXXaDXFXXq6xXFXXXU/Neue-Original-Xiaomi-Aqara-Intelligente-Luftdruck-Temperatur-Luftfeuchtigkeit-Sensor-Arbeit-Mit-Android-IOS-APP-Fasten-schiff.jpg_300x300.jpg) |
+| Mijia Door/Window Sensor | ![Device Picture](https://ae01.alicdn.com/kf/HTB1WQb3SpXXXXcLXpXXq6xXFXXXz/100-Original-Intelligent-Mini-Mijia-Xiaomi-MI-Door-Window-Sensor-for-Xiaomi-Smart-Home-Suite-Devices.jpg_300x300.jpg) |
+| Aqara Door/Window Sensor | ![Device Picture](https://ae01.alicdn.com/kf/HTB1C2f7RVXXXXbNXpXXq6xXFXXX9/Auf-lager-Original-xiaomi-aqara-Smart-T-ren-und-Fenster-Sensor-Mijia-Smart-home-kit-Zigbee.jpg_300x300.jpg) |
+| Mijia Human Body Sensor | ![Device Picture](https://ae01.alicdn.com/kf/HTB1mvasRXXXXXaZXVXXq6xXFXXXY/XIAOMI-Mi-mijia-Infrared-Motion-Sensor-Smart-Human-Body-Sensor-for-Home-Safety-Smart-Remote-Control.jpg_300x300.jpg) |
+| Aqara Motion Sensor (with light intensity support) | ![Device Picture](https://ae01.alicdn.com/kf/HTB1LaENRFXXXXXNapXXq6xXFXXXZ/Xiaomi-Aqara-Body-Sensor-Light-Intensity-Sensors-ZigBee-wifi-Wireless-Connection-Work-for-xiaomi-smart-home.jpg_300x300.jpg) |
+| Smart Socket (Zigbee version) | ![Device Picture](https://ae01.alicdn.com/kf/HTB17Fy2QXXXXXajaXXXq6xXFXXXQ/Original-Xiaomi-Smart-Socket-Plug-Mi-Zigbee-WiFi-APP-Wireless-Control-Switches-EU-US-AU-Timer.jpg_300x300.jpg) |
+| Magic Cube Controller | ![Device Picture](https://ae01.alicdn.com/kf/HTB1IFoebPuhSKJjSspmq6AQDpXam/Xiaomi-Mi-Magic-Cube-Controller-Zigbee-Version-Controlled-by-Six-Actions-For-Smart-Home-Device-work.jpg_300x300.jpg) |
+| Aqara Magic Cube Controller | ![Device Picture](https://ae01.alicdn.com/kf/HTB1ih7YsL9TBuNjy1zbq6xpepXal/Original-Xiaomi-Aqara-Cube-Magic-Cube-Smart-Home-Controller-Zigbee-Version-6-Gestures-Operation-Mijia-Smart.jpg_300x300.jpg) |
+| Aqara Vibration Sensor | ![Device Picture](https://ae01.alicdn.com/kf/HTB1mjNTKXuWBuNjSszbq6AS7FXaS/Xiaomi-Aqara-Zigbee-Shock-Sensor-Mijia-Aqara-Smart-Motion-Sensor-Vibration-Detection-Alarm-Monitor-for-MiHome.jpg_300x300.jpg) |
+| Mijia Wireless Switch | ![Device Picture](https://ae01.alicdn.com/kf/HTB1qoEAPVXXXXXdaVXXq6xXFXXXr/Original-Xiaomi-Smart-Wireless-Switch-App-Remote-Control-Smart-Home-Intelligent-Device-Accessories-For-Xiaomi-Smart.jpg_300x300.jpg) |
+| Aqara Wireless Switch | ![Device Picture](https://ae01.alicdn.com/kf/HTB17DMORVXXXXbdXFXXq6xXFXXXe/Xiaomi-Mijia-AQara-Smart-Multifunktionale-Intelligente-Drahtlose-Schalter-Schl-ssel-Kreiselkompa-Errichtet-Funktion-Arbeit-Mit-Android.jpg_300x300.jpg) |
+| Aqara Wireless Switch (with acceleration sensor) | ![Device Picture](https://ae01.alicdn.com/kf/HTB1YGiNaNsIL1JjSZFqq6AeCpXaX/Original-xiaomi-Mijia-aqara-wireless-key-Upgraded-with-acceleration-sensor-magic-Mi-cube-sensor-work-with.jpg_300x300.jpg) |
+| Aqara Wall Switch (1 & 2 Button / With or Without Neutral Line) | ![Device Picture](https://ae01.alicdn.com/kf/HTB1VGfGXL9TBuNjy1zbq6xpepXam/Original-Xiaomi-Aqara-Smart-Light-Control-Fire-Wire-Zero-Line-Double-Single-Key-ZiGBee-Wall-Switch.jpg_300x300.jpg) |
+| Aqara Wireless Light Control (1 & 2 Button) | ![Device Picture](https://ae01.alicdn.com/kf/HTB19u.tPVXXXXbbXVXXq6xXFXXXH/Original-Xiaomi-Aqara-Smart-Switch-Light-Control-ZiGBee-Wireless-Key-Wall-Switch-By-Smarphone-Mi-Home.jpg_300x300.jpg) |
+| Aqara Curtain Motor | ![Device Picture](https://ae01.alicdn.com/kf/HTB1jaMXQVXXXXXBXVXXq6xXFXXXF/Original-xiaomi-Aqara-Curtain-motor-Zigbee-wifi-Remote-Control-work-for-Xiaomi-Smart-home-kit-Mi.jpg_300x300.jpg) |
+| Aqara Water Leak Sensor | ![Device Picture](https://ae01.alicdn.com/kf/HTB1zWulSVXXXXaVXXXXq6xXFXXXW/2018-Newest-Xiaomi-Mijia-Aqara-Water-Immersing-Sensor-Flood-Water-Leak-Detector-for-Home-Remote-Alarm.jpg_300x300.jpg) |
+| Honeywell Gas Detector | ![Device Picture](https://ae01.alicdn.com/kf/HTB1F_ffQpXXXXaxXpXXq6xXFXXXS/Xiaomi-Mijia-Honeywell-Smart-Gas-Alarm-CH4-berwachung-Decke-Wand-Montiert-Einfach-Installieren-Typ-Mihome-APP.jpg_300x300.jpg) |
+| Honeywell Smoke Detector | ![Device Picture](https://ae01.alicdn.com/kf/HTB12DGKQpXXXXaeaXXXq6xXFXXXK/Xiaomi-Mijia-Honeywell-Smart-Fire-Alarm-Detector-Progressive-Sound-Photoelectric-Smoke-Sensor-Remote-Linkage-Mihome-APP.jpg_300x300.jpg) |
+| Aqara Fingerprint & Keyless Card & PIN Lock | ![Device Picture](https://ae01.alicdn.com/kf/HTB1lsuqjjuhSKJjSspaq6xFgFXaD/Original-xiaomi-Mijia-aqara-Smart-door-lock-Digital-Touch-Screen-Keyless-Fingerprint-Password-work-to-mi.jpg_300x300.jpg) |
 
 ## Setup
 
-*   Install the binding
-*   Is your gateway already configured to connect to your WiFi? If not:
-
-    	1.  Install MiHome app from [Google Play](https://play.google.com/store/apps/details?id=com.xiaomi.smarthome) or [AppStore](https://itunes.apple.com/app/mi-home-xiaomi-for-your-smarthome/id957323480) (your phone may need to be changed to English language first)
-    	2.  In the app create a Mi Home account and make sure to set your region to Mainland (China) under Settings -> Locale
-    	3.  If asked, do NOT update your gateway to the latest firmware (note that update window may pop up sequentially).  If you update, you may not be able to access the developer mode below.
-
-*   Enable developer mode of your gateway:
-
-        1.  Select your Gateway in the MiHome app
-        2.  Go to the "..." menu on the top right corner and click "About"
-        3.  You now see two options "Smart Home Kit Forum" and "Gameplay Tutorial". Tap 5 times below the "Gameplay Tutorial" in the empty space (not the button itself) until you enable developer mode
-        4.  You should now have 2 extra options listed: `wireless communication protocol` and `hub info`, it may appear in Chinese
-        5.  Choose `wireless communication protocol`
-        6.  Tap the toggle switch to enable WiFi functions. Note down the developer key (aka password), something like: 91bg8zfkf9vd6uw7
-        7.  Make sure you hit the OK button (to the right of the cancel button) to save your changes
-        8.  Now update the gateway to the latest firmware
-
-*   Enable developer mode of your gateway (legacy app):
-
-        1.  Select your Gateway in the MiHome app
-        2.  Go to the "..." menu on the top right corner and click "About"
-        3.  Tap the version number "Plug-in version : 2.XX.X" at the bottom of the screen repeatedly until you enable developer mode
-        4.  You should now have 2 extra options listed: `wireless communication protocol` and `hub info`
-        5.  Choose `wireless communication protocol`
-        6.  Tap the toggle switch to enable WiFi functions. Note down the developer key (aka password), something like: 91bg8zfkf9vd6uw7
-        7.  Make sure you hit the OK button (to the right of the cancel button) to save your changes
-        8.  Now update the gateway to the latest firmware
-
-*   In openHAB you should now be able to discover the Xiaomi Gateway
-*   From now on you don't really need the app anymore. Only if you want to update the gateway firmware or if you want to add devices (see below). But adding devices can also be done without the app (see below)
-*   Enter the previously noted developer key in openHAB Administration -> Settings -> Things -> Xiaomi Gateway -> Edit -> Developer Key. Save (This is required if you want to be able to send controls to the devices like the light of the gateway)
+- Install the binding
+- Is your gateway already configured to connect to your WiFi? If not:
+    1. Install MiHome app from [Google Play](https://play.google.com/store/apps/details?id=com.xiaomi.smarthome) or [AppStore](https://itunes.apple.com/app/mi-home-xiaomi-for-your-smarthome/id957323480) (your phone may need to be changed to English language first)
+    1. In the app create a Mi Home account and make sure to set your region to Mainland (China) under Settings -> Locale
+    1. If asked, do NOT update your gateway to the latest firmware (note that update window may pop up sequentially).  If you update, you may not be able to access the developer mode below.
+- Enable developer mode of your gateway:
+    1. Select your Gateway in the MiHome app
+    1. Go to the "..." menu on the top right corner and click "About"
+    1. You now see two options "Smart Home Kit Forum" and "Gameplay Tutorial". Tap 5 times below the "Gameplay Tutorial" in the empty space (not the button itself) until you enable developer mode
+    1. You should now have 2 extra options listed: `wireless communication protocol` and `hub info`, it may appear in Chinese
+    1. Choose `wireless communication protocol`
+    1. Tap the toggle switch to enable WiFi functions. Note down the developer key (aka password), something like: 91bg8zfkf9vd6uw7
+    1. Make sure you hit the OK button (to the right of the cancel button) to save your changes
+    1. Now update the gateway to the latest firmware
+- Enable developer mode of your gateway (legacy app):
+    1. Select your Gateway in the MiHome app
+    1. Go to the "..." menu on the top right corner and click "About"
+    1. Tap the version number "Plug-in version : 2.XX.X" at the bottom of the screen repeatedly until you enable developer mode
+    1. You should now have 2 extra options listed: `wireless communication protocol` and `hub info`
+    1. Choose `wireless communication protocol`
+    1. Tap the toggle switch to enable WiFi functions. Note down the developer key (aka password), something like: 91bg8zfkf9vd6uw7
+    1. Make sure you hit the OK button (to the right of the cancel button) to save your changes
+    1. Now update the gateway to the latest firmware
+- In openHAB you should now be able to discover the Xiaomi Gateway
+- From now on you don't really need the app anymore. Only if you want to update the gateway firmware or if you want to add devices (see below). But adding devices can also be done without the app (see below)
+- Enter the previously noted developer key in openHAB Administration -> Settings -> Things -> Xiaomi Gateway -> Edit -> Developer Key. Save (This is required if you want to be able to send controls to the devices like the light of the gateway)
 
 ## Connecting devices to the gateway
 
 There are three ways of connecting supported devices to the gateway:
 
-*   Online - within the MiHome App
-*   Offline - manual
-
-    1.  Click 3 times on the Gateway's button
-    2.  Gateway will flash in blue and you will hear female voice in Chinese, you have 30 seconds to include your new device
-    3.  Place the needle into the sensor and hold it for at least 3 seconds
-    4.  You will hear confirmation message in Chinese
-    5.  The device appears in openHAB thing Inbox
+- Online - within the MiHome App
+- Offline - manual
+    1. Click 3 times on the Gateway's button
+    1. Gateway will flash in blue and you will hear female voice in Chinese, you have 30 seconds to include your new device
+    1. Place the needle into the sensor and hold it for at least 3 seconds
+    1. You will hear confirmation message in Chinese
+    1. The device appears in openHAB thing Inbox
+- With the binding
+    1. After adding the gateway make sure you have entered the right developer key
+    1. In the UI, go to your Inbox and trigger a discovery for the binding
+    1. The gateway flashes in blue and you hear a female voice in Chinese, you have 30 seconds to include your new device
+    1. Follow the instructions for your device to pair it to the gateway
+    1. You will hear a confirmation message in Chinese
+    1. The device appears in openHAB thing Inbox
 
-* With the binding
+**Hints:**
 
-    1.  After adding the gateway make sure you have entered the right developer key
-    2.  In the UI, go to your Inbox and trigger a discovery for the binding
-    3.  The gateway flashes in blue and you hear a female voice in Chinese, you have 30 seconds to include your new device
-    4.  Follow the instructions for your device to pair it to the gateway
-    5.  You will hear a confirmation message in Chinese
-    6.  The device appears in openHAB thing Inbox
+- If you don't want to hear the Chinese voice every time, you can disable it by setting the volume to minimum in the MiHome App (same for the blinking light)
 
-__Hints:__
-
-* If you don't want to hear the Chinese voice every time, you can disable it by setting the volume to minimum in the MiHome App (same for the blinking light)
-
-* The devices don't need an Internet connection to be working after you have set up the developer mode BUT you will not be able to connect to them via App anymore - easiest way is to block their outgoing Internet connection in your router and enable it later, when you want to check for updates etc. This will ensure that your smart home data stays only with you!
+- The devices don't need an Internet connection to be working after you have set up the developer mode BUT you will not be able to connect to them via App anymore - easiest way is to block their outgoing Internet connection in your router and enable it later, when you want to check for updates etc. This will ensure that your smart home data stays only with you!
 
 ## Removing devices from the gateway
 
@@ -111,7 +102,8 @@ Just follow the instructions in ["Connecting devices to the gateway"](#connectin
 - The binding requires port `9898` to not be used by any other service on the system.
 - Make sure multicast traffic is correctly routed between the gateway and your openHAB instance
 - To correctly receive multicast traffic, when your openHAB machine is using multiple network interfaces, you might need to configure the optional `interface` property on the `Bridge` Thing, like so:
-```
+
+```java
 Bridge mihome:bridge:f0b429XXXXXX "Xiaomi Gateway" [ ..., interface="eth0", ... ] {
 ```
 
@@ -119,7 +111,7 @@ Bridge mihome:bridge:f0b429XXXXXX "Xiaomi Gateway" [ ..., interface="eth0", ...
 
 ### xiaomi.things:
 
-```
+```java
 Bridge mihome:bridge:f0b429XXXXXX "Xiaomi Gateway" [ serialNumber="f0b429XXXXXX", ipAddress="192.168.0.3", port=9898, key="XXXXXXXXXXXXXXXX" ] {
   Things:
     gateway f0b429XXXXXX "Xiaomi Mi Smart Home Gateway" [itemId="f0b429XXXXXX"]
@@ -135,7 +127,7 @@ Bridge mihome:bridge:f0b429XXXXXX "Xiaomi Gateway" [ serialNumber="f0b429XXXXXX"
 
 ### xiaomi.items:
 
-```
+```java
 // Replace <GwID> with itemId of gateway from Things file
 // Replace <ID> with itemId of item from Things file
 // Gateway 
@@ -241,7 +233,7 @@ Rollershutter CurtainMotorControl <blinds> { channel="curtain:<GwID>:<ID>:curtai
 
 ### xiaomi.rules:
 
-```
+```java
 rule "Mijia & Aqara Wireless Switch"
 when
     Channel "mihome:sensor_switch:<GwID>:<ID>:button" triggered
@@ -395,10 +387,10 @@ end
 
 ### xiaomi.sitemap:
 
-```
+```perl
 sitemap xiaomi label="Xiaomi" {
     // Example for selection of predefined sound file - you can also upload your own files with the official MiHome App and play them!
-	Frame {
+    Frame {
         ...
 
         // Selection for Xiaomi Gateway Sounds
@@ -445,9 +437,9 @@ Make sure you have connected your gateway to openHAB and the communication is wo
 - Go through the normal procedure to add a device to the gateway
 - The device will show up in your inbox as a new unsupported device and its model name
 - Add the device as a new thing of type "basic device", now you have different channels to receive and send messages from/to the device
-    - raw messages from the device
-    - the data from the four different type of messages (see their details in the next chapter)
-    - parameters you can send to the device
+  - raw messages from the device
+  - the data from the four different type of messages (see their details in the next chapter)
+  - parameters you can send to the device
 
 ### Gather information about the new device for future support
 
@@ -455,14 +447,15 @@ The devices send different types of messages to the gateway.
 You have to capture as many of them as possible, so that the device is fully supported in the end.
 
 1. Heartbeat (usually transmitted every 60 minutes)
-2. Report (device reports new sensor or status values)
-3. Read ACK (binding refreshes all sensor values after a restart of openHAB)
-4. Write ACK (device has received a command) __not available for sensor-only devices__
+1. Report (device reports new sensor or status values)
+1. Read ACK (binding refreshes all sensor values after a restart of openHAB)
+1. Write ACK (device has received a command) **not available for sensor-only devices**
 
 ### Open a new issue or get your hands dirty
 
-Every little help is welcome, be part of the community! 
+Every little help is welcome, be part of the community!
 Post an issue in the GitHub repository with as much information as possible about the new device:
+
 - brand and link to device description
 - model name
 - content of all the different message types
@@ -475,7 +468,7 @@ You can access the whole message contents of the basic device thing with String
 That way you can make use of your device, even if it is not supported yet!
 The following examples are a demonstration, where a basic device thing for the gateway was manually added.
 
-```
+```java
 String Gateway_Raw { channel="mihome:basic:xxx:lastMessage" }
 String Gateway_Heartbeat { channel="mihome:basic:xxx:heartbeatMessage" }
 ```
@@ -497,16 +490,16 @@ The commands have to be issued as attributes of a JSON Object, e.g. instead of w
 
 The following example uses a rule to enable device pairing on the gateway:
 
-__mihome.items__
+#### mihome.items
 
-```
+```java
 String Gateway_Write { channel="mihome:basic:xxx:writeMessage" }
 Switch Gateway_AddDevicesSwitch
 ```
 
-__mihome.rules__
+#### mihome.rules
 
-```
+```java
 rule "Enable device pairing with gateway as basic device thing"
 when
     Item Gateway_AddDevicesSwitch changed to ON
@@ -514,8 +507,10 @@ then
     Gateway_Write.sendCommand("\"join_permission\":\"yes\"")
 end
 ```
+
 You can also send multiple command at once:
-```
+
+```java
 GatewayWrite.sendCommand("\"rgb\":150000,\"join_permission\":\"yes\"")
 ```
 
@@ -539,12 +534,13 @@ This makes possible following the communication between the binding and the gate
 
 For the binding to function properly it is very important, that your network config allows the machine running openHAB to receive multicast traffic.
 In case you want to check if the communication between the machine and the gateway is working, you can find some hints here.
+
 - Set up the developer communication as described in the Setup section
 
 ### Check if your Linux machine receives multicast traffic
 
 - Login to the Linux console
-- make sure you have __netcat__ installed
+- make sure you have **netcat** installed
 - Enter ```netcat -ukl 9898```
 - At least every 10 seconds you should see a message coming in from the gateway which looks like
 ```{"cmd":"heartbeat","model":"gateway","sid":"`xxx","short_id":"0","token":"xxx","data":"{\"ip\":\"`xxx\"}"}```
@@ -554,10 +550,12 @@ In case you want to check if the communication between the machine and the gatew
 When the computer running openHAB has more than one network interface configured (typically, a VLAN for your segregated IoT devices, and the other for your regular traffic like internet, openHAB panel access, etc), it could be that openHAB will attempt to listen for Multicast traffic of the Gateway on the wrong network interface.  That will prevent openHAB and `netcat` from receiving the messages from the Xiaomi Gateway. Within openHAB this manifests by seeing the Gateway and its devices online for a brief period after openHAB startup, after which they timeout and are shown Offline. No channel triggers from the Gateway work in this case.
 
 In order to verify that traffic is actually received by the machine use `tcpdump` on each interface:
+
 - List your network interfaces `ifconfig | grep MULTICAST` or `ip link | grep MULTICAST`
 - Use `tcpdump -i <interface> port 9898` for each interface to verify if you receive traffic
   
 If you already know the correct interface, or you found the correct one through tcpdump:
+
 - Configure the `interface` property of the `Bridge` Thing with the correct name (for example `eth0`, etc)
 
 ### Check if your Windows/Mac machine receives multicast traffic
@@ -568,16 +566,18 @@ If you already know the correct interface, or you found the correct one through
 - At least every 10 seconds you should see a message coming in from the gateway which looks like
     ```{"cmd":"heartbeat","model":"gateway","sid":"`xxx","short_id":"0","token":"xxx","data":"{\"ip\":\"`xxx\"}"}```
 
-__My gateway shows up in openHAB and I have added all devices, but I don't get any value updates:__
+**My gateway shows up in openHAB and I have added all devices, but I don't get any value updates:**
+
 - Most likely your machine is not receiving multicast messages
 - Check your network config:
-    - Routers often block multicast - enable it
-    - Make sure the gateway and the machine are in the same subnet
-    - Try to connect your machine via Ethernet instead of Wifi
-    - Make sure you don't have any firewall rules blocking multicast
-    - If you have multiple network interfaces, try to configure the `interface` property of the `Bridge` Thing
+  - Routers often block multicast - enable it
+  - Make sure the gateway and the machine are in the same subnet
+  - Try to connect your machine via Ethernet instead of Wifi
+  - Make sure you don't have any firewall rules blocking multicast
+  - If you have multiple network interfaces, try to configure the `interface` property of the `Bridge` Thing
+
+**I have connected my gateway to the network but it doesn't show up in openHAB:**
 
-__I have connected my gateway to the network but it doesn't show up in openHAB:__
 - Make sure to have the developer mode enabled in the MiHome app
 - Reinstall the binding
 - Try to update the firmware of the gateway
@@ -585,7 +585,8 @@ __I have connected my gateway to the network but it doesn't show up in openHAB:_
 - Search the openHAB Community forum
 - Contact Xiaomi support - get your gateway replaced
 
-__Nothing works, I'm frustrated and have thrown my gateway into the bin. Now I don't know what to do with all the sensors:__
+**Nothing works, I'm frustrated and have thrown my gateway into the bin. Now I don't know what to do with all the sensors:**
+
 Check out the Zigbee2Mqtt project on GitHub.
 It allows you to use the sensors without the gateway and get their values through MQTT.
 You will need some hardware to act as a gateway which is not expensive.
diff --git a/bundles/org.openhab.binding.miio/README.base.md b/bundles/org.openhab.binding.miio/README.base.md
index 81b2dda9ce895..dc595982a7d12 100644
--- a/bundles/org.openhab.binding.miio/README.base.md
+++ b/bundles/org.openhab.binding.miio/README.base.md
@@ -1,6 +1,6 @@
 # Xiaomi Wifi devices (Mi IO) Binding
 
-This binding is used to control Xiaomi products implementing the Mi IO protocol. 
+This binding is used to control Xiaomi products implementing the Mi IO protocol.
 This protocol is used for most of Xiaomi Mi Ecosystem wifi devices which is branded as MiJia.
 If your Xiaomi wifi device is controlled by the mihome app, most likely it communicates using the Mi IO protocol and can communicate with openHAB using this binding.
 
@@ -30,9 +30,9 @@ Accept only one of the 2 discovery results, the alternate one can further be ign
 ## Tokens
 
 The binding needs a token from the Xiaomi Mi Device in order to be able to control it.
-The binding can retrieve the needed tokens from the Xiaomi cloud. 
-Go to the binding config page and enter your cloud username and password. 
-The server(s) to which your devices are connected need to be entered as well. 
+The binding can retrieve the needed tokens from the Xiaomi cloud.
+Go to the binding config page and enter your cloud username and password.
+The server(s) to which your devices are connected need to be entered as well.
 Use the one of the regional servers: cn,de,i2,tw,ru,sg,us.
 Multiple servers can be separated with comma, or leave blank to test all known servers.
 See [binding configuration](#binding-configuration) for more details about the binding config.
@@ -42,12 +42,12 @@ See [binding configuration](#binding-configuration) for more details about the b
 Some devices provide the token upon discovery. This may depends on the firmware version.
 If the device does not discover your token, it needs to be retrieved from the Mi Home app.
 
-The easiest way to obtain tokens is to browse through log files of the Mi Home app version 5.4.49 for Android. 
-It seems that version was released with debug messages turned on by mistake. 
-An APK file with the old version can be easily found using one of the popular web search engines. 
+The easiest way to obtain tokens is to browse through log files of the Mi Home app version 5.4.49 for Android.
+It seems that version was released with debug messages turned on by mistake.
+An APK file with the old version can be easily found using one of the popular web search engines.
 After downgrading use a file browser to navigate to directory SmartHome/logs/plug_DeviceManager, then open the most recent file and search for the token. When finished, use Google Play to get the most recent version back.
 
-For iPhone, use an un-encrypted iTunes-Backup and unpack it and use a sqlite tool to view the files in it: 
+For iPhone, use an un-encrypted iTunes-Backup and unpack it and use a sqlite tool to view the files in it:
 Then search in "RAW, com.xiaomi.home," for "USERID_mihome.sqlite" and look for the 32-digit-token or 96 digit encrypted token.
 
 Note. The Xiaomi devices change the token when inclusion is done. Hence if you get your token after reset and than include it with the Mi Home app, the token will change.
@@ -57,7 +57,7 @@ Note. The Xiaomi devices change the token when inclusion is done. Hence if you g
 No binding configuration is required. However to enable cloud functionality enter your Xiaomi username, password and server(s).
 The list of the known countries and related severs is [here](#country-servers).
 
-After successful Xiaomi cloud login, the binding will use the connection to retrieve the required device tokens from the cloud. 
+After successful Xiaomi cloud login, the binding will use the connection to retrieve the required device tokens from the cloud.
 For Xiaomi vacuums the map can be visualized in openHAB using the cloud connection.
 
 To enter your cloud details go to the bindings page, click the Xiaomi Mi IO binding and than configure.
@@ -72,7 +72,7 @@ The binding also supports the discovery of devices via the cloud. This may be us
 
 Each Xiaomi device (thing) needs the IP address and token configured to be able to communicate. See discovery for details.
 Optional configuration is the refresh interval and the deviceID. Note that the deviceID is automatically retrieved when it is left blank.
-The configuration for model is automatically retrieved from the device in normal operation. 
+The configuration for model is automatically retrieved from the device in normal operation.
 However, for devices that are unsupported, you may override the value and try to use a model string from a similar device to experimentally use your device with the binding.
 
 | Parameter       | Type    | Required | Description                                                         |
@@ -86,13 +86,13 @@ However, for devices that are unsupported, you may override the value and try to
 | communication   | text    | false    | Communicate direct or via cloud (options values: 'direct', 'cloud') |
 | cloudServer     | text    | false    | Identifies the country server to use in case of cloud communication |
 
-Note: Suggest to use the cloud communication only for devices that require it. 
+Note: Suggest to use the cloud communication only for devices that require it.
 It is unknown at this time if Xiaomi has a rate limit or other limitations on the cloud usage. e.g. if having many devices would trigger some throttling from the cloud side.
 Note2: communications parameter is not available for lumi devices. Lumi devices communicate using the bridge/gateway.
 
 ### Example Thing file
 
-`Thing miio:basic:light "My Light" [ host="192.168.x.x", token="put here your token", deviceId="326xxxx", model="philips.light.bulb", communication="direct" ]` 
+`Thing miio:basic:light "My Light" [ host="192.168.x.x", token="put here your token", deviceId="326xxxx", model="philips.light.bulb", communication="direct" ]`
 
 or in case of unknown models include the model information of a similar device that is supported:
 
@@ -100,8 +100,7 @@ or in case of unknown models include the model information of a similar device t
 
 in case of gateway, instead of defining it as a Thing, use Bridge
 
-`Bridge miio:gateway:lumigateway "Mi Smarter Gateway" [ host="10.10.x.x", token="put here your token", deviceId="326xxxx", model="lumi.gateway.mieu01", communication="direct", cloudServer="de" ]` 
-
+`Bridge miio:gateway:lumigateway "Mi Smarter Gateway" [ host="10.10.x.x", token="put here your token", deviceId="326xxxx", model="lumi.gateway.mieu01", communication="direct", cloudServer="de" ]`
 
 # Advanced: Unsupported devices
 
@@ -114,7 +113,7 @@ There are 2 ways to get unsupported devices working, by overriding the model wit
 ## Substitute model for unsupported devices
 
 Replace the model with the model which is already supported.
-For this, first remove your unsupported thing. Manually add a miio:basic thing. 
+For this, first remove your unsupported thing. Manually add a miio:basic thing.
 Besides the regular configuration (like ip address, token) the modelId needs to be provided.
 Normally the modelId is populated with the model of your device, however in this case, use the modelId of a similar device.
 Look at the openHAB forum, or the openHAB GitHub repository for the modelId of similar devices.
@@ -132,11 +131,11 @@ After validation, please share the logfile and json files on the openHAB forum o
 
 Things using the basic handler (miio:basic things) are driven by json 'database' files.
 This instructs the binding which channels to create, which properties and actions are associated with the channels etc.
-The conf/misc/miio (e.g. in Linux `/opt/openhab/conf/misc/miio/`) is scanned for database files and will be used for your devices. 
-During the start of the binding the exact path used in your system will be printed in the _debug_ log. 
+The conf/misc/miio (e.g. in Linux `/opt/openhab/conf/misc/miio/`) is scanned for database files and will be used for your devices.
+During the start of the binding the exact path used in your system will be printed in the _debug_ log.
 Watch for a line containing `Started miio basic devices local databases watch service. Watching for database files at path: …` (
-If this folder is created after the start of the binding, you may need to restart the binding (or openHAB) to be able to use the local files. 
-Note that local database files take preference over build-in ones, hence if a json file is local and in the database the local file will be used. 
+If this folder is created after the start of the binding, you may need to restart the binding (or openHAB) to be able to use the local files.
+Note that local database files take preference over build-in ones, hence if a json file is local and in the database the local file will be used.
 For format, please check the current database files in openHAB GitHub.
 
 # FAQ.. what to do in case of problems
@@ -144,7 +143,7 @@ For format, please check the current database files in openHAB GitHub.
 If your device is not getting online:
 
 _Are you using text config?_
-Make sure you define all the fields as per above example. 
+Make sure you define all the fields as per above example.
 Or, better, try to get it going first without text config.
 
 _The token is wrong_
@@ -153,13 +152,13 @@ When you reset, or change wifi or update firmware, and possibly other cases as w
 
 _My token is coming from the cloud... how can it be wrong?_
 Is not very likely but still can happen._
-This can happen e.g. if your device is defined on multiple country servers. 
+This can happen e.g. if your device is defined on multiple country servers.
 The binding may pull the token from the wrong country server.
 First try to get the token from all country servers by leave the county setting empty.
 If that does not solve it, you define only the country that the device is on in the binding config page (where the cloud userid/pwd is entered) this should pull the right token.
 
 _You have the same device added multiple times._
-The communication each time send a sequential number. 
+The communication each time send a sequential number.
 If the device is twice defined, the numbers received by the device are no longer sequential and it will stop responding for some time.
 
 _The connection is not too good, so you have timeouts etc._
@@ -167,7 +166,7 @@ Position your device closer to wifi / check in the mihome app if the wifi streng
 Alternatively as described above, double check for multiple connections for single device.
 
 _Your device is on a different subnet?_
-This is in most cases not working. 
+This is in most cases not working.
 Firmware of the device don't accept commands coming from other subnets.
 Set the communication in the thing configuration to 'cloud'.
 
@@ -175,29 +174,29 @@ _Cloud connectivity is not working_
 The most common problem is a wrong or missing userId/password. Update your Xiaomi cloud userId & password in the [miio binding configuration screen](#binding-configuration).
 If the problem persists you can try the following:
 
-* Xiaomi Account verification might be needed. For some users login by the binding is unsuccessful as account verification is required, but the binding currently has no possibilities to handle this.
-In order to pass validation your (openHAB server) ip need to be validated/confirmed. 
+- Xiaomi Account verification might be needed. For some users login by the binding is unsuccessful as account verification is required, but the binding currently has no possibilities to handle this.
+In order to pass validation your (openHAB server) ip need to be validated/confirmed.
 Browse to [https://account.xiaomi.com/](https://account.xiaomi.com/) and logon to your account. Note: use the same external ip address as your openHAB server, e.g.  you may need to disable your VPN.
-* If above is not possible or fails, You can try to find in the binding debug logging a `location url`. Try to login using this url (just after it fails) with your browser.
-* Several users also reported success by resetting their Xiaomi password.
+- If above is not possible or fails, You can try to find in the binding debug logging a `location url`. Try to login using this url (just after it fails) with your browser.
+- Several users also reported success by resetting their Xiaomi password.
 
-If it still fails, you're bit out of luck. You may try to restart openHAB (not just the binding) to clean the cookies. 
+If it still fails, you're bit out of luck. You may try to restart openHAB (not just the binding) to clean the cookies.
 As the cloud logon process is still little understood, your only luck might be to enable trace logging and see if you can translate the Chinese error code that it returns.
 
 _My Roborock vacuum is not found or not reacting_
-Did you link the vacuum with the Roborock app? 
-This won't work, the Roborock app is using a different communication method. 
-Reset your vacuum and connect it to the Xiaomi MiHome app. 
+Did you link the vacuum with the Roborock app?
+This won't work, the Roborock app is using a different communication method.
+Reset your vacuum and connect it to the Xiaomi MiHome app.
 This will change the communication method and the Mi IO binding can communicate with the vacuum.
 
 # Mi IO Devices
 
 !!!devices
-note: Supported means we received feedback from users this device is working with the binding. 
-For devices with experimental support, we did not yet confirmation that channels are correctly working. 
+note: Supported means we received feedback from users this device is working with the binding.
+For devices with experimental support, we did not yet confirmation that channels are correctly working.
 Please feedback your findings for these devices (e.g. Are all channels working, do they contain the right information, is controlling the devices working etc.)
 
-# Channels
+## Channels
 
 Depending on the device, different channels are available.
 
@@ -213,8 +212,7 @@ All devices have available the following channels (marked as advanced) besides t
 | actions#rpc      | String  | send commands via cloud. see below  |
 
 note: the ADVANCED  `actions#commands` and `actions#rpc` channels can be used to send commands that are not automated via the binding. This is available for all devices
-e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enable a pre-configured timer. See https://github.com/marcelrv/XiaomiRobotVacuumProtocol for all known available commands.
-
+e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enable a pre-configured timer. See <https://github.com/marcelrv/XiaomiRobotVacuumProtocol> for all known available commands.
 
 ### Robo Rock vacuum Channels
 
@@ -256,13 +254,11 @@ To (re-)read the file either restart openHAB, restart the binding or alternative
 Note, cropping is disabled (hence showing like the maps in OH3.1 and earlier) for any `cropBorder` value < 0.
 Note, not all the values need to be in the json file, e.g. a subset of the parameters also works, the parameters not in the `mapConfig.json` will take the default values.
 
-
 !!!channelList
 
-
 ## Example item file Rockrobo vacuum
 
-```
+```java
 Group  gVac     "Xiaomi Robot Vacuum"      <fan>
 Group  gVacStat "Status Details"           <status> (gVac)
 Group  gVacCons "Consumables Usage"        <line-increase> (gVac)
@@ -306,7 +302,6 @@ Switch lastCompleted  "Last Cleaning Completed"    (gVacLast) {channel="miio:vac
 Image map "Cleaning Map" (gVacLast) {channel="miio:vacuum:034F0E45:cleaning#map"}
 ```
 
-
 !!!itemFileExamples
 
 ### Country Servers
@@ -316,7 +311,7 @@ Known country Servers: cn, de, i2, ru, sg, us
 Mapping of countries in mihome app to server:
 
 | Country                  | Country Code | Server |
-|--------------------------|--------------|--------|    
+|--------------------------|--------------|--------|
 | Afghanistan              | AF           | sg     |
 | Albania                  | AL           | de     |
 | Algeria                  | DZ           | sg     |
diff --git a/bundles/org.openhab.binding.mikrotik/README.md b/bundles/org.openhab.binding.mikrotik/README.md
index d0fc821db9dbc..cfd42458c71da 100644
--- a/bundles/org.openhab.binding.mikrotik/README.md
+++ b/bundles/org.openhab.binding.mikrotik/README.md
@@ -5,26 +5,24 @@ This binding integrates [Mikrotik](https://mikrotik.com/) [RouterOS](https://hel
 
 ## Supported Things
 
-* `routeros` - An instance of the RouterOS device connection
-* `interface` - A network interface inside RouterOS device
-* `wifiRegistration` - Any wireless client connected to a RouterOS wireless network (regular or CAPsMAN-managed)
-
+- `routeros` - An instance of the RouterOS device connection
+- `interface` - A network interface inside RouterOS device
+- `wifiRegistration` - Any wireless client connected to a RouterOS wireless network (regular or CAPsMAN-managed)
 
 ## Discovery
 
 Discovery is currently not supported, but may be implemented in future versions.
 
-
 ## Bridge Configuration
 
 To use this binding you need at least one RouterOS-powered device (Bridge) accessible to the host running
 openHAB via network.
-Make sure your RouterOS has the API enabled by visiting [<kbd>IP -> Services</kbd>](https://wiki.mikrotik.com/wiki/Manual:IP/Services) 
-configuration section in 
+Make sure your RouterOS has the API enabled by visiting [<kbd>IP -> Services</kbd>](https://wiki.mikrotik.com/wiki/Manual:IP/Services)
+configuration section in
 [WinBox](https://wiki.mikrotik.com/wiki/Manual:Winbox).
 Take note of the API port number as you'll need it below.
 [SSL API connection](https://wiki.mikrotik.com/wiki/Manual:API-SSL) is not yet supported by this binding.
-To connect to the RouterOS API, you will need to provide user credentials for the bridge thing. 
+To connect to the RouterOS API, you will need to provide user credentials for the bridge thing.
 You may use your current credentials that you use to manage your devices, but it is highly recommended to **create a read-only RouterOS user** since this binding only need to read data from the device.
 To do this, proceed to <kbd>System -> Users</kbd> configuration section and add a user to the `read` group.
 
@@ -42,7 +40,6 @@ The RouterOS Bridge configuration parameters are:
 
 **All things provided by this binding require a working bridge to be set up.**
 
-
 ### Bridge Channels
 
 | Channel | Type | Description | Comment |
@@ -56,8 +53,6 @@ The RouterOS Bridge configuration parameters are:
 | cpuLoad | Number:Dimensionless | CPU load percentage |  |
 | upSince | DateTime | Time when thing got up |  |
 
-
-
 ## WiFi Client Thing Configuration
 
 > Thing type: `wifiRegistration`
@@ -101,15 +96,15 @@ The WiFi client thing configuration parameters are:
 Represents a network interface from RouterOS system (ethernet, wifi, vpn, etc.)
 At the moment the binding supports the following RouterOS interface types:
 
-* `ether`
-* `bridge`
-* `wlan`
-* `cap`
-* `pppoe-out`
-* `ppp-out`
-* `lte`
-* `l2tp-in`
-* `l2tp-out`
+- `ether`
+- `bridge`
+- `wlan`
+- `cap`
+- `pppoe-out`
+- `ppp-out`
+- `lte`
+- `l2tp-in`
+- `l2tp-out`
 
 The interface thing configuration parameters are:
 
@@ -161,24 +156,23 @@ Common for all kinds of interfaces:
 
 **Change config options accordingly.**
 
-_things/mikrotik.things_
+### things/mikrotik.things
 
-```
+```java
 Bridge mikrotik:routeros:rb1 "My RouterBoard" [ host="192.168.0.1", port=8728, login="openhab", password="thatsasecret", refresh=10 ] {
-	Thing interface eth1 "Eth1" [ name="ether1" ]
-	Thing interface eth2 "Eth2" [ name="ether2-wan1" ]
-	Thing interface cap1 "Cap1" [ name="cap5" ]
-	Thing interface ppp1 "PPPoE1" [ name="isp-pppoe" ]
-	Thing interface tun1 "L2TPSrv1" [ name="l2tp-parents" ]
-	Thing wifiRegistration wifi1 "Phone1" [ mac="F4:60:E2:C5:47:94", considerContinuous=60 ]
-	Thing wifiRegistration wifi2 "Tablet2" [ mac="18:1D:EA:A5:A2:9E" ]
+ Thing interface eth1 "Eth1" [ name="ether1" ]
+ Thing interface eth2 "Eth2" [ name="ether2-wan1" ]
+ Thing interface cap1 "Cap1" [ name="cap5" ]
+ Thing interface ppp1 "PPPoE1" [ name="isp-pppoe" ]
+ Thing interface tun1 "L2TPSrv1" [ name="l2tp-parents" ]
+ Thing wifiRegistration wifi1 "Phone1" [ mac="F4:60:E2:C5:47:94", considerContinuous=60 ]
+ Thing wifiRegistration wifi2 "Tablet2" [ mac="18:1D:EA:A5:A2:9E" ]
 }
 ```
 
+### items/mikrotik.items
 
-_items/mikrotik.items_
-
-```
+```java
 Group gRB1 "RB3011 System"
 Number:DataAmount   My_RB_3011_Free_Space     "Free space"     (gRB1) {channel="mikrotik:routeros:rb1:freeSpace"}
 Number:DataAmount   My_RB_3011_Total_Space    "Total space"    (gRB1) {channel="mikrotik:routeros:rb1:totalSpace"}
@@ -357,20 +351,20 @@ Number     Tablet_2_Tx_Packets       "Transmitted packets"                  (gRB
 Number     Tablet_2_Rx_Packets       "Received packets"                     (gRB1Wifi2) {channel="mikrotik:wifiRegistration:rb1:wifi2:rxPackets"}
 ```
 
-_sitemaps/mikrotik.sitemap_
+### sitemaps/mikrotik.sitemap
 
-```
+```perl
 sitemap mikrotik label="Mikrotik Binding Demo"
 {
-	Frame label="RouterBOARD 1" {
-		Group item=gRB1
-		Group item=gRB1Eth1
-		Group item=gRB1Eth2
-		Group item=gRB1Ppp1
-		Group item=gRB1Tun1
-		Group item=gRB1Cap1
-		Group item=gRB1Wifi1
-		Group item=gRB1Wifi2
-	}
+ Frame label="RouterBOARD 1" {
+  Group item=gRB1
+  Group item=gRB1Eth1
+  Group item=gRB1Eth2
+  Group item=gRB1Ppp1
+  Group item=gRB1Tun1
+  Group item=gRB1Cap1
+  Group item=gRB1Wifi1
+  Group item=gRB1Wifi2
+ }
 }
 ```
diff --git a/bundles/org.openhab.binding.milight/README.md b/bundles/org.openhab.binding.milight/README.md
index 99da314b1154d..2a75a77e146d4 100644
--- a/bundles/org.openhab.binding.milight/README.md
+++ b/bundles/org.openhab.binding.milight/README.md
@@ -38,36 +38,37 @@ configuration file.
 iBox and iBox2 have the version 6, older Milight bridges have the version 3.
 The ID is the MAC address of the bridge in hexadecimal digits.
 
-    Bridge milight:bridgeV3:mybridge [ host="192.168.0.70", bridgeid="ACCF23A6C0B4", passwordByte1=0, passwordByte2=0, repeat=2, delayTime=75 ] {
-        Thing whiteLed myWhite   [ zone="0" ]
-        Thing rgbwwLed myRGB     [ zone="4" ]
-        Thing rgbLed   myOldRGB  [ zone="1" ]
-    }
+```java
+Bridge milight:bridgeV3:mybridge [ host="192.168.0.70", bridgeid="ACCF23A6C0B4", passwordByte1=0, passwordByte2=0, repeat=2, delayTime=75 ] {
+    Thing whiteLed myWhite   [ zone="0" ]
+    Thing rgbwwLed myRGB     [ zone="4" ]
+    Thing rgbLed   myOldRGB  [ zone="1" ]
+}
+```
 
 The Thing configuration for the bridge uses the following syntax
 
-* Bridge milight:bridgeV3:<any name> host="<IP-Address of bridge>", bridgeid="<mac>"
-* Bridge milight:bridgeV6:<any name> host="<IP-Address of bridge>", bridgeid="<mac>", passwordByte1="<0-255>", passwordByte2="<0-255>"
-    
+- Bridge milight:bridgeV3:<any name> host="<IP-Address of bridge>", bridgeid="<mac>"
+- Bridge milight:bridgeV6:<any name> host="<IP-Address of bridge>", bridgeid="<mac>", passwordByte1="<0-255>", passwordByte2="<0-255>"
+
 Optionally, the following parameters can be added
 
-* repeat=<integer> (defaults to 1, if not defined)
+- repeat=<integer> (defaults to 1, if not defined)
   Usually the bridge receives all commands albeit UDP is used. But the actual bulbs might be slightly out of bridge radio range and it sometimes helps to send commands multiple times.
-* delayTime=<integer for ms> (defaults to 100, if not defined)
+- delayTime=<integer for ms> (defaults to 100, if not defined)
   Time to wait before sending another command to the bridge. It is safe to have a wait time of 1/10s but usually sufficient to just wait 50ms. If the value is too high, commands queue up.
 
-
 The Thing configuration for the bulbs uses the following syntax:
 Thing <type of bulb> <any name> zone="<0-4>"
 
 The following bulb types are valid for configuration:
 
-*   rgbv2Led:   The very first available bulb. Not very common anymore.
-*   whiteLed:   The dual white bulbs (with cold/warm white) used with v3-v5 bridges.
-*   rgbLed:     The rgb+white bulbs (with cold/warm white) used with v3-v5 bridges. About 4080 colors (255 colors x 16 brightness steps).
-*   rgbiboxLed: The iBox bridge integrated color bulb without a dedicated white channel.
-*   rgbwLed:    The 2016/2017 color bulb without saturation support. About 6630 (255x26) colors.
-*   rgbwwLed:   The 2016/2017 color bulb with saturation support. About 1.044.480 (255x64x64) different color shades. Use this also for the newer generation of the dual white bulbs.
+- rgbv2Led:   The very first available bulb. Not very common anymore.
+- whiteLed:   The dual white bulbs (with cold/warm white) used with v3-v5 bridges.
+- rgbLed:     The rgb+white bulbs (with cold/warm white) used with v3-v5 bridges. About 4080 colors (255 colors x 16 brightness steps).
+- rgbiboxLed: The iBox bridge integrated color bulb without a dedicated white channel.
+- rgbwLed:    The 2016/2017 color bulb without saturation support. About 6630 (255x26) colors.
+- rgbwwLed:   The 2016/2017 color bulb with saturation support. About 1.044.480 (255x64x64) different color shades. Use this also for the newer generation of the dual white bulbs.
 
 The zone number is either 0 for meaning all bulbs of the same type or a valid zone number (1-4).
 Future bridges may support more zones.
@@ -76,76 +77,84 @@ Future bridges may support more zones.
 
 For dual white bulbs these channels are supported:
 
-    ledbrightness             Controls the brightness of your bulbs
-    ledtemperature            Changes from cold white to warm white and vice versa
-    lednightmode              Dims your bulbs to a very low level to use them as a night light
-    animation_mode_relative   Changes the animation mode. Use an IncreaseDecrease type of widget
+```text
+ledbrightness             Controls the brightness of your bulbs
+ledtemperature            Changes from cold white to warm white and vice versa
+lednightmode              Dims your bulbs to a very low level to use them as a night light
+animation_mode_relative   Changes the animation mode. Use an IncreaseDecrease type of widget
+```
 
 For rgbv2Led bulbs these channels are supported:
 
-    ledbrightness             Controls the brightness of your bulbs
-    ledcolor                  Changes the color and brightness of your rgb bulbs when bound to a colorpicker
-                              or just the brightness if bound to a Dimmer or controls On/Off if bound to a switch.
-    animation_mode_relative   Changes the animation mode. Use an IncreaseDecrease type of widget
+```text
+ledbrightness             Controls the brightness of your bulbs
+ledcolor                  Changes the color and brightness of your rgb bulbs when bound to a colorpicker
+                            or just the brightness if bound to a Dimmer or controls On/Off if bound to a switch.
+animation_mode_relative   Changes the animation mode. Use an IncreaseDecrease type of widget
+```
 
 For rgbLed bulbs these channels are supported:
 
-    lednightmode              Dims your bulbs to a very low level to use them as a night light
-    ledwhitemode              Disable all color (saturation is 0)
-    ledbrightness             Controls the brightness of your bulbs
-    ledcolor                  Changes the color and brightness of your rgb bulbs when bound to a colorpicker
-                              or just the brightness if bound to a Dimmer or controls On/Off if bound to a switch
-    animation_mode_relative   Changes the animation mode. Use an IncreaseDecrease type of widget
-    animation_speed_relative  Changes the speed of your chosen animation mode
+```text
+lednightmode              Dims your bulbs to a very low level to use them as a night light
+ledwhitemode              Disable all color (saturation is 0)
+ledbrightness             Controls the brightness of your bulbs
+ledcolor                  Changes the color and brightness of your rgb bulbs when bound to a colorpicker
+                            or just the brightness if bound to a Dimmer or controls On/Off if bound to a switch
+animation_mode_relative   Changes the animation mode. Use an IncreaseDecrease type of widget
+animation_speed_relative  Changes the speed of your chosen animation mode
+```
 
 For rgbwLed/rgbwwLed bulbs these channels are supported:
 
-    lednightmode              Dims your bulbs to a very low level to use them as a night light
-    ledwhitemode              Disable all color (saturation is 0)
-    ledbrightness             Controls the brightness of your bulbs
-    ledsaturation             Controls the saturation of your bulbs (not for rgbwLed!)
-    ledtemperature            Changes from cold white to warm white and vice versa (not for rgbwLed!)
-    ledcolor                  Changes the color and brightness of your rgb bulbs when bound to a colorpicker
-                              or just the brightness if bound to a Dimmer or controls On/Off if bound to a switch
-    animation_mode            Changes the animation mode. Chose between animation mode 1 to 9
-    animation_mode_relative   Changes the animation mode. Use an IncreaseDecrease type of widget
-    animation_speed_relative  Changes the speed of your chosen animation mode
-    ledlink                   Sync bulb to this zone within 3 seconds of light bulb socket power on
-    ledunlink                 Clear bulb from this zone within 3 seconds of light bulb socket power on
-    
+```text
+lednightmode              Dims your bulbs to a very low level to use them as a night light
+ledwhitemode              Disable all color (saturation is 0)
+ledbrightness             Controls the brightness of your bulbs
+ledsaturation             Controls the saturation of your bulbs (not for rgbwLed!)
+ledtemperature            Changes from cold white to warm white and vice versa (not for rgbwLed!)
+ledcolor                  Changes the color and brightness of your rgb bulbs when bound to a colorpicker
+                            or just the brightness if bound to a Dimmer or controls On/Off if bound to a switch
+animation_mode            Changes the animation mode. Chose between animation mode 1 to 9
+animation_mode_relative   Changes the animation mode. Use an IncreaseDecrease type of widget
+animation_speed_relative  Changes the speed of your chosen animation mode
+ledlink                   Sync bulb to this zone within 3 seconds of light bulb socket power on
+ledunlink                 Clear bulb from this zone within 3 seconds of light bulb socket power on
+```
+
 Limitations:
 
-*   Only the rgbww bulbs support changing their saturation, for rgbv2Led/rgbwLed the colorpicker will only set the hue and brightness and change to white mode if the saturation is under a given threshold of 50%.
+- Only the rgbww bulbs support changing their saturation, for rgbv2Led/rgbwLed the colorpicker will only set the hue and brightness and change to white mode if the saturation is under a given threshold of 50%.
 
 ## Example
 
 .items
 
-```
-Switch Light_Groundfloor	{channel="milight:whiteLed:ACCF23A6C0B4:0:ledbrightness"}  //Switch for all white bulbs
-Dimmer Light_LivingroomB	{channel="milight:whiteLed:ACCF23A6C0B4:1:ledbrightness"}  //Dimmer changing brightness for bulb in zone 1
-Dimmer Light_LivingroomC	{channel="milight:whiteLed:ACCF23A6C0B4:1:ledtemperature"} //Dimmer changing colorTemperature for bulb in zone 1
-Dimmer RGBW_LivingroomB		{channel="milight:rgbwLed:ACCF23A6C0B4:2:ledbrightness"}   //Dimmer changing brightness for RGBW bulb in zone 2
+```java
+Switch Light_Groundfloor {channel="milight:whiteLed:ACCF23A6C0B4:0:ledbrightness"}  //Switch for all white bulbs
+Dimmer Light_LivingroomB {channel="milight:whiteLed:ACCF23A6C0B4:1:ledbrightness"}  //Dimmer changing brightness for bulb in zone 1
+Dimmer Light_LivingroomC {channel="milight:whiteLed:ACCF23A6C0B4:1:ledtemperature"} //Dimmer changing colorTemperature for bulb in zone 1
+Dimmer RGBW_LivingroomB  {channel="milight:rgbwLed:ACCF23A6C0B4:2:ledbrightness"}   //Dimmer changing brightness for RGBW bulb in zone 2
 Color Light_Party           {channel="milight:rgbwLed:ACCF23A6C0B4:1:ledcolor"}        //Colorpicker for rgb bulbs
 
 # You have to link the items to the channels of your prefered group.
 
 //The command types nightMode and whiteMode are stateless and should be configured as pushbuttons as they only support a trigger action:
-Switch Light_GroundfloorN	{channel="milight:whiteLed:ACCF23A6C0B4:0:lednightmode", autoupdate="false"} //Activate the NightMode for all bulbs
+Switch Light_GroundfloorN {channel="milight:whiteLed:ACCF23A6C0B4:0:lednightmode", autoupdate="false"} //Activate the NightMode for all bulbs
 
 //The command types animation_mode_relative and animation_speed are stateless and should be configured as pushbuttons as they only support INCREASE and DECREASE commands:
 
-Dimmer AnimationMode		{channel="milight:rgbLed:ACCF23A6C0B4:5:animation_mode_relative", autoupdate="false"}
-Dimmer AnimationSpeed		{channel="milight:rgbLed:ACCF23A6C0B4:5:animation_speed", autoupdate="false"}
+Dimmer AnimationMode  {channel="milight:rgbLed:ACCF23A6C0B4:5:animation_mode_relative", autoupdate="false"}
+Dimmer AnimationSpeed  {channel="milight:rgbLed:ACCF23A6C0B4:5:animation_speed", autoupdate="false"}
 
 //Animation Mode for RGBWW bulbs is different, it allows to pick a mode directly.
 
-Switch AnimationModeRgbWW	{channel="milight:rgbwwLed:ACCF23A6C0B4:5:animation_mode"}
+Switch AnimationModeRgbWW {channel="milight:rgbwwLed:ACCF23A6C0B4:5:animation_mode"}
 ```
 
 .sitemap
 
-```
+```perl
 Switch item=AnimationMode      mappings=[DECREASE='-', INCREASE='+']
 Switch item=AnimationSpeed     mappings=[DECREASE='-', INCREASE='+']
 Switch item=Light_GroundfloorN mappings=[ON='Night Mode']
diff --git a/bundles/org.openhab.binding.millheat/README.md b/bundles/org.openhab.binding.millheat/README.md
index 5a495bc7e6fd9..d83a7d2b2ff6c 100644
--- a/bundles/org.openhab.binding.millheat/README.md
+++ b/bundles/org.openhab.binding.millheat/README.md
@@ -1,15 +1,15 @@
 # Millheat Binding
 
-This binding integrates the Mill Wi-Fi enabled panel heaters. See https://www.millheat.com/mill-wifi/
+This binding integrates the Mill Wi-Fi enabled panel heaters. See <https://www.millheat.com/mill-wifi/>
 
 ## Supported Things
 
 This binding supports all Wi-Fi enabled heaters as well as the Wi-Fi socket.
 
-* `account` = Mill Heating API - the account bridge
-* `heater` = Panel/standalone heater
-* `room` = A room defined in the mobile app
-* `home` = A home defined in the mobile app
+- `account` = Mill Heating API - the account bridge
+- `heater` = Panel/standalone heater
+- `room` = A room defined in the mobile app
+- `home` = A home defined in the mobile app
 
 ## Discovery
 
@@ -23,25 +23,25 @@ See full example below for how to configure using thing files.
 
 ### Account
 
-* `username` = email address used in app
-* `password` = password used in app
-* `refreshInterval` = number of seconds between refresh calls to the server
+- `username` = email address used in app
+- `password` = password used in app
+- `refreshInterval` = number of seconds between refresh calls to the server
 
 ### Home
 
-* `homeId` = id of home, type number (not string). Use auto discovery to find this value
+- `homeId` = id of home, type number (not string). Use auto discovery to find this value
 
 ### Room
 
-* `roomId` = id of room, type number (not string). Use auto discovery to find this value
+- `roomId` = id of room, type number (not string). Use auto discovery to find this value
 
 ### Heater
 
-* `macAddress` = network mac address of device in UPPERCASE.  
+- `macAddress` = network mac address of device in UPPERCASE.  
   Can be found in the app by viewing devices. Or you can find it during discovery. Used for heaters connected to a room.
-* `heaterId` = id of device/heater, type number (not string)
+- `heaterId` = id of device/heater, type number (not string)
   Use auto discovery to find this value. Used to identify independent heaters or heaters connected to a room.
-* `power` = number of watts this heater is consuming when active.  
+- `power` = number of watts this heater is consuming when active.  
   Used to provide data for the currentPower channel.
 
 Either `macAddres` or `heaterId` must be specified.
@@ -88,7 +88,7 @@ Either `macAddres` or `heaterId` must be specified.
 
 millheat.things:
 
-```
+```java
 Bridge millheat:account:home "Millheat account" [username="email@address.com",password="topsecret"] {
     Thing home monaco "Penthouse Monaco" [ homeId=100000000000000 ] // Note: numeric value
     Thing room office "Office room" [ roomId=200000000000000 ] Note: numeric value
@@ -98,7 +98,7 @@ Bridge millheat:account:home "Millheat account" [username="email@address.com",pa
 
 millheat.items:
 
-```
+```java
 // Items connected to HOME channels
 Number:Temperature Vacation_Target_Temperature "Vacation target temp [%d %unit%]" <temperature>  {channel="millheat:home:home:monaco:vacationModeTargetTemperature"}
 Switch Vacation_Mode "Vacation mode" <vacation>  {channel="millheat:home:home:monaco:vacationMode"}
@@ -131,7 +131,7 @@ Switch Heating_Office_Heater_MasterSwitch "Heater masterswitch [%s]" <switch>  {
 
 In order to activate vacation mode, follow these steps in a rule:
 
-* Set start time (DateTime) on `DateTime` item linked to channel type `vacationModeStart`
-* Set end time (DateTime) on `DateTime` item linked to channel type `vacationModeEnd`
-* Activate vacation mode on `Switch` item linked to channel type `vacationMode`
-* Optional - set advanced vacation mode on `Switch` item linked to channel type `vacationModeAdvanced`
+- Set start time (DateTime) on `DateTime` item linked to channel type `vacationModeStart`
+- Set end time (DateTime) on `DateTime` item linked to channel type `vacationModeEnd`
+- Activate vacation mode on `Switch` item linked to channel type `vacationMode`
+- Optional - set advanced vacation mode on `Switch` item linked to channel type `vacationModeAdvanced`
diff --git a/bundles/org.openhab.binding.minecraft/README.md b/bundles/org.openhab.binding.minecraft/README.md
index ef5150fd93059..ad4e0b6be7680 100644
--- a/bundles/org.openhab.binding.minecraft/README.md
+++ b/bundles/org.openhab.binding.minecraft/README.md
@@ -35,7 +35,6 @@ Depending on the thing type, different channels are provided:
 | players         | Number    | The number of players on server         |
 | maxPlayers      | Number    | The maximum number of players on server |
 
-
 ### Player
 
 | Channel Type ID            | Item Type | Description                                                |
@@ -50,14 +49,12 @@ Depending on the thing type, different channels are provided:
 | playerLocation             | Location  | The player location                                        |
 | playerGameMode             | Number    | The players game mode                                      |
 
-
 ### Sign
 
 | Channel Type ID | Item Type | Description                                  |
 |-----------------|-----------|----------------------------------------------|
 | signActive      | Switch    | Does the sign have powered redstone below it |
 
-
 #### Active switch (Controllable from openHAB)
 
 <a href="https://drive.google.com/uc?export=view&id=0B3UO0c11-Q6hMkNZSjJidGk4b28"><img src="https://drive.google.com/uc?export=view&id=0B3UO0c11-Q6hMkNZSjJidGk4b28" style="width: 500px; max-width: 100%; height: auto" title="Click for the larger version." /></a>
@@ -69,10 +66,10 @@ Depending on the thing type, different channels are provided:
 ### Example Thing Definition
 
 The easiest method to add Minecraft servers, players, and signs is use the automatic discovery.
-You can also manually define the objects using thing configuration files. 
+You can also manually define the objects using thing configuration files.
 Players and signs are connected through Minecraft server [bridges](https://www.openhab.org/docs/configuration/things.html#defining-bridges-using-files).
 
-```xtend
+```java
 Bridge minecraft:server:myminecraftserver "Minecraft server for Friends" @ "Minecraft" [ hostname="192.168.1.100", port=10692 ] {
   Thing player my_name "My Minecraft User" @ "Minecraft" [ playerName="minecraft_username" ]
   Thing player friends_name "My Friend's Minecraft User" @ "Minecraft" [ playerName="friends_username" ]
diff --git a/bundles/org.openhab.binding.modbus.e3dc/README.md b/bundles/org.openhab.binding.modbus.e3dc/README.md
index 5a0c7967380ff..dcaad540de6be 100644
--- a/bundles/org.openhab.binding.modbus.e3dc/README.md
+++ b/bundles/org.openhab.binding.modbus.e3dc/README.md
@@ -1,11 +1,11 @@
 # E3DC
 
-Integrates the Home Power Plants from E3/DC GmbH into openHAB. 
+Integrates the Home Power Plants from E3/DC GmbH into openHAB.
 See [E3DC Website](https://www.e3dc.com/) to find more informations about the device.
 The Power Plant handles all your Electrical Energy Resources like Photovoltaic Producers, Battery Storage, Wallbox Power Supply, Household Consumption and even more.  
-E3DC devices are integrated into the Modbus Binding. 
+E3DC devices are integrated into the Modbus Binding.
 
-See chapter [Thing Configuration](#thing-configuration) how to set them up or check the [full example Things](#things) for manual setup. 
+See chapter [Thing Configuration](#thing-configuration) how to set them up or check the [full example Things](#things) for manual setup.
 
 ## Supported Things
 
@@ -16,11 +16,10 @@ First you need a Bridge which establishes the basic connection towards your E3DC
 | E3DC Home Power Plant | e3dc          | Provides Power values, String Details, Emergency Power Status and general Information of your E3DC Home Power Plant    |
 | E3DC Wallbox          | e3dc-wallbox  | Provides your Wallbox Settings. Switches like "Sunmode" or "1-Phase Charging" can be changed     |
 
-
 ## Discovery
 
-There's no discovery. 
-Modbus registers are available for all devices. 
+There's no discovery.
+Modbus registers are available for all devices.
 
 ## Thing Configuration
 
@@ -30,43 +29,42 @@ The needed Things can be found in the **Modbus Binding** and have to be added ma
 
 1. Create _Modbus TCP Bridge_ with matching Settings of your E3DC Device
 
-* IP Address
-* Device ID
-* Port ID
+- IP Address
+- Device ID
+- Port ID
 
-2. Create _E3DC Home Power Plant_ and attach it to the previous installed _Modbus TCP Bridge_. Configuration requires an approriate Data Refresh Interval with more than 1000 Milliseconds
+1. Create _E3DC Home Power Plant_ and attach it to the previous installed _Modbus TCP Bridge_. Configuration requires an approriate Data Refresh Interval with more than 1000 Milliseconds
 
-3. If you have a Wallbox attached add _E3DC Wallbox_ Thing with your previous installed _E3DC Home Power Plant_ as Bridge. Configuration requires a Wallbox ID between 0 and 7.
+1. If you have a Wallbox attached add _E3DC Wallbox_ Thing with your previous installed _E3DC Home Power Plant_ as Bridge. Configuration requires a Wallbox ID between 0 and 7.
 
 Check the [full example Things](#things) for manual setup.
 
-### Modbus TCP Slave 
+### Modbus TCP Slave
 
-| Parameter       | Type    | Description                                                             |           
+| Parameter       | Type    | Description                                                             |
 |-----------------|---------|-------------------------------------------------------------------------|
 | host            | text    | IP Address of your device                                               |
 | port            | integer | TCP Port of your E3DC device Modbus Settings.. Default is 502 |
 | deviceid        | integer | Modbus ID of your E3DC device Modbus Settings. Default is 1           |
 
-### E3DC Home Power Plant 
+### E3DC Home Power Plant
 
 Select as Bridge your previously created Modbus TCP Slave.
-| Parameter       | Type    | Description                                                             |           
+| Parameter       | Type    | Description                                                             |
 |-----------------|---------|-------------------------------------------------------------------------|
 | refresh         | integer | Refresh Rate of E3DC values in Milliseconds                             |
 
-
 ### E3DC Wallbox
 
 Select as Bridge your previously created E3DC Home Power Plant.
 
-| Parameter       | Type    | Description                                                                 |           
+| Parameter       | Type    | Description                                                                 |
 |-----------------|---------|-----------------------------------------------------------------------------|
 | wallboxId       | integer | E3DC supports up to 8 Wallboxes - select a value from 0 to 7                |
 
 ## Channels
 
-The E3DC device offers quite an amount of channels. For clustering 4 Channel Groups are used: 
+The E3DC device offers quite an amount of channels. For clustering 4 Channel Groups are used:
 
 ### Channel Group _Information Block_
 
@@ -80,7 +78,6 @@ The E3DC device offers quite an amount of channels. For clustering 4 Channel Gro
 | E3DC Firmware Release | info             | firmware-release    | String | Firmware installed on this particular E3DC Device |
 | E3DC Serial Number    | info             | serial-number       | String | Serial Number of this particular E3DC Device      |
 
-
 ### Channel Group _Power Block_
 
 | Channel Label                 |  Channel Group ID | Channel ID                   | Type                   | Description                                                                            |
@@ -98,7 +95,6 @@ The E3DC device offers quite an amount of channels. For clustering 4 Channel Gro
 | Self Consumption              | power             | self-consumption             |  Number:Dimensionless  | Your current Photovoltaic Self Consumption Level in Percent                            |
 | Battery State Of Charge       | power             | battery-soc                  |  Number:Dimensionless  | Charge Level of your attached Battery in Percent                                       |
 
-
 ### Channel Group _String Details Block_
 
 | Channel Label         | Channel Group ID | Channel ID         | Type                      | Description                |
@@ -113,7 +109,6 @@ The E3DC device offers quite an amount of channels. For clustering 4 Channel Gro
 | String 2 Power        | strings          | string2-dc-output  |  Number:Power             | Power produced by String 2 |
 | String 3 Power        | strings          | string3-dc-output  |  Number:Power             | Power produced by String 3 |
 
-
 ### Channel _EMS Block_
 
 | Channel Label                               | Channel Group ID | Channel ID                 | Type           | Description                  |
@@ -149,22 +144,22 @@ Some of the Wallbox Settings can be changed. See the Access column if the actual
 
 ## Full Example
 
-Following example provides the full configuration. 
+Following example provides the full configuration.
 If you enter the correct Connection Data, IP Address, Device ID and Port number in the thing configuration you should be fine.
 
 ### Things
 
-```
+```java
 Bridge modbus:tcp:device "E3DC Modbus TCP" [ host="192.168.178.56", port=502, id=1 ] {
-	Bridge e3dc powerplant "E3DC Power Plant" [ refresh=2500 ] {
-    	 Thing e3dc-wallbox wallbox0		"E3DC Wallbox"				[ wallboxId=0]
+ Bridge e3dc powerplant "E3DC Power Plant" [ refresh=2500 ] {
+      Thing e3dc-wallbox wallbox0  "E3DC Wallbox"    [ wallboxId=0]
     }
 }
 ```
 
 ### Items
 
-```
+```java
 String    E3DC_ModbusId                 "E3DC Modbus ID"            (e3dc)      { channel="modbus:e3dc:device:powerplant:info#modbus-id" }
 String    E3DC_ModbusFirmware           "E3DC Modbus Firmware"      (e3dc)      { channel="modbus:e3dc:device:powerplant:info#modbus-firmware" }
 Number    E3DC_SupportedRegisters       "E3DC Supported Registers"  (e3dc)      { channel="modbus:e3dc:device:powerplant:info#supported-registers" }
@@ -222,7 +217,7 @@ Switch    E3DC_EMS_DischargeLockTime            "E3DC EMS Discharge Lock TIme"
 
 ### Sitemap
 
-```
+```perl
 sitemap E3DC label="E3DC Binding Sitemap" {
   Frame label="Info" {
     Text    item=E3DC_ModbusId                  label="Modbus-ID [%s]"
@@ -298,18 +293,17 @@ sitemap E3DC label="E3DC Binding Sitemap" {
 }
 ```
 
-
 ## Going further
 
 Setup and configured everything the right way? Congratulations, you've now the recent E3DC values on your table. Don't stop and go ahead!
 
 ### Persistence
 
-You can see in the example item configuration, that I added some items to the "persist". 
-Feel free to choose your own group name but this opens the possibility to store the items in a database. 
+You can see in the example item configuration, that I added some items to the "persist".
+Feel free to choose your own group name but this opens the possibility to store the items in a database.
 See following *.persist file configuration how this can be established.
 
-```
+```text
 Strategies {
     everyMinute : "0 * * * * ?"
     everyHour : "0 0 * * * ?"
@@ -323,9 +317,9 @@ Items {
 }
 ```
 
-### Visualization 
+### Visualization
 
-After the timeline is available in your database you can continue with Visualization. 
+After the timeline is available in your database you can continue with Visualization.
 I like the Grafana approach and I used the [InfluxDB & Grafana Tutorial](https://community.openhab.org/t/influxdb-grafana-persistence-and-graphing/13761)
 from the Community to set this up.
 I prepared my machine and I'm quite pleased with the results.
@@ -334,22 +328,22 @@ I prepared my machine and I'm quite pleased with the results.
 
 In the above picture there are two graphs
 
-* The top one shows the Photovoltaic Production of my 2 attached Strings. You can clearly see when the sky wasn't bright the production goes down
-* The bottom graph show the producers & consumers. 
-    * Battery in blue charging during the day, discharging at night
-    * Household consumption in green 
-    * Wallbox consumption in orange
-    * Grid consumption / supply in yellow
+- The top one shows the Photovoltaic Production of my 2 attached Strings. You can clearly see when the sky wasn't bright the production goes down
+- The bottom graph show the producers & consumers.
+  - Battery in blue charging during the day, discharging at night
+  - Household consumption in green
+  - Wallbox consumption in orange
+  - Grid consumption / supply in yellow
 
-### Cross Connections 
+### Cross Connections
 
-With the above setup you have now a great visualization and overview regarding your electric production and consumption. 
-Now use the Power of openHAB and cross connect your data. 
+With the above setup you have now a great visualization and overview regarding your electric production and consumption.
+Now use the Power of openHAB and cross connect your data.
 For example you can use the [OpenweatherMap API Binding](https://www.openhab.org/addons/bindings/openweathermap/)
-the cloudiness in Percent. 
+the cloudiness in Percent.
 With a modified *.persist file I store the cloudiness forecast also in the database
 
-```
+```text
 Strategies {
     everyMinute : "0 * * * * ?"
     everyHour : "0 0 * * * ?"
@@ -364,7 +358,7 @@ Items {
 }
 ```
 
-Having these values in the timeline you're able to cross check how the forecast influences the Photovoltaic Production. 
+Having these values in the timeline you're able to cross check how the forecast influences the Photovoltaic Production.
 
 <img align="right" src="./doc/GrafanaCloudiness.png"/>
 
diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/README.md b/bundles/org.openhab.binding.modbus.helioseasycontrols/README.md
index 50c8606fa6cdd..362d6edc562ec 100644
--- a/bundles/org.openhab.binding.modbus.helioseasycontrols/README.md
+++ b/bundles/org.openhab.binding.modbus.helioseasycontrols/README.md
@@ -18,7 +18,7 @@ Things in this extension will use the selected bridge to connect to the device.
 The configuration of a Helios Ventilation device via a `.things` file would look like the following code sample.
 It's required to provide the device's IP address, port and unit ID (port and unit ID cannot be changed and always have to be 502 and 180; in fact the values provided here are ignored by the binding and the fixed values 502 and 180 are used):
 
-```
+```java
 Bridge modbus:tcp:modbus-gateway "Modbus TCP/IP Gateway" [ host="x.x.x.x", port=502, id=180, enableDiscovery=true ] {
     Thing helios-easycontrols kwl "KWL"
 }
@@ -28,110 +28,109 @@ Bridge modbus:tcp:modbus-gateway "Modbus TCP/IP Gateway" [ host="x.x.x.x", port=
 
 The following channels are supported:
 
-| Channel                          | Channel Group   | Description                                                                                                                      | Item Type                | RW | 
-| -------------------------------- | --------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | -- | 
-| sysdate                          | general         | The KWL's system date and time                                                                                                   | DateTime                 | RW | 
-| summerWinter                     | general         | Indicates if summertime or wintertime is active (0 = wintertime, 1 = summertime)                                                 | Number                   | RW | 
-| autoSwUpdate                     | general         | Indicates if automatic software updates are enable                                                                               | Switch                   | RW | 
-| accessHeliosPortal               | general         | Indicates if access to Helios portal is enabled                                                                                  | Switch                   | RW | 
-| minFanStage                      | unitConfig      | Minimum fan stage (0 or 1) (0, 1)                                                                                                | Number                   | RW | 
-| preHeaterStatus                  | general         | Pre-Heater Status                                                                                                                | Switch                   | RW | 
-| humidityControlSetValue          | humidityControl | Humidity control set value (in percent) (20 - 80 %)                                                                              | Number:Dimensionless     | RW | 
-| humidityControlSteps             | humidityControl | Humidity control steps (in percent) (5 - 20 %)                                                                                   | Number:Dimensionless     | RW | 
-| humidityStopTime                 | humidityControl | Humidity stop time in hours (0-24) (0 - 24 h)                                                                                    | Number:Time              | RW | 
-| co2ControlSetValue               | co2Control      | CO2 control set value (in ppm) (300 - 2000 ppm)                                                                                  | Number:Dimensionless     | RW | 
-| co2ControlSteps                  | co2Control      | CO2 control steps (in ppm) (50 - 400 ppm)                                                                                        | Number:Dimensionless     | RW | 
-| vocControlSetValue               | vocControl      | VOC control set value (in ppm) (300 - 2000 ppm)                                                                                  | Number:Dimensionless     | RW | 
-| vocControlSteps                  | vocControl      | VOC control steps (in ppm) (50 - 400 ppm)                                                                                        | Number:Dimensionless     | RW | 
-| comfortTemp                      | unitConfig      | Comfort Temperature (10.0 - 25.0 °C)                                                                                             | Number:Temperature       | RW | 
-| partyModeDuration                | operation       | Party mode duration (in minutes) (5 - 180 min)                                                                                   | Number:Time              | RW | 
-| partyModeFanStage                | operation       | Party mode fan stage (0 - 4)                                                                                                     | Number                   | RW | 
-| partyModeRemainingTime           | operation       | Party mode remaining time (0 - 180 min)                                                                                          | Number:Time              | R  | 
-| partyModeStatus                  | operation       | Party mode status                                                                                                                | Switch                   | RW | 
-| standbyModeDuration              | operation       | Standby mode duration (in minutes) (5 - 180 min)                                                                                 | Number:Time              | RW | 
-| standbyModeFanStage              | operation       | Standby mode fan stage (0 - 4)                                                                                                   | Number                   | RW | 
-| standbyModeRemainingTime         | operation       | Standby mode remaining time (0 - 180 min)                                                                                        | Number:Time              | R  | 
-| standbyModeStatus                | operation       | Standby mode status                                                                                                              | Switch                   | RW | 
-| operatingMode                    | operation       | Operating mode (automatic/manual) (0 = automatic, 1 = manual)                                                                    | Number                   | RW | 
-| fanStage                         | operation       | Fan stage (0 - 4)                                                                                                                | Number                   | RW | 
-| percentageFanStage               | operation       | Fan stage in percent (0 - 100 %)                                                                                                 | Number:Dimensionless     | R  | 
-| temperatureOutsideAir            | general         | Ouside air temperature in °C (-27.0 - 9998.9 °C)                                                                                 | Number:Temperature       | R  | 
-| temperatureSupplyAir             | general         | Supply air temperature in °C (-27.0 - 9998.9 °C)                                                                                 | Number:Temperature       | R  | 
-| temperatureOutgoingAir           | general         | Outgoing air temperature in °C (-27.0 - 9998.9 °C)                                                                               | Number:Temperature       | R  | 
-| temperatureExtractAir            | general         | Extract air temperature in °C (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| vhzDuctSensor                    | general         | Pre-heater intake temperature in °C (-27.0 - 9998.9 °C)                                                                          | Number:Temperature       | R  | 
-| nhzReturnSensor                  | general         | After-heater return temperature in °C (-27.0 - 9998.9 °C)                                                                        | Number:Temperature       | R  | 
-| externalSensorKwlFtfHumidity1    | humidityControl | External humidity sensor 1 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  | 
-| externalSensorKwlFtfHumidity2    | humidityControl | External humidity sensor 2 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  | 
-| externalSensorKwlFtfHumidity3    | humidityControl | External humidity sensor 3 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  | 
-| externalSensorKwlFtfHumidity4    | humidityControl | External humidity sensor 4 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  | 
-| externalSensorKwlFtfHumidity5    | humidityControl | External humidity sensor 5 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  | 
-| externalSensorKwlFtfHumidity6    | humidityControl | External humidity sensor 6 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  | 
-| externalSensorKwlFtfHumidity7    | humidityControl | External humidity sensor 7 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  | 
-| externalSensorKwlFtfHumidity8    | humidityControl | External humidity sensor 8 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  | 
-| externalSensorKwlFtfTemperature1 | humidityControl | External temperature sensor 1 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| externalSensorKwlFtfTemperature2 | humidityControl | External temperature sensor 2 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| externalSensorKwlFtfTemperature3 | humidityControl | External temperature sensor 3 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| externalSensorKwlFtfTemperature4 | humidityControl | External temperature sensor 4 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| externalSensorKwlFtfTemperature5 | humidityControl | External temperature sensor 5 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| externalSensorKwlFtfTemperature6 | humidityControl | External temperature sensor 6 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| externalSensorKwlFtfTemperature7 | humidityControl | External temperature sensor 7 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| externalSensorKwlFtfTemperature8 | humidityControl | External temperature sensor 8 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  | 
-| externalSensorKwlCo21            | co2Control      | External CO2 sensor 1 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlCo22            | co2Control      | External CO2 sensor 2 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlCo23            | co2Control      | External CO2 sensor 3 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlCo24            | co2Control      | External CO2 sensor 4 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlCo25            | co2Control      | External CO2 sensor 5 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlCo26            | co2Control      | External CO2 sensor 6 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlCo27            | co2Control      | External CO2 sensor 7 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlCo28            | co2Control      | External CO2 sensor 8 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlVoc1            | vocControl      | External VOC sensor 1 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlVoc2            | vocControl      | External VOC sensor 2 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlVoc3            | vocControl      | External VOC sensor 3 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlVoc4            | vocControl      | External VOC sensor 4 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlVoc5            | vocControl      | External VOC sensor 5 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlVoc6            | vocControl      | External VOC sensor 6 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlVoc7            | vocControl      | External VOC sensor 7 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| externalSensorKwlVoc8            | vocControl      | External VOC sensor 8 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  | 
-| nhzDuctSensor                    | general         | After-heater intake temperature in °C (-27.0 - 9998.9 °C)                                                                        | Number:Temperature       | R  | 
-| weekProfileNhz                   | profiles        | Week profile after-heater (0 = standard 1, 1 = standard 2, 2 = fixed value, 3 = individual 1, 4 = individual 2, 5 = NA, 6 = off) | Number                   | RW | 
-| supplyAirRpm                     | general         | Supply air fan RPM (0 - 9999)                                                                                                    | Number                   | R  | 
-| extractAirRpm                    | general         | Extract air fan RPM (0 - 9999)                                                                                                   | Number                   | R  | 
-| holidayProgramme                 | operation       | Holiday programme (0 = off, 1 = interval, 2 = constant)                                                                          | Number                   | RW | 
-| holidayProgrammeFanStage         | operation       | Holiday programme fan stage (0 - 4)                                                                                              | Number                   | RW | 
-| holidayProgrammeStart            | operation       | Holiday programme start                                                                                                          | DateTime                 | RW | 
-| holidayProgrammeEnd              | operation       | Holiday programme end                                                                                                            | DateTime                 | RW | 
-| holidayProgrammeInterval         | operation       | Holiday programme interval in hours (1 - 24 h)                                                                                   | Number:Time              | RW | 
-| holidayProgrammeActivationTime   | operation       | Holiday programme activation time in minutes (5 - 300 min)                                                                       | Number:Time              | RW | 
-| runOnTimeVhzNhz                  | unitConfig      | Stopping time preheater/afterheater in seconds (60 - 120 s)                                                                      | Number:Time              | RW | 
-| errorOutputFunction              | unitConfig      | Error output function (collective error or just error) (1 = collective error, 2 = only error)                                    | Number                   | RW | 
-| filterChange                     | unitConfig      | Filter change (0 = No, 1 = Yes)                                                                                                  | Number                   | RW | 
-| filterChangeInterval             | unitConfig      | Filter change interval in months (1 - 12)                                                                                        | Number                   | RW | 
-| filterChangeRemainingTime        | general         | Filter change remaining time in minutes (1 - 55000 min)                                                                          | Number:Time              | R  | 
-| bypassRoomTemperature            | unitConfig      | Bypass room temperature in °C (10 - 40 °C)                                                                                       | Number:Temperature       | RW | 
-| bypassMinOutsideTemperature      | unitConfig      | Bypass outside temperature in °C (5 - 20 °C)                                                                                     | Number:Temperature       | RW | 
-| supplyAirFanStage                | operation       | Supply air fan stage (0 - 4)                                                                                                     | Number                   | RW | 
-| extractAirFanStage               | operation       | Extract air fan stage (0 - 4)                                                                                                    | Number                   | RW | 
-| operatingHoursSupplyAirVent      | general         | Operating hours supply air fan (in minutes) (0 - 2^32-1 min)                                                                     | Number:Time              | R  | 
-| operatingHoursExtractAirVent     | general         | Operating hours extract air fan (in minutes) (0 - 2^32-1 min)                                                                    | Number:Time              | R  | 
-| operatingHoursVhz                | general         | Operating hours preheater (in minutes) (0 - 2^32-1 min)                                                                          | Number:Time              | R  | 
-| operatingHoursNhz                | general         | Operating hours afterheater (in minutes) (0 - 2^32-1 min)                                                                        | Number:Time              | R  | 
-| outputPowerVhz                   | general         | Output power of preheater (in percent) (0 - 2^32-1 %)                                                                            | Number:Dimensionless     | R  | 
-| outputPowerNhz                   | general         | Output power of afterheater (in percent) (0 - 2^32-1 %)                                                                          | Number:Dimensionless     | R  | 
-| errors                           | general         | Errors as integer value (see [Errors / Warnings / Infos](#errors-warnings-infos)) (0 - 2^32-1)                                   | Number                   | R  | 
-| warnings                         | general         | Warnings as integer value (see [Errors / Warnings / Infos](#errors-warnings-infos)) (0 - 2^32-1)                                 | Number                   | R  | 
-| infos                            | general         | Infos as integer value (see [Errors / Warnings / Infos](#errors-warnings-infos)) (0 - 2^32-1)                                    | Number                   | R  | 
-| noOfErrors                       | general         | Number of bit-coded errors (see [Errors / Warnings / Infos](#errors-warnings-infos)) (0 - 32)                                    | Number                   | R  | 
-| noOfWarnings                     | general         | Number of bit-coded warnings (see [Errors / Warnings / Infos](#errors-warnings-infos)) (0 - 8)                                   | Number                   | R  | 
-| noOfInfos                        | general         | Number of bit-coded infos (see [Errors / Warnings / Infos](#errors-warnings-infos)) (0 - 8)                                      | Number                   | R  | 
-| errorsMsg                        | general         | Errors as string (see [Errors / Warnings / Infos](#errors-warnings-infos))                                                       | String                   | R  | 
-| warningsMsg                      | general         | Warnings as string (see [Errors / Warnings / Infos](#errors-warnings-infos))                                                     | String                   | R  | 
-| infosMsg                         | general         | Infos as string (see [Errors / Warnings / Infos](#errors-warnings-infos))                                                        | String                   | R  | 
-| statusFlags                      | general         | Status flags (see [Errors / Warnings / Infos](#errors-warnings-infos))                                                           | String                   | R  | 
-| bypassStatus                     | general         | Status of the bypass (OFF = closed, ON = open)                                                                                   | Switch                   | R  | 
-| bypassFrom                       | unitConfig      | Bypass active from                                                                                                               | DateTime                 | RW | 
-| bypassTo                         | unitConfig      | Bypass active to                                                                                                                 | DateTime                 | RW | 
-
+| Channel                          | Channel Group   | Description                                                                                                                      | Item Type                | RW |
+| -------------------------------- | --------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | -- |
+| sysdate                          | general         | The KWL's system date and time                                                                                                   | DateTime                 | RW |
+| summerWinter                     | general         | Indicates if summertime or wintertime is active (0 = wintertime, 1 = summertime)                                                 | Number                   | RW |
+| autoSwUpdate                     | general         | Indicates if automatic software updates are enable                                                                               | Switch                   | RW |
+| accessHeliosPortal               | general         | Indicates if access to Helios portal is enabled                                                                                  | Switch                   | RW |
+| minFanStage                      | unitConfig      | Minimum fan stage (0 or 1) (0, 1)                                                                                                | Number                   | RW |
+| preHeaterStatus                  | general         | Pre-Heater Status                                                                                                                | Switch                   | RW |
+| humidityControlSetValue          | humidityControl | Humidity control set value (in percent) (20 - 80 %)                                                                              | Number:Dimensionless     | RW |
+| humidityControlSteps             | humidityControl | Humidity control steps (in percent) (5 - 20 %)                                                                                   | Number:Dimensionless     | RW |
+| humidityStopTime                 | humidityControl | Humidity stop time in hours (0-24) (0 - 24 h)                                                                                    | Number:Time              | RW |
+| co2ControlSetValue               | co2Control      | CO2 control set value (in ppm) (300 - 2000 ppm)                                                                                  | Number:Dimensionless     | RW |
+| co2ControlSteps                  | co2Control      | CO2 control steps (in ppm) (50 - 400 ppm)                                                                                        | Number:Dimensionless     | RW |
+| vocControlSetValue               | vocControl      | VOC control set value (in ppm) (300 - 2000 ppm)                                                                                  | Number:Dimensionless     | RW |
+| vocControlSteps                  | vocControl      | VOC control steps (in ppm) (50 - 400 ppm)                                                                                        | Number:Dimensionless     | RW |
+| comfortTemp                      | unitConfig      | Comfort Temperature (10.0 - 25.0 °C)                                                                                             | Number:Temperature       | RW |
+| partyModeDuration                | operation       | Party mode duration (in minutes) (5 - 180 min)                                                                                   | Number:Time              | RW |
+| partyModeFanStage                | operation       | Party mode fan stage (0 - 4)                                                                                                     | Number                   | RW |
+| partyModeRemainingTime           | operation       | Party mode remaining time (0 - 180 min)                                                                                          | Number:Time              | R  |
+| partyModeStatus                  | operation       | Party mode status                                                                                                                | Switch                   | RW |
+| standbyModeDuration              | operation       | Standby mode duration (in minutes) (5 - 180 min)                                                                                 | Number:Time              | RW |
+| standbyModeFanStage              | operation       | Standby mode fan stage (0 - 4)                                                                                                   | Number                   | RW |
+| standbyModeRemainingTime         | operation       | Standby mode remaining time (0 - 180 min)                                                                                        | Number:Time              | R  |
+| standbyModeStatus                | operation       | Standby mode status                                                                                                              | Switch                   | RW |
+| operatingMode                    | operation       | Operating mode (automatic/manual) (0 = automatic, 1 = manual)                                                                    | Number                   | RW |
+| fanStage                         | operation       | Fan stage (0 - 4)                                                                                                                | Number                   | RW |
+| percentageFanStage               | operation       | Fan stage in percent (0 - 100 %)                                                                                                 | Number:Dimensionless     | R  |
+| temperatureOutsideAir            | general         | Ouside air temperature in °C (-27.0 - 9998.9 °C)                                                                                 | Number:Temperature       | R  |
+| temperatureSupplyAir             | general         | Supply air temperature in °C (-27.0 - 9998.9 °C)                                                                                 | Number:Temperature       | R  |
+| temperatureOutgoingAir           | general         | Outgoing air temperature in °C (-27.0 - 9998.9 °C)                                                                               | Number:Temperature       | R  |
+| temperatureExtractAir            | general         | Extract air temperature in °C (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| vhzDuctSensor                    | general         | Pre-heater intake temperature in °C (-27.0 - 9998.9 °C)                                                                          | Number:Temperature       | R  |
+| nhzReturnSensor                  | general         | After-heater return temperature in °C (-27.0 - 9998.9 °C)                                                                        | Number:Temperature       | R  |
+| externalSensorKwlFtfHumidity1    | humidityControl | External humidity sensor 1 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  |
+| externalSensorKwlFtfHumidity2    | humidityControl | External humidity sensor 2 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  |
+| externalSensorKwlFtfHumidity3    | humidityControl | External humidity sensor 3 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  |
+| externalSensorKwlFtfHumidity4    | humidityControl | External humidity sensor 4 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  |
+| externalSensorKwlFtfHumidity5    | humidityControl | External humidity sensor 5 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  |
+| externalSensorKwlFtfHumidity6    | humidityControl | External humidity sensor 6 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  |
+| externalSensorKwlFtfHumidity7    | humidityControl | External humidity sensor 7 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  |
+| externalSensorKwlFtfHumidity8    | humidityControl | External humidity sensor 8 (-0.0 - 9998.9 %)                                                                                     | Number:Dimensionless     | R  |
+| externalSensorKwlFtfTemperature1 | humidityControl | External temperature sensor 1 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| externalSensorKwlFtfTemperature2 | humidityControl | External temperature sensor 2 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| externalSensorKwlFtfTemperature3 | humidityControl | External temperature sensor 3 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| externalSensorKwlFtfTemperature4 | humidityControl | External temperature sensor 4 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| externalSensorKwlFtfTemperature5 | humidityControl | External temperature sensor 5 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| externalSensorKwlFtfTemperature6 | humidityControl | External temperature sensor 6 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| externalSensorKwlFtfTemperature7 | humidityControl | External temperature sensor 7 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| externalSensorKwlFtfTemperature8 | humidityControl | External temperature sensor 8 (-27.0 - 9998.9 °C)                                                                                | Number:Temperature       | R  |
+| externalSensorKwlCo21            | co2Control      | External CO2 sensor 1 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlCo22            | co2Control      | External CO2 sensor 2 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlCo23            | co2Control      | External CO2 sensor 3 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlCo24            | co2Control      | External CO2 sensor 4 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlCo25            | co2Control      | External CO2 sensor 5 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlCo26            | co2Control      | External CO2 sensor 6 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlCo27            | co2Control      | External CO2 sensor 7 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlCo28            | co2Control      | External CO2 sensor 8 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlVoc1            | vocControl      | External VOC sensor 1 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlVoc2            | vocControl      | External VOC sensor 2 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlVoc3            | vocControl      | External VOC sensor 3 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlVoc4            | vocControl      | External VOC sensor 4 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlVoc5            | vocControl      | External VOC sensor 5 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlVoc6            | vocControl      | External VOC sensor 6 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlVoc7            | vocControl      | External VOC sensor 7 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| externalSensorKwlVoc8            | vocControl      | External VOC sensor 8 (-0.0 - 9998.9 ppm)                                                                                        | Number:Dimensionless     | R  |
+| nhzDuctSensor                    | general         | After-heater intake temperature in °C (-27.0 - 9998.9 °C)                                                                        | Number:Temperature       | R  |
+| weekProfileNhz                   | profiles        | Week profile after-heater (0 = standard 1, 1 = standard 2, 2 = fixed value, 3 = individual 1, 4 = individual 2, 5 = NA, 6 = off) | Number                   | RW |
+| supplyAirRpm                     | general         | Supply air fan RPM (0 - 9999)                                                                                                    | Number                   | R  |
+| extractAirRpm                    | general         | Extract air fan RPM (0 - 9999)                                                                                                   | Number                   | R  |
+| holidayProgramme                 | operation       | Holiday programme (0 = off, 1 = interval, 2 = constant)                                                                          | Number                   | RW |
+| holidayProgrammeFanStage         | operation       | Holiday programme fan stage (0 - 4)                                                                                              | Number                   | RW |
+| holidayProgrammeStart            | operation       | Holiday programme start                                                                                                          | DateTime                 | RW |
+| holidayProgrammeEnd              | operation       | Holiday programme end                                                                                                            | DateTime                 | RW |
+| holidayProgrammeInterval         | operation       | Holiday programme interval in hours (1 - 24 h)                                                                                   | Number:Time              | RW |
+| holidayProgrammeActivationTime   | operation       | Holiday programme activation time in minutes (5 - 300 min)                                                                       | Number:Time              | RW |
+| runOnTimeVhzNhz                  | unitConfig      | Stopping time preheater/afterheater in seconds (60 - 120 s)                                                                      | Number:Time              | RW |
+| errorOutputFunction              | unitConfig      | Error output function (collective error or just error) (1 = collective error, 2 = only error)                                    | Number                   | RW |
+| filterChange                     | unitConfig      | Filter change (0 = No, 1 = Yes)                                                                                                  | Number                   | RW |
+| filterChangeInterval             | unitConfig      | Filter change interval in months (1 - 12)                                                                                        | Number                   | RW |
+| filterChangeRemainingTime        | general         | Filter change remaining time in minutes (1 - 55000 min)                                                                          | Number:Time              | R  |
+| bypassRoomTemperature            | unitConfig      | Bypass room temperature in °C (10 - 40 °C)                                                                                       | Number:Temperature       | RW |
+| bypassMinOutsideTemperature      | unitConfig      | Bypass outside temperature in °C (5 - 20 °C)                                                                                     | Number:Temperature       | RW |
+| supplyAirFanStage                | operation       | Supply air fan stage (0 - 4)                                                                                                     | Number                   | RW |
+| extractAirFanStage               | operation       | Extract air fan stage (0 - 4)                                                                                                    | Number                   | RW |
+| operatingHoursSupplyAirVent      | general         | Operating hours supply air fan (in minutes) (0 - 2^32-1 min)                                                                     | Number:Time              | R  |
+| operatingHoursExtractAirVent     | general         | Operating hours extract air fan (in minutes) (0 - 2^32-1 min)                                                                    | Number:Time              | R  |
+| operatingHoursVhz                | general         | Operating hours preheater (in minutes) (0 - 2^32-1 min)                                                                          | Number:Time              | R  |
+| operatingHoursNhz                | general         | Operating hours afterheater (in minutes) (0 - 2^32-1 min)                                                                        | Number:Time              | R  |
+| outputPowerVhz                   | general         | Output power of preheater (in percent) (0 - 2^32-1 %)                                                                            | Number:Dimensionless     | R  |
+| outputPowerNhz                   | general         | Output power of afterheater (in percent) (0 - 2^32-1 %)                                                                          | Number:Dimensionless     | R  |
+| errors                           | general         | Errors as integer value (see [Errors / Warnings / Infos](#errors--warnings--infos)) (0 - 2^32-1)                                   | Number                   | R  |
+| warnings                         | general         | Warnings as integer value (see [Errors / Warnings / Infos](#errors--warnings--infos)) (0 - 2^32-1)                                 | Number                   | R  |
+| infos                            | general         | Infos as integer value (see [Errors / Warnings / Infos](#errors--warnings--infos)) (0 - 2^32-1)                                    | Number                   | R  |
+| noOfErrors                       | general         | Number of bit-coded errors (see [Errors / Warnings / Infos](#errors--warnings--infos)) (0 - 32)                                    | Number                   | R  |
+| noOfWarnings                     | general         | Number of bit-coded warnings (see [Errors / Warnings / Infos](#errors--warnings--infos)) (0 - 8)                                   | Number                   | R  |
+| noOfInfos                        | general         | Number of bit-coded infos (see [Errors / Warnings / Infos](#errors--warnings--infos)) (0 - 8)                                      | Number                   | R  |
+| errorsMsg                        | general         | Errors as string (see [Errors / Warnings / Infos](#errors--warnings--infos))                                                       | String                   | R  |
+| warningsMsg                      | general         | Warnings as string (see [Errors / Warnings / Infos](#errors--warnings--infos))                                                     | String                   | R  |
+| infosMsg                         | general         | Infos as string (see [Errors / Warnings / Infos](#errors--warnings--infos))                                                        | String                   | R  |
+| statusFlags                      | general         | Status flags (see [Errors / Warnings / Infos](#errors--warnings--infos))                                                           | String                   | R  |
+| bypassStatus                     | general         | Status of the bypass (OFF = closed, ON = open)                                                                                   | Switch                   | R  |
+| bypassFrom                       | unitConfig      | Bypass active from                                                                                                               | DateTime                 | RW |
+| bypassTo                         | unitConfig      | Bypass active to                                                                                                                 | DateTime                 | RW |
 
 ## Thing Actions
 
@@ -139,7 +138,7 @@ The following channels are supported:
 
 Resets the timer for the next filter change back to 0.
 
-```
+```java
 public void resetFilterChangeTimer()
 ```
 
@@ -147,7 +146,7 @@ public void resetFilterChangeTimer()
 
 Resets the error messages.
 
-```
+```java
 public void resetErrors()
 ```
 
@@ -155,7 +154,7 @@ public void resetErrors()
 
 Resets the device to its factory defaults.
 
-```
+```java
 public void presetToFactoryDefaults()
 ```
 
@@ -163,16 +162,15 @@ public void presetToFactoryDefaults()
 
 Resets the device's individual switching times back to the default values.
 
-```
+```java
 public void resetSwitchingTimes()
 ```
 
-
 ### Set System Date and Time
 
 Sets the device's system date and time to the openHAB server's system date and time.
 
-```
+```java
 public void setSysDateTime()
 ```
 
@@ -180,154 +178,146 @@ public void setSysDateTime()
 
 Sets the devices start and end date for the active bypass functionality.
 
-```
+```java
 public void setBypassFrom(int day, int month)
 ```
 
-*Parameters:*
-
-* *day:* The day from when the bypass should be active
-* *month:* The month from when the bypass should be active
+_Parameters:_
 
+- _day:_ The day from when the bypass should be active
+- _month:_ The month from when the bypass should be active
 
-```
+```java
 public void setBypassTo(int day, int month)
 ```
 
-*Parameters:*
-
-* *day:* The day until when the bypass should be active
-* *month:* The month until when the bypass should be active
+_Parameters:_
 
+- _day:_ The day until when the bypass should be active
+- _month:_ The month until when the bypass should be active
 
-```
+```java
 public Map<String, Object> getErrorMessages()
 ```
 
-*Return values:*
-
-* *errorMessages:* A `List<String>` object containing all error messages
+_Return values:_
 
+- _errorMessages:_ A `List<String>` object containing all error messages
 
-```
+```java
 public Map<String, Object> getWarningMessages()
 ```
 
-*Return values:*
+_Return values:_
 
-* *warningMessages:* A `List<String>` object containing all warning messages
+- _warningMessages:_ A `List<String>` object containing all warning messages
 
-
-```
+```java
 public Map<String, Object> getInfoMessages()
 ```
 
-*Return values:*
+_Return values:_
 
-* *infoMessages:* A `List<String>` object containing all info messages
+- _infoMessages:_ A `List<String>` object containing all info messages
 
-
-```
+```java
 public Map<String, Object> getStatusMessages()
 ```
 
-*Return values:*
+_Return values:_
 
-* *statusMessages:* A `List<String>` object containing all status messages
+- _statusMessages:_ A `List<String>` object containing all status messages
 
-
-```
+```java
 public Map<String, Object> getMessages()
 ```
 
-*Return values:*
-
-* *errorMessages:* A `List<String>` object containing all error messages
-* *warningMessages:* A `List<String>` object containing all warning messages
-* *infoMessages:* A `List<String>` object containing all info messages
-* *statusMessages:* A `List<String>` object containing all status messages
+_Return values:_
 
+- _errorMessages:_ A `List<String>` object containing all error messages
+- _warningMessages:_ A `List<String>` object containing all warning messages
+- _infoMessages:_ A `List<String>` object containing all info messages
+- _statusMessages:_ A `List<String>` object containing all status messages
 
 ## Properties
 
 The binding provides the following properties:
 
-| Property                         | Description                                                                                                                      | 
-| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | 
-| articleDescription               | The KWL's article description                                                                                                    | 
-| refNo                            | The KWL's reference number                                                                                                       | 
-| macAddress                       | The KWL's MAC Address                                                                                                            | 
-| language                         | The KWL user interface's language (de, en, fr, hr, hu, it, pl, sk, sl)                                                           | 
-| voltageFanStage1ExtractAir       | Voltage of extract air fan mapped to fan stage 1 (1.6 - 10 V)                                                                    | 
-| voltageFanStage2ExtractAir       | Voltage of extract air fan mapped to fan stage 2 (1.6 - 10 V)                                                                    | 
-| voltageFanStage3ExtractAir       | Voltage of extract air fan mapped to fan stage 3 (1.6 - 10 V)                                                                    | 
-| voltageFanStage4ExtractAir       | Voltage of extract air fan mapped to fan stage 4 (1.6 - 10 V)                                                                    | 
-| voltageFanStage1SupplyAir        | Voltage of supply air fan mapped to fan stage 1 (1.6 - 10 V)                                                                     | 
-| voltageFanStage2SupplyAir        | Voltage of supply air fan mapped to fan stage 2 (1.6 - 10 V)                                                                     | 
-| voltageFanStage3SupplyAir        | Voltage of supply air fan mapped to fan stage 3 (1.6 - 10 V)                                                                     | 
-| voltageFanStage4SupplyAir        | Voltage of supply air fan mapped to fan stage 4 (1.6 - 10 V)                                                                     | 
-| kwlBe                            | Slide switch controller KWL-BE activated                                                                                         | 
-| kwlBec                           | Comfort controller KWL-BEC activated                                                                                             | 
-| unitConfig                       | Ventilation unit configuration (type of house) (1 = DiBt, 2 = passive-house)                                                     | 
-| kwlFtfConfig0                    | Humidity/temperature sensor configuration 0 (1 = only humidity, 2 = only temperature, 3 = combined)                              | 
-| kwlFtfConfig1                    | Humidity/temperature sensor configuration 1 (1 = only humidity, 2 = only temperature, 3 = combined)                              | 
-| kwlFtfConfig2                    | Humidity/temperature sensor configuration 2 (1 = only humidity, 2 = only temperature, 3 = combined)                              | 
-| kwlFtfConfig3                    | Humidity/temperature sensor configuration 3 (1 = only humidity, 2 = only temperature, 3 = combined)                              | 
-| kwlFtfConfig4                    | Humidity/temperature sensor configuration 4 (1 = only humidity, 2 = only temperature, 3 = combined)                              | 
-| kwlFtfConfig5                    | Humidity/temperature sensor configuration 5 (1 = only humidity, 2 = only temperature, 3 = combined)                              | 
-| kwlFtfConfig6                    | Humidity/temperature sensor configuration 6 (1 = only humidity, 2 = only temperature, 3 = combined)                              | 
-| kwlFtfConfig7                    | Humidity/temperature sensor configuration 7 (1 = only humidity, 2 = only temperature, 3 = combined)                              | 
-| humidityControlStatus            | Humidity control status (0 = off, 1 = stepped, 2 = stepless)                                                                     | 
-| co2ControlStatus                 | CO2 control status (0 = off, 1 = stepped, 2 = stepless)                                                                          | 
-| vocControlStatus                 | VOC control status (0 = off, 1 = stepped, 2 = stepless)                                                                          | 
-| dateFormat                       | Date format (0 = dd.mm.yyyy, 1 = mm.dd.yyyy, 2 = yyyy.mm.dd)                                                                     | 
-| heatExchangerType                | Heat exchanger type (1 = plastic, 2 = aluminium, 3 = enthalpy)                                                                   | 
-| serNo                            | Serial number                                                                                                                    | 
-| prodCode                         | Production Code                                                                                                                  | 
-| vhzType                          | Pre-heater type (1 = EH-Basis, 2 EH-ERW, 3 = SEWT, 4 = LEWT)                                                                     | 
-| functionTypeKwlEm                | Function KWL-EM (1 = function 1, 2 = function 2)                                                                                 | 
-| externalContact                  | External contact (1 -6 (function 1-6))                                                                                           | 
-| fanStageStepped0to2v             | Fan stage for stepped mode - range 0-2V (0 - 2)                                                                                  | 
-| fanStageStepped2to4v             | Fan stage for stepped mode - range 2-4V (0 - 4)                                                                                  | 
-| fanStageStepped4to6v             | Fan stage for stepped mode - range 4-6V (0 - 4)                                                                                  | 
-| fanStageStepped6to8v             | Fan stage for stepped mode - range 6-8V (0 - 4)                                                                                  | 
-| fanStageStepped8to10v            | Fan stage for stepped mode - range 8-10V (0 - 4)                                                                                 | 
-| offsetExtractAir                 | Offset extract air (float)                                                                                                       | 
-| assignmentFanStages              | Assignment fan stages - stepped or 0-10V (OFF = 0-10V, ON = stepped)                                                             | 
-| sensorNameHumidityAndTemp1       | Sensor name - humidity and temperature 1                                                                                         | 
-| sensorNameHumidityAndTemp2       | Sensor name - humidity and temperature 2                                                                                         | 
-| sensorNameHumidityAndTemp3       | Sensor name - humidity and temperature 3                                                                                         | 
-| sensorNameHumidityAndTemp4       | Sensor name - humidity and temperature 4                                                                                         | 
-| sensorNameHumidityAndTemp5       | Sensor name - humidity and temperature 5                                                                                         | 
-| sensorNameHumidityAndTemp6       | Sensor name - humidity and temperature 6                                                                                         | 
-| sensorNameHumidityAndTemp7       | Sensor name - humidity and temperature 7                                                                                         | 
-| sensorNameHumidityAndTemp8       | Sensor name - humidity and temperature 8                                                                                         | 
-| sensorNameCo21                   | Sensor name - CO2 1                                                                                                              | 
-| sensorNameCo22                   | Sensor name - CO2 2                                                                                                              | 
-| sensorNameCo23                   | Sensor name - CO2 3                                                                                                              | 
-| sensorNameCo24                   | Sensor name - CO2 4                                                                                                              | 
-| sensorNameCo25                   | Sensor name - CO2 5                                                                                                              | 
-| sensorNameCo26                   | Sensor name - CO2 6                                                                                                              | 
-| sensorNameCo27                   | Sensor name - CO2 7                                                                                                              | 
-| sensorNameCo28                   | Sensor name - CO2 8                                                                                                              | 
-| sensorNameVoc1                   | Sensor name - VOC 1                                                                                                              | 
-| sensorNameVoc2                   | Sensor name - VOC 2                                                                                                              | 
-| sensorNameVoc3                   | Sensor name - VOC 3                                                                                                              | 
-| sensorNameVoc4                   | Sensor name - VOC 4                                                                                                              | 
-| sensorNameVoc5                   | Sensor name - VOC 5                                                                                                              | 
-| sensorNameVoc6                   | Sensor name - VOC 6                                                                                                              | 
-| sensorNameVoc7                   | Sensor name - VOC 7                                                                                                              | 
-| sensorNameVoc8                   | Sensor name - VOC 8                                                                                                              | 
-| softwareVersionBasis             | Software version basis (format xx.xx)                                                                                            | 
-| sensorConfigKwlFtf1              | Sensor configuration (installed or not) KWL-FTF 1 (OFF = no sensor, ON = sensor installed)                                       | 
-| sensorConfigKwlFtf2              | Sensor configuration (installed or not) KWL-FTF 2 (OFF = no sensor, ON = sensor installed)                                       | 
-| sensorConfigKwlFtf3              | Sensor configuration (installed or not) KWL-FTF 3 (OFF = no sensor, ON = sensor installed)                                       | 
-| sensorConfigKwlFtf4              | Sensor configuration (installed or not) KWL-FTF 4 (OFF = no sensor, ON = sensor installed)                                       | 
-| sensorConfigKwlFtf5              | Sensor configuration (installed or not) KWL-FTF 5 (OFF = no sensor, ON = sensor installed)                                       | 
-| sensorConfigKwlFtf6              | Sensor configuration (installed or not) KWL-FTF 6 (OFF = no sensor, ON = sensor installed)                                       | 
-| sensorConfigKwlFtf7              | Sensor configuration (installed or not) KWL-FTF 7 (OFF = no sensor, ON = sensor installed)                                       | 
-| sensorConfigKwlFtf8              | Sensor configuration (installed or not) KWL-FTF 8 (OFF = no sensor, ON = sensor installed)                                       | 
-
+| Property                         | Description                                                                                                                      |
+| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| articleDescription               | The KWL's article description                                                                                                    |
+| refNo                            | The KWL's reference number                                                                                                       |
+| macAddress                       | The KWL's MAC Address                                                                                                            |
+| language                         | The KWL user interface's language (de, en, fr, hr, hu, it, pl, sk, sl)                                                           |
+| voltageFanStage1ExtractAir       | Voltage of extract air fan mapped to fan stage 1 (1.6 - 10 V)                                                                    |
+| voltageFanStage2ExtractAir       | Voltage of extract air fan mapped to fan stage 2 (1.6 - 10 V)                                                                    |
+| voltageFanStage3ExtractAir       | Voltage of extract air fan mapped to fan stage 3 (1.6 - 10 V)                                                                    |
+| voltageFanStage4ExtractAir       | Voltage of extract air fan mapped to fan stage 4 (1.6 - 10 V)                                                                    |
+| voltageFanStage1SupplyAir        | Voltage of supply air fan mapped to fan stage 1 (1.6 - 10 V)                                                                     |
+| voltageFanStage2SupplyAir        | Voltage of supply air fan mapped to fan stage 2 (1.6 - 10 V)                                                                     |
+| voltageFanStage3SupplyAir        | Voltage of supply air fan mapped to fan stage 3 (1.6 - 10 V)                                                                     |
+| voltageFanStage4SupplyAir        | Voltage of supply air fan mapped to fan stage 4 (1.6 - 10 V)                                                                     |
+| kwlBe                            | Slide switch controller KWL-BE activated                                                                                         |
+| kwlBec                           | Comfort controller KWL-BEC activated                                                                                             |
+| unitConfig                       | Ventilation unit configuration (type of house) (1 = DiBt, 2 = passive-house)                                                     |
+| kwlFtfConfig0                    | Humidity/temperature sensor configuration 0 (1 = only humidity, 2 = only temperature, 3 = combined)                              |
+| kwlFtfConfig1                    | Humidity/temperature sensor configuration 1 (1 = only humidity, 2 = only temperature, 3 = combined)                              |
+| kwlFtfConfig2                    | Humidity/temperature sensor configuration 2 (1 = only humidity, 2 = only temperature, 3 = combined)                              |
+| kwlFtfConfig3                    | Humidity/temperature sensor configuration 3 (1 = only humidity, 2 = only temperature, 3 = combined)                              |
+| kwlFtfConfig4                    | Humidity/temperature sensor configuration 4 (1 = only humidity, 2 = only temperature, 3 = combined)                              |
+| kwlFtfConfig5                    | Humidity/temperature sensor configuration 5 (1 = only humidity, 2 = only temperature, 3 = combined)                              |
+| kwlFtfConfig6                    | Humidity/temperature sensor configuration 6 (1 = only humidity, 2 = only temperature, 3 = combined)                              |
+| kwlFtfConfig7                    | Humidity/temperature sensor configuration 7 (1 = only humidity, 2 = only temperature, 3 = combined)                              |
+| humidityControlStatus            | Humidity control status (0 = off, 1 = stepped, 2 = stepless)                                                                     |
+| co2ControlStatus                 | CO2 control status (0 = off, 1 = stepped, 2 = stepless)                                                                          |
+| vocControlStatus                 | VOC control status (0 = off, 1 = stepped, 2 = stepless)                                                                          |
+| dateFormat                       | Date format (0 = dd.mm.yyyy, 1 = mm.dd.yyyy, 2 = yyyy.mm.dd)                                                                     |
+| heatExchangerType                | Heat exchanger type (1 = plastic, 2 = aluminium, 3 = enthalpy)                                                                   |
+| serNo                            | Serial number                                                                                                                    |
+| prodCode                         | Production Code                                                                                                                  |
+| vhzType                          | Pre-heater type (1 = EH-Basis, 2 EH-ERW, 3 = SEWT, 4 = LEWT)                                                                     |
+| functionTypeKwlEm                | Function KWL-EM (1 = function 1, 2 = function 2)                                                                                 |
+| externalContact                  | External contact (1 -6 (function 1-6))                                                                                           |
+| fanStageStepped0to2v             | Fan stage for stepped mode - range 0-2V (0 - 2)                                                                                  |
+| fanStageStepped2to4v             | Fan stage for stepped mode - range 2-4V (0 - 4)                                                                                  |
+| fanStageStepped4to6v             | Fan stage for stepped mode - range 4-6V (0 - 4)                                                                                  |
+| fanStageStepped6to8v             | Fan stage for stepped mode - range 6-8V (0 - 4)                                                                                  |
+| fanStageStepped8to10v            | Fan stage for stepped mode - range 8-10V (0 - 4)                                                                                 |
+| offsetExtractAir                 | Offset extract air (float)                                                                                                       |
+| assignmentFanStages              | Assignment fan stages - stepped or 0-10V (OFF = 0-10V, ON = stepped)                                                             |
+| sensorNameHumidityAndTemp1       | Sensor name - humidity and temperature 1                                                                                         |
+| sensorNameHumidityAndTemp2       | Sensor name - humidity and temperature 2                                                                                         |
+| sensorNameHumidityAndTemp3       | Sensor name - humidity and temperature 3                                                                                         |
+| sensorNameHumidityAndTemp4       | Sensor name - humidity and temperature 4                                                                                         |
+| sensorNameHumidityAndTemp5       | Sensor name - humidity and temperature 5                                                                                         |
+| sensorNameHumidityAndTemp6       | Sensor name - humidity and temperature 6                                                                                         |
+| sensorNameHumidityAndTemp7       | Sensor name - humidity and temperature 7                                                                                         |
+| sensorNameHumidityAndTemp8       | Sensor name - humidity and temperature 8                                                                                         |
+| sensorNameCo21                   | Sensor name - CO2 1                                                                                                              |
+| sensorNameCo22                   | Sensor name - CO2 2                                                                                                              |
+| sensorNameCo23                   | Sensor name - CO2 3                                                                                                              |
+| sensorNameCo24                   | Sensor name - CO2 4                                                                                                              |
+| sensorNameCo25                   | Sensor name - CO2 5                                                                                                              |
+| sensorNameCo26                   | Sensor name - CO2 6                                                                                                              |
+| sensorNameCo27                   | Sensor name - CO2 7                                                                                                              |
+| sensorNameCo28                   | Sensor name - CO2 8                                                                                                              |
+| sensorNameVoc1                   | Sensor name - VOC 1                                                                                                              |
+| sensorNameVoc2                   | Sensor name - VOC 2                                                                                                              |
+| sensorNameVoc3                   | Sensor name - VOC 3                                                                                                              |
+| sensorNameVoc4                   | Sensor name - VOC 4                                                                                                              |
+| sensorNameVoc5                   | Sensor name - VOC 5                                                                                                              |
+| sensorNameVoc6                   | Sensor name - VOC 6                                                                                                              |
+| sensorNameVoc7                   | Sensor name - VOC 7                                                                                                              |
+| sensorNameVoc8                   | Sensor name - VOC 8                                                                                                              |
+| softwareVersionBasis             | Software version basis (format xx.xx)                                                                                            |
+| sensorConfigKwlFtf1              | Sensor configuration (installed or not) KWL-FTF 1 (OFF = no sensor, ON = sensor installed)                                       |
+| sensorConfigKwlFtf2              | Sensor configuration (installed or not) KWL-FTF 2 (OFF = no sensor, ON = sensor installed)                                       |
+| sensorConfigKwlFtf3              | Sensor configuration (installed or not) KWL-FTF 3 (OFF = no sensor, ON = sensor installed)                                       |
+| sensorConfigKwlFtf4              | Sensor configuration (installed or not) KWL-FTF 4 (OFF = no sensor, ON = sensor installed)                                       |
+| sensorConfigKwlFtf5              | Sensor configuration (installed or not) KWL-FTF 5 (OFF = no sensor, ON = sensor installed)                                       |
+| sensorConfigKwlFtf6              | Sensor configuration (installed or not) KWL-FTF 6 (OFF = no sensor, ON = sensor installed)                                       |
+| sensorConfigKwlFtf7              | Sensor configuration (installed or not) KWL-FTF 7 (OFF = no sensor, ON = sensor installed)                                       |
+| sensorConfigKwlFtf8              | Sensor configuration (installed or not) KWL-FTF 8 (OFF = no sensor, ON = sensor installed)                                       |
 
 ## Errors / Warnings / Infos
 
@@ -336,19 +326,18 @@ Also status flags are provided this way. For details please refer to the manufac
 
 Based on that concept, errors, warnings and infos are provided in 3 different ways:
 
-* As an unsigned integer value with the decimal representation of the encoded bits
-* The total number of encoded errors, warning or infos
-* The bit encoded as a string
+- As an unsigned integer value with the decimal representation of the encoded bits
+- The total number of encoded errors, warning or infos
+- The bit encoded as a string
 
 Since there can potentially be several errors, warnings or infos, using a simple MAP to display the corresponding message in a UI will not work in all cases. String items with multiple lines will not display properly in the UIs.
 Therefore the binding provides actions to retrieve the different messages as an `ArrayList<String>` object which can then be used to e.g. send the messages via email.
 
-
 ## Full Example
 
 ### Thing Configuration
 
-```
+```java
 Bridge modbus:tcp:modbus-gateway "Modbus TCP/IP Gateway" [ host="192.168.47.11", port=502, id=180, enableDiscovery=true ] {
     Thing helios-easycontrols kwl "KWL"
 }
@@ -356,7 +345,7 @@ Bridge modbus:tcp:modbus-gateway "Modbus TCP/IP Gateway" [ host="192.168.47.11",
 
 ### Item Configuration
 
-```
+```java
 // Manual operation
 Number KWL_Manual                        "Manual operation"                          <fan>         (gKWL) ["Control"]                    {channel="modbus:helios-easycontrols:modbus-gateway:kwl:operation#operatingMode"}
 Number KWL_Stage                         "KWL fan stage"                             <fan>         (gKWL) ["Setpoint", "Level"]          {channel="modbus:helios-easycontrols:modbus-gateway:kwl:operation#fanStage"}
@@ -395,7 +384,7 @@ String KWL_Status_Flags                  "Status Flags [%s]"
 
 ### Rule
 
-```
+```java
 import java.util.List
 import java.util.Map
 
@@ -427,7 +416,7 @@ end
 
 ### Transformation
 
-```
+```text
 0=no
 1=yes
 OFF=no
@@ -438,7 +427,7 @@ NULL=-
 
 ### Sitemap
 
-```
+```perl
 Text label="KWL" icon="fan" {
     Frame label="Manual operation" {
         Selection item=KWL_Manual mappings=[0=Auto, 1=Manual]
diff --git a/bundles/org.openhab.binding.modbus.sbc/README.md b/bundles/org.openhab.binding.modbus.sbc/README.md
index d1d75f35353ba..5c011598f0d93 100644
--- a/bundles/org.openhab.binding.modbus.sbc/README.md
+++ b/bundles/org.openhab.binding.modbus.sbc/README.md
@@ -25,7 +25,7 @@ The Thing needs a Modbus serial slave Bridge to operate.
 
 One of the following serial settings need to be configured in the Bridge:
 
-- 9600 baud, 2 stop bit, no parity 
+- 9600 baud, 2 stop bit, no parity
 - 9600 baud, 1 stop bit, even parity
 - 9600 baud, 1 stop bit, odd parity
 
@@ -48,7 +48,7 @@ The following Channels apply to `ald1Unidirectional` and `ald1Bidirectional` if
 
 ### .items
 
-```
+```java
 Number:Energy ALD1_Total_Energy "[%.2f %unit%]"        {channel="modbus:ald1Bidirectional:8b6e85623b:total_energy"}
 Number:Energy ALD1_Feeding_Back_Energy "[%.2f %unit%]" {channel="modbus:ald1Bidirectional:8b6e85623b:feeding_back_energy"}
 Number:ElectricPotential ALD1_Voltage "[%d %unit%]"    {channel="modbus:ald1Bidirectional:8b6e85623b:voltage"}
@@ -60,7 +60,7 @@ Number:Dimensionless ALD1_Power_Factor "[%.2f]"        {channel="modbus:ald1Bidi
 
 ### .sitemap
 
-```
+```perl
 sitemap ald1 label="ALD1 Energy Meter"
 {
     Default item=ALD1_Total_Energy label="Total Energy"
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/README.md b/bundles/org.openhab.binding.modbus.stiebeleltron/README.md
index 9f60785ee2082..25d38b4bbfa77 100644
--- a/bundles/org.openhab.binding.modbus.stiebeleltron/README.md
+++ b/bundles/org.openhab.binding.modbus.stiebeleltron/README.md
@@ -2,8 +2,8 @@
 
 This extension adds support for the Stiebel Eltron modbus protocol.
 
-An Internet Service Gateway (ISG) with an installed modbus extension is required in order to run this binding. 
-In case the modbus extension is not yet installed on the ISG, the ISG Updater Tool for the update can be found here: https://www.stiebel-eltron.de/de/home/produkte-loesungen/erneuerbare_energien/regelung_energiemanagement/internet_servicegateway/isg_web/downloads.html
+An Internet Service Gateway (ISG) with an installed modbus extension is required in order to run this binding.
+In case the modbus extension is not yet installed on the ISG, the ISG Updater Tool for the update can be found here: <https://www.stiebel-eltron.de/de/home/produkte-loesungen/erneuerbare_energien/regelung_energiemanagement/internet_servicegateway/isg_web/downloads.html>
 
 ## Supported Things
 
@@ -20,7 +20,7 @@ This extension does not support autodiscovery. The things need to be added manua
 
 A typical bridge configuration would look like this:
 
-```
+```java
 Bridge modbus:tcp:bridge [ host="10.0.0.2", port=502, id=1 ]
 ```
 
@@ -52,7 +52,7 @@ This group contains general operational information about the heat pump.
 | is-pumping       | Contact   | true      | OPEN in case the heat pump is currently in pumping mode       |
 | is-summer        | Contact   | true      | OPEN in case the heat pump is currently in summer mode        |
 
-### System Parameters Group 
+### System Parameters Group
 
 This group contains system paramters of the heat pump.
 
@@ -64,7 +64,7 @@ This group contains system paramters of the heat pump.
 | comfort-temperature-water   | Number:Temperature | false     | The current water comfort temperature                                                                                                          |
 | eco-temperature-water       | Number:Temperature | false     | The current water eco temperature                                                                                                              |
 
-### System Information Group 
+### System Information Group
 
 This group contains general operational information about the device.
 
@@ -83,7 +83,7 @@ This group contains general operational information about the device.
 | water-temperature          | Number:Temperature   | true      | The current water temperature                         |
 | water-temperature-setpoint | Number:Temperature   | true      | The current water temperature set point               |
 
-### Energy Information Group 
+### Energy Information Group
 
 This group contains about the energy consumption and delivery of the heat pump.
 
@@ -102,15 +102,15 @@ This group contains about the energy consumption and delivery of the heat pump.
 
 ### Thing Configuration
 
-```
+```java
 Bridge modbus:tcp:bridge "Stiebel Modbus TCP"[ host="hostname|ip", port=502, id=1 ] {
-	Thing heatpump stiebelEltron "StiebelEltron" (modbus:tcp:modbusbridge) @"Room"  [ ]
+ Thing heatpump stiebelEltron "StiebelEltron" (modbus:tcp:modbusbridge) @"Room"  [ ]
 }
 ```
 
 ### Item Configuration
 
-```
+```java
 Number:Temperature stiebel_eltron_temperature_ffk            "Temperature FFK [%.1f °C]" <temperature>    { channel="modbus:heatpump:stiebelEltron:systemInformation#fek-temperature" }
 Number:Temperature stiebel_eltron_setpoint_ffk            "Set point FFK [%.1f °C]" <temperature>    { channel="modbus:heatpump:stiebelEltron:systemInformation#fek-temperature-setpoint" }
 Number:Dimensionless stiebel_eltron_humidity_ffk            "Humidity FFK [%.1f %%]" <humidity>   { channel="modbus:heatpump:stiebelEltron:systemInformation#fek-humidity" }
@@ -151,49 +151,49 @@ Number:Energy stiebel_eltron_consumption_water_total            "Water heating p
 
 ### Sitemap Configuration
 
-```
-        Text label="Heat pumpt" icon="temperature" {
-			Frame label="Optation Mode" {
-				Default item=stiebel_eltron_mode_pump 
-				Default item=stiebel_eltron_mode_heating
-				Default item=stiebel_eltron_mode_water 
-				Default item=stiebel_eltron_mode_cooling 
-				Default item=stiebel_eltron_mode_summer
-			}
-			Frame label= "State" {
-				Default item=stiebel_eltron_operation_mode icon="settings"
-				Default item=stiebel_eltron_outdoor_temp  icon="temperature"
-				Default item=stiebel_eltron_temp_hk1  icon="temperature"
-				Default item=stiebel_eltron_setpoint_hk1  icon="temperature"
-				Default item=stiebel_eltron_vorlauf_temp  icon="temperature"
-				Default item=stiebel_eltron_ruecklauf_temp  icon="temperature"
-				Default item=stiebel_eltron_temp_water  icon="temperature"
-				Default item=stiebel_eltron_setpoint_water icon="temperature"
-				Default item=stiebel_eltron_temperature_ffk  icon="temperature"
-				Default item=stiebel_eltron_setpoint_ffk icon="temperature"
-				Default item=stiebel_eltron_humidity_ffk icon="humidity"
-				Default item=stiebel_eltron_dewpoint_ffk icon="temperature"
-				Default item=stiebel_eltron_source_temp icon="temperature"
-			}
-			Frame label="Paramters" {
-				Setpoint item=stiebel_eltron_heating_comfort_temp icon="temperature" step=1 minValue=5 maxValue=30
-				Setpoint item=stiebel_eltron_heating_eco_temp icon="temperature" step=1 minValue=5 maxValue=30
-				Setpoint item=stiebel_eltron_water_comfort_temp icon="temperature" step=1 minValue=10 maxValue=60
-				Setpoint item=stiebel_eltron_water_eco_temp icon="temperature" step=1 minValue=10 maxValue=60
-			}
-			Frame label="Energy consumption" {
-				Default item=stiebel_eltron_consumption_heat_today icon="energy"
-				Default item=stiebel_eltron_consumption_heat_total icon="energy"
-				Default item=stiebel_eltron_consumption_water_today icon="energy"
-				Default item=stiebel_eltron_consumption_water_total icon="energy"
-			}
-			Frame label="Heat quantity" {
-				Default item=stiebel_eltron_production_heat_today icon="radiator"
-				Default item=stiebel_eltron_production_heat_total icon="radiator"
-				Default item=stiebel_eltron_production_water_today icon="water"
-				Default item=stiebel_eltron_production_water_total icon="water"
-			}
-
-		}
+```perl
+Text label="Heat pumpt" icon="temperature" {
+ Frame label="Optation Mode" {
+  Default item=stiebel_eltron_mode_pump 
+  Default item=stiebel_eltron_mode_heating
+  Default item=stiebel_eltron_mode_water 
+  Default item=stiebel_eltron_mode_cooling 
+  Default item=stiebel_eltron_mode_summer
+ }
+ Frame label= "State" {
+  Default item=stiebel_eltron_operation_mode icon="settings"
+  Default item=stiebel_eltron_outdoor_temp  icon="temperature"
+  Default item=stiebel_eltron_temp_hk1  icon="temperature"
+  Default item=stiebel_eltron_setpoint_hk1  icon="temperature"
+  Default item=stiebel_eltron_vorlauf_temp  icon="temperature"
+  Default item=stiebel_eltron_ruecklauf_temp  icon="temperature"
+  Default item=stiebel_eltron_temp_water  icon="temperature"
+  Default item=stiebel_eltron_setpoint_water icon="temperature"
+  Default item=stiebel_eltron_temperature_ffk  icon="temperature"
+  Default item=stiebel_eltron_setpoint_ffk icon="temperature"
+  Default item=stiebel_eltron_humidity_ffk icon="humidity"
+  Default item=stiebel_eltron_dewpoint_ffk icon="temperature"
+  Default item=stiebel_eltron_source_temp icon="temperature"
+ }
+ Frame label="Paramters" {
+  Setpoint item=stiebel_eltron_heating_comfort_temp icon="temperature" step=1 minValue=5 maxValue=30
+  Setpoint item=stiebel_eltron_heating_eco_temp icon="temperature" step=1 minValue=5 maxValue=30
+  Setpoint item=stiebel_eltron_water_comfort_temp icon="temperature" step=1 minValue=10 maxValue=60
+  Setpoint item=stiebel_eltron_water_eco_temp icon="temperature" step=1 minValue=10 maxValue=60
+ }
+ Frame label="Energy consumption" {
+  Default item=stiebel_eltron_consumption_heat_today icon="energy"
+  Default item=stiebel_eltron_consumption_heat_total icon="energy"
+  Default item=stiebel_eltron_consumption_water_today icon="energy"
+  Default item=stiebel_eltron_consumption_water_total icon="energy"
+ }
+ Frame label="Heat quantity" {
+  Default item=stiebel_eltron_production_heat_today icon="radiator"
+  Default item=stiebel_eltron_production_heat_total icon="radiator"
+  Default item=stiebel_eltron_production_water_today icon="water"
+  Default item=stiebel_eltron_production_water_total icon="water"
+ }
+
+}
 
 ```
diff --git a/bundles/org.openhab.binding.modbus.studer/README.md b/bundles/org.openhab.binding.modbus.studer/README.md
index 019bc163f0aa0..39b53ae2e36a9 100644
--- a/bundles/org.openhab.binding.modbus.studer/README.md
+++ b/bundles/org.openhab.binding.modbus.studer/README.md
@@ -2,9 +2,9 @@
 
 This extension adds support for the Studer protocol.
 
-Studer Innotec, founded in 1987 by Roland Studer, is an ISO certified company that develops and manufactures inverters, inverter/chargers and MPPT solar charge controllers to communicate over the Modbus protocol entirely in Switzerland 
+Studer Innotec, founded in 1987 by Roland Studer, is an ISO certified company that develops and manufactures inverters, inverter/chargers and MPPT solar charge controllers to communicate over the Modbus protocol entirely in Switzerland
 
-For a list of certified products see this page: https://www.studer-innotec.com/
+For a list of certified products see this page: <https://www.studer-innotec.com/>
 
 ## Supported Things
 
@@ -18,7 +18,6 @@ Note, that the things will show up under the Modbus binding.
 | variotrack     | For the VarioTrack models of MPPT solar charge controllers for systems with solar PV capacity from 1 - 75kWp         | ![VarioTrack](doc/variotrack.png)   |
 | variostring    | For the VarioString models of MPPT solar charge controllers for systems with solar PV capacity from 4                | ![VarioString](doc/variostring.png) |
 
-
 ## Thing Configuration
 
 You need first to set up a Serial Modbus bridge according to the Modbus documentation.
@@ -46,7 +45,6 @@ More Details about that can be found in the technical specification and appendix
 
 Multicast writes on any devices of given class, but reads only on the first available device (Not Summary!). As currently there are no writes available, 10/20/40 is useless for now.
 
-
 The following parameters are valid for all thing types:
 
 | Parameter | Type    | Required | Default if omitted      | Description                                                                |
@@ -58,7 +56,7 @@ The following parameters are valid for all thing types:
 
 The following Channels, and their associated channel types are shown below divided by device.
 
-#### BSP 
+### BSP
 
 All channels read for a BSP device
 
@@ -70,7 +68,7 @@ All channels read for a BSP device
 | stateOfCharge      | Number:Dimensionless     | State of Charge       |
 | batteryTemperature | Number:Temperature       | Battery temperature   |
 
-#### Xtender 
+### Xtender
 
 All channels read for a Xtender device
 
@@ -87,7 +85,7 @@ All channels read for a Xtender device
 | operatingState    | String                   | Operating state         |
 | stateInverter     | String                   | State of the inverter   |
 
-#### VarioTrack 
+### VarioTrack
 
 All channels read for a VarioTrack device
 
@@ -102,7 +100,7 @@ All channels read for a VarioTrack device
 | operatingMode        | String                   | Operating mode                            |
 | stateVarioTrack      | String                   | State of the VarioTrack                   |
 
-#### VarioString 
+### VarioString
 
 All channels read for a VarioString device
 
@@ -131,7 +129,7 @@ All channels read for a VarioString device
 
 ### Thing Configuration
 
-```
+```java
 Bridge modbus:serial:bridge [port="/dev/ttyUSB0",baud=9600,dataBits=8,parity="even",stopBits="1.0",encoding="rtu"]
 ..or..
 Bridge modbus:tcp:bridge [host="192.168.178.56", port=502, rtuEncoded=true]
@@ -144,12 +142,11 @@ Thing modbus:variostring:bridge:variostring_right "Xtender" (modbus:serial:modbu
 Thing modbus:bsp:bridge:byd "BydBox" (modbus:serial:modbusbridge) [ slaveAddress=61, refresh=5 ]
 ```
 
-
 Note: Make sure that refresh and slave address are numerical, without quotes.
 
 ### Item Configuration
 
-```
+```java
 Number Studer_Xtender_Phase1_InputVoltage "Input Voltage [%.2f V]"          {channel="modbus:xtender:bridge:xtender_Phase1:inputVoltage"}
 Number Studer_Xtender_Phase1_InputCurrent "Input Current [%.2f A]"          {channel="modbus:xtender:bridge:xtender_Phase1:inputCurrent"}
 String Studer_Xtender_Phase1_StateInverter "State: [%s]"                    {channel="modbus:xtender:bridge:xtender_Phase1:stateInverter"}
@@ -166,7 +163,7 @@ Number Studer_BSP_batteryVoltage     "Battery Voltage: [%s]"                {cha
 
 ### Sitemap Configuration
 
-```
+```perl
 Text item=Studer_Xtender_Phase1_InputVoltage
 Text item=Studer_Xtender_Phase1_InputCurrent
 Text item=Studer_Xtender_Phase1_StateInverter
diff --git a/bundles/org.openhab.binding.modbus.sunspec/DEVELOPERS.md b/bundles/org.openhab.binding.modbus.sunspec/DEVELOPERS.md
index 95cc2d0ae45c6..e1062ef2cd55d 100644
--- a/bundles/org.openhab.binding.modbus.sunspec/DEVELOPERS.md
+++ b/bundles/org.openhab.binding.modbus.sunspec/DEVELOPERS.md
@@ -1,22 +1,22 @@
-## For Developers
+# For Developers
 
 SunSpec is a big specification with many different type of devices.
 If you own or have access to an appliance that is not supported at the moment then your help is welcome.
 
 If you want to extend the bundle yourself, you have to do the followings:
 
- - Define your thing type, channel types and channel groups according to openHAB development practices.
+- Define your thing type, channel types and channel groups according to openHAB development practices.
  You can look at the meter and inverter types to get ideas how you can avoid repeating the same configuration over and over.
- 
- - Extend the `AbstractSunSpecHandler` and implement the handlePolledData method.
+
+- Extend the `AbstractSunSpecHandler` and implement the handlePolledData method.
  This method will be regularly called with the register data read from the appliance.
  The method should parse the data and update the channels with them.
 
- - The preferred way to parse the raw data is to write a parser for you model block type.
+- The preferred way to parse the raw data is to write a parser for you model block type.
  Your class should implement the `SunspecParser` class and it is preferred to extend the `AbstractBaseParser` class.
  This base class has methods to accurately extract fields from the register array.
 
- - The parser should only retrieve the data from the register array and return them in a block descriptor class.
+- The parser should only retrieve the data from the register array and return them in a block descriptor class.
  Scaling and other higher level transformation should be done by the handler itself.
- 
- - To include your block type in auto discovery you have to add its id to the `SUPPORTED_THING_TYPES_UIDS` map in `SunSpecConstants`. This is enough for our discovery process to include your thing type in the results.
+
+- To include your block type in auto discovery you have to add its id to the `SUPPORTED_THING_TYPES_UIDS` map in `SunSpecConstants`. This is enough for our discovery process to include your thing type in the results.
diff --git a/bundles/org.openhab.binding.modbus.sunspec/README.md b/bundles/org.openhab.binding.modbus.sunspec/README.md
index 5ae9122b161af..a1a3c48c3454c 100644
--- a/bundles/org.openhab.binding.modbus.sunspec/README.md
+++ b/bundles/org.openhab.binding.modbus.sunspec/README.md
@@ -6,7 +6,7 @@ SunSpec is a format for inverters and smart meters to communicate over the Modbu
 It defines how common parameters like AC/DC voltage and current, lifetime produced energy, device temperature etc can be read from the device.
 
 SunSpec is supported by several manufacturers like ABB, Fronius, LG, SMA, SolarEdge, Schneider Electric.
-For a list of certified products see this page: https://sunspec.org/sunspec-certified-products/
+For a list of certified products see this page: <https://sunspec.org/sunspec-certified-products/>
 
 ## Supported Things
 
@@ -34,7 +34,7 @@ You can set the `enableDiscovery=true` parameter in your bridge.
 
 A typical bridge configuration would look like this:
 
-```
+```java
 Bridge modbus:tcp:modbusBridgeName [ host="10.0.0.2", port=502, id=1, enableDiscovery=true ]
 ```
 
@@ -189,7 +189,7 @@ Supported by: all inverter things
 
 ### Thing Configuration
 
-```
+```java
 Bridge modbus:tcp:modbusBridgeName [ host="hostname|ip", port=502, id=1, enableDiscovery=true ]
 Thing modbus:inverter-single-phase:bridge:myInverter "SE4000h" (modbus:tcp:modbusBridgeName) [ address=40069, length=52, refresh=15 ]
 ```
@@ -198,7 +198,7 @@ Note: Make sure that refresh, port and id values are numerical, without quotes.
 
 ### Item Configuration
 
-```
+```java
 Number Inverter_Temperature "Temperature [%.1f C]"  {channel="modbus:inverter-single-phase:bridge:se4000h:deviceInformation#heatsink-temperature"}
 
 Number Inverter_AC_Power "AC Power [%d W]" {channel="modbus:inverter-single-phase:bridge:se4000h:acGeneral#ac-power"}
@@ -209,12 +209,12 @@ Number Inverter_AC1_A "AC Current Phase 1 [%0.2f A]" {channel="modbus:inverter-s
 
 ### Sitemap Configuration
 
-```
-                        Text item=Inverter_Temperature
-                        Text item=Inverter_AC_Current
-                        Text item=Inverter_AC_Power
-                        Chart item=Inverter_Temperature period=D refresh=600000
-                        Chart item=Inverter_AC_Power period=D refresh=30000
+```perl
+Text item=Inverter_Temperature
+Text item=Inverter_AC_Current
+Text item=Inverter_AC_Power
+Chart item=Inverter_Temperature period=D refresh=600000
+Chart item=Inverter_AC_Power period=D refresh=30000
 
 ```
 
@@ -223,6 +223,6 @@ Number Inverter_AC1_A "AC Current Phase 1 [%0.2f A]" {channel="modbus:inverter-s
 ### SolarEdge
 
 Newer models of SolarEdge inverters can be monitored over TCP, but you need to enable support in the inverter first.
-Refer to the "Modbus over TCP Configuration" chapter in this documentation: https://www.solaredge.com/sites/default/files/sunspec-implementation-technical-note.pdf
+Refer to the "Modbus over TCP Configuration" chapter in this documentation: <https://www.solaredge.com/sites/default/files/sunspec-implementation-technical-note.pdf>
 
 Modbus connection is limited to a single client at a time, so make sure no other clients are using the port.
diff --git a/bundles/org.openhab.binding.modbus/DEVELOPERS.md b/bundles/org.openhab.binding.modbus/DEVELOPERS.md
index c9ae2bdfeb50e..24a005952f305 100644
--- a/bundles/org.openhab.binding.modbus/DEVELOPERS.md
+++ b/bundles/org.openhab.binding.modbus/DEVELOPERS.md
@@ -2,7 +2,7 @@
 
 ## Debugging an addon
 
-Please follow IDE setup guide at https://www.openhab.org/docs/developer/ide/eclipse.html.
+Please follow IDE setup guide at <https://www.openhab.org/docs/developer/ide/eclipse.html>.
 
 When configuring dependencies in `openhab-distro/launch/app/pom.xml`, add all dependencies, including the transitive dependencies:
 
@@ -32,17 +32,17 @@ When configuring dependencies in `openhab-distro/launch/app/pom.xml`, add all de
 You can use test serial slaves without any hardware on Linux using these steps:
 
 1. Set-up virtual null modem emulator using [tty0tty](https://github.com/freemed/tty0tty)
-2. Download [diagslave](https://www.modbusdriver.com/diagslave.html) and start modbus serial slave up using this command:
+1. Download [diagslave](https://www.modbusdriver.com/diagslave.html) and start modbus serial slave up using this command:
 
-```
+```shell
 ./diagslave -m rtu -a 1 -b 38400 -d 8 -s 1 -p none -4 10 /dev/pts/7
 ```
 
-3. Configure openHAB's modbus slave to connect to `/dev/pts/8`.
+1. Configure openHAB's modbus slave to connect to `/dev/pts/8`.
 
-4. Modify `start.sh` or `start_debug.sh` to include the unconventional port name by adding the following argument to `java`:
+1. Modify `start.sh` or `start_debug.sh` to include the unconventional port name by adding the following argument to `java`:
 
-```
+```text
 -Dgnu.io.rxtx.SerialPorts=/dev/pts/8
 ```
 
@@ -52,12 +52,11 @@ Naturally this is not the same thing as the real thing but helps to identify sim
 
 1. Download [diagslave](https://www.modbusdriver.com/diagslave.html) and start modbus tcp server (slave) using this command:
 
-```
-./diagslave -m tcp -a 1 -p 55502
-```
-
-2. Configure openHAB's modbus slave to connect to `127.0.0.1:55502`.
+    ```shell
+    ./diagslave -m tcp -a 1 -p 55502
+    ```
 
+1. Configure openHAB's modbus slave to connect to `127.0.0.1:55502`.
 
 ## Writing Data
 
@@ -65,8 +64,7 @@ See this [community post](https://community.openhab.org/t/something-is-rounding-
 
 You can also use `modpoll` to write data:
 
-
-```bash
+```shell
 # write value=5 to holding register 40001 (index=0 in the binding)
 ./modpoll -m tcp -a 1 -r 1 -t4 -p 502 127.0.0.1 5
 # set coil 00001 (index=0 in the binding) to TRUE
@@ -153,14 +151,14 @@ public class SunspecDiscoveryParticipant implements ModbusDiscoveryParticipant {
 
 There are two methods you have to implement:
 
- - `getSupportedThingTypeUIDs` should return a list of the thing type UIDs that are supported by this discovery participant. This is fairly straightforward.
- 
- - `startDiscovery` method will be called when a discovery process has began. This method receives two parameters:
- 
-    - `ModbusEndpointThingHandler` is the endpoint's handler that should be tested if it is known by your bundle. You can start your read requests against this handler.
-    
-    - `ModbusDiscoveryListener` this listener instance should be used to report any known devices found and to notify the main discovery process when your binding has finished the discovery.
-    
+- `getSupportedThingTypeUIDs` should return a list of the thing type UIDs that are supported by this discovery participant. This is fairly straightforward.
+
+- `startDiscovery` method will be called when a discovery process has began. This method receives two parameters:
+
+  - `ModbusEndpointThingHandler` is the endpoint's handler that should be tested if it is known by your bundle. You can start your read requests against this handler.
+
+  - `ModbusDiscoveryListener` this listener instance should be used to report any known devices found and to notify the main discovery process when your binding has finished the discovery.
+
 Please try to avoid write requests to the endpoint because it could be some unknown device that write requests could misconfigure.
 
 When a known device is found a `DiscoveryResult` object has to be created then the `thingDiscovered` method has to be called.
@@ -170,7 +168,6 @@ For example you could store the start Modbus address of the device or vendor/mod
 When the discovery process is finished either by detecting a device or by realizing it is not supported you should call the `discoveryFinished` method.
 This will tear down any resources allocated for the discovery process.
 
-
 ### Discovery Architecture
 
 The following diagram shows the concept how discovery is implemented in this binding. (Note that some intermediate classes and interfaces are not shown for clarity.)
diff --git a/bundles/org.openhab.binding.modbus/README.md b/bundles/org.openhab.binding.modbus/README.md
index 7cbc606efb3e5..baa468c2f8369 100644
--- a/bundles/org.openhab.binding.modbus/README.md
+++ b/bundles/org.openhab.binding.modbus/README.md
@@ -6,8 +6,8 @@ Modbus TCP slaves are usually also called as Modbus TCP servers.
 
 The binding can act as
 
-* Modbus TCP Client (that is, as modbus master), querying data from Modbus TCP servers (that is, modbus slaves)
-* Modbus serial master, querying data from modbus serial slaves
+- Modbus TCP Client (that is, as modbus master), querying data from Modbus TCP servers (that is, modbus slaves)
+- Modbus serial master, querying data from modbus serial slaves
 
 The Modbus binding polls the slave data with a configurable poll period.
 openHAB commands are translated to write requests.
@@ -23,37 +23,34 @@ The rest of this page contains details for configuring this binding:
 - TOC
 {:toc}
 
-
-
 ## Main Features
 
-The binding polls (or *reads*) Modbus data using function codes (FC) FC01 (Read coils), FC02 (Read discrete inputs), FC03 (Read multiple holding registers) or FC04 (Read input registers).
+The binding polls (or _reads_) Modbus data using function codes (FC) FC01 (Read coils), FC02 (Read discrete inputs), FC03 (Read multiple holding registers) or FC04 (Read input registers).
 This polled data is converted to data suitable for use in openHAB.
 Functionality exists to interpret typical number formats (e.g. single precision float).
 
-The binding can also *write* data to Modbus slaves using FC05 (Write single coil), FC06 (Write single holding register), FC15 (Write multiple coils) or FC16 (Write multiple holding registers).
+The binding can also _write_ data to Modbus slaves using FC05 (Write single coil), FC06 (Write single holding register), FC15 (Write multiple coils) or FC16 (Write multiple holding registers).
 
 ## Caveats And Limitations
 
 Please note the following caveats or limitations
 
-* The binding does *not* act as Modbus slave (e.g. as Modbus TCP server).
-* The binding *does* support Modbus RTU over Modbus TCP, (also known as "Modbus over TCP/IP" or "Modbus over TCP" or "Modbus RTU/IP"), as well as normal "Modbus TCP".
-
+- The binding does _not_ act as Modbus slave (e.g. as Modbus TCP server).
+- The binding _does_ support Modbus RTU over Modbus TCP, (also known as "Modbus over TCP/IP" or "Modbus over TCP" or "Modbus RTU/IP"), as well as normal "Modbus TCP".
 
 ## Background Material
 
 Reader of the documentation should understand the basics of Modbus protocol.
 Good sources for further information:
 
-* [Wikipedia article](https://en.wikipedia.org/wiki/Modbus): good read on modbus basics and addressing.
-* [Simplymodbus.ca](https://www.simplymodbus.ca/): good reference as well as excellent tutorial like explanation of the protocol
+- [Wikipedia article](https://en.wikipedia.org/wiki/Modbus): good read on modbus basics and addressing.
+- [Simplymodbus.ca](https://www.simplymodbus.ca/): good reference as well as excellent tutorial like explanation of the protocol
 
 Useful tools
 
-* [binaryconvert.com](https://www.binaryconvert.com/): tool to convert numbers between different binary presentations
-* [rapidscada.net Modbus parser](https://modbus.rapidscada.net/): tool to parse Modbus requests and responses. Useful for debugging purposes when you want to understand the message sent / received.
-* [JSFiddle tool](https://jsfiddle.net/rgypuuxq/) to test JavaScript (JS) transformations interactively
+- [binaryconvert.com](https://www.binaryconvert.com/): tool to convert numbers between different binary presentations
+- [rapidscada.net Modbus parser](https://modbus.rapidscada.net/): tool to parse Modbus requests and responses. Useful for debugging purposes when you want to understand the message sent / received.
+- [JSFiddle tool](https://jsfiddle.net/rgypuuxq/) to test JavaScript (JS) transformations interactively
 
 ## Supported Things
 
@@ -93,13 +90,13 @@ Note that parameter type is very critical when writing `.things` file yourself,
 
 Some examples:
 
-* `parameter="value"` for `text` parameters
-* `parameter=4` for `integer`
-* `parameter=true` for `boolean`
+- `parameter="value"` for `text` parameters
+- `parameter=4` for `integer`
+- `parameter=true` for `boolean`
 
 Note the differences with quoting.
 
-Required parameters *must* be specified in the `.things` file.
+Required parameters _must_ be specified in the `.things` file.
 When optional parameters are not specified, they default to the values shown in the table below.
 
 ### `tcp` Thing
@@ -218,14 +215,14 @@ You must give each of your data Things a reference (thing ID) that is unique for
 Only the `data` thing has channels.
 It has several "data channels", serving the polled data in different formats, and for accepting openHAB commands from different item types.
 
-Please note that transformations might be *necessary* in order to update some data channels, or to convert some openHAB commands to suitable Modbus data.
+Please note that transformations might be _necessary_ in order to update some data channels, or to convert some openHAB commands to suitable Modbus data.
 See [Transformations](#transformations) for more details.
 
 | Channel Type ID | Item Type       | Description                         |
 | --------------- | --------------- | ----------------------------------- |
 | `number`        | `Number`        | Data as number                      |
 | `switch`        | `Switch`        | Data as switch (`ON` / `OFF`)       |
-| `contact`       | `Contact `      | Data as contact (`OPEN` / `CLOSED`) |
+| `contact`       | `Contact`       | Data as contact (`OPEN` / `CLOSED`) |
 | `dimmer`        | `Dimmer`        | Data as dimmer                      |
 | `datetime`      | `DateTime`      | Data as a date time                 |
 | `string`        | `String`        | Data as string                      |
@@ -249,7 +246,7 @@ Items are configured the typical way, using `channel` to bind the item to a part
 
 For example, in the following example, item `Temperature_Modbus_Livingroom` is bound to channel `number` of thing `modbus:data:siemensplc:holding:livingroom_temperature`.
 
-```bash
+```java
 Number  Temperature_Modbus_Livingroom                       "Temperature Living room [%.1f °C]"           <temperature>   { channel="modbus:data:siemensplc:holding:livingroom_temperature:number" }
 ```
 
@@ -273,7 +270,6 @@ Typically, you see something like this
 
 Let's go through it step by step
 
-
 ```java
 // openHAB UI switch changed command is sent
 1 [ome.event.ItemCommandEvent] - Item 'Kitchen_Bar_Table_Light' received command ON
@@ -301,12 +297,13 @@ With `autoupdate` disabled, one would get
 Item state has no "fluctuation", it updates from `OFF` to `ON`.
 
 To summarize (credits to [rossko57's community post](https://community.openhab.org/t/rule-to-postupdate-an-item-works-but-item-falls-back-after-some-seconds/19986/2?u=ssalonen)):
-* `autoupdate="false"`: monitor the _actual_ state of device
-* `autoupdate="true"`: (or defaulted) allows faster display of the _expected_ state in a sitemap
+
+- `autoupdate="false"`: monitor the _actual_ state of device
+- `autoupdate="true"`: (or defaulted) allows faster display of the _expected_ state in a sitemap
 
 You can disable `autoupdate` as follows:
 
-```bash
+```java
 Number  Temperature_Modbus_Livingroom                       "Temperature Living room [%.1f °C]"           <temperature>   { channel="modbus:data:siemensplc:holding:livingroom_temperature:number", autoupdate="false" }
 ```
 
@@ -327,6 +324,7 @@ When reading from Modbus, the result will be `updateTowardsItem = (raw_value_fro
 When applying command, the calculation goes in reverse.
 
 See examples for concrete use case with value scaling.
+
 ### Discovery
 
 Device specific modbus bindings can take part in the discovery of things, and detect devices automatically. The discovery is initiated by the `tcp` and `serial` bridges when they have `enableDiscovery` setting enabled.
@@ -340,11 +338,11 @@ Note that the main binding does not recognize any devices, so it is pointless to
 [Modbus Wikipedia article](https://en.wikipedia.org/wiki/Modbus#Coil.2C_discrete_input.2C_input_register.2C_holding_register_numbers_and_addresses) summarizes this excellently:
 
 > In the traditional standard, [entity] numbers for those entities start with a digit, followed by a number of four digits in range 1–9,999:
-
-> * coils numbers start with a zero and then span from 00001 to 09999
-> * discrete input numbers start with a one and then span from 10001 to 19999
-> * input register numbers start with a three and then span from 30001 to 39999
-> * holding register numbers start with a four and then span from 40001 to 49999
+>
+> - coils numbers start with a zero and then span from 00001 to 09999
+> - discrete input numbers start with a one and then span from 10001 to 19999
+> - input register numbers start with a three and then span from 30001 to 39999
+> - holding register numbers start with a four and then span from 40001 to 49999
 >
 > This translates into [entity] addresses between 0 and 9,998 in data frames.
 
@@ -424,7 +422,6 @@ To resolve this the binding supports a second set of valuetypes that have the wo
 
 If you get strange values using the `int32`, `uint32`, `float32`, `int64`, or `uint64` valuetypes then just try the `int32_swap`, `uint32_swap`, `float32_swap`, `int64_swap`, or `uint64_swap` valuetype, depending upon what your data type is.
 
-
 #### `int32_swap`:
 
 - registers `index` and `(index + 1)` are interpreted as signed 32bit integer
@@ -490,16 +487,16 @@ Command must be such that it is accepted by the item in the first place
 1. Command is converted to string (e.g. `"3.14"`) and passed to the transformation.
 Note that in case `readTransform="default"`, a default transformation provided by the binding is used.
   See [Transformations](#transformations) section for more details.
-3. We try to convert transformation output to number (`DecimalType`), `OPEN`/`CLOSED` (`OpenClosedType`), and `ON`/`OFF` (`OnOffType`); in this order.
+1. We try to convert transformation output to number (`DecimalType`), `OPEN`/`CLOSED` (`OpenClosedType`), and `ON`/`OFF` (`OnOffType`); in this order.
   First successful conversion is stored.
   For example, `"3.14"` would convert to number (`DecimalType`), while `"CLOSED"` would convert to `CLOSED` (of `OpenClosedType`).'
 In case all conversions fail, the command is discarded and nothing is written to the Modbus slave.
-5. Next step depends on the `writeType`:
-   * `writeType="coil"`: the command from the transformation is converted to boolean.
+1. Next step depends on the `writeType`:
+   - `writeType="coil"`: the command from the transformation is converted to boolean.
      Non-zero numbers, `ON`, and `OPEN` are considered `true`; and rest as `false`.
-   * `writeType="holding"`: First, the command from the transformation is converted `1`/`0` number in case of `OPEN`/`ON` or `CLOSED`/`OFF`. The number is converted to one or more registers using `writeValueType`.
+   - `writeType="holding"`: First, the command from the transformation is converted `1`/`0` number in case of `OPEN`/`ON` or `CLOSED`/`OFF`. The number is converted to one or more registers using `writeValueType`.
    For example, number `3.14` would be converted to two registers when `writeValueType="float32"`: [0x4048, 0xF5C3].
-6. Boolean (`writeType="coil"`) or registers (`writeType="holding"`) are written to the Modbus slave using `FC05`, `FC06`, `FC15`, or `FC16`, depending on the value of `writeMultipleEvenWithSingleRegisterOrCoil`.
+1. Boolean (`writeType="coil"`) or registers (`writeType="holding"`) are written to the Modbus slave using `FC05`, `FC06`, `FC15`, or `FC16`, depending on the value of `writeMultipleEvenWithSingleRegisterOrCoil`.
   Write address is specified by `writeStart`.
 
 #### Advanced Write Using JSON
@@ -530,7 +527,7 @@ For example, if the transformation returns the following JSON
 Two write requests would be sent to the Modbus slave
 
 1. FC16 (write multiple holding register), with start address 5412, having three registers of data (1, 0, and 5).
-2. FC06 (write single holding register), with start address 555, and single register of data (3).
+1. FC06 (write single holding register), with start address 555, and single register of data (3).
   Write is tried maximum of 10 times in case some of the writes fail.
 
 The JSON transformation output can be useful when you need full control how the write goes, for example in case where the write address depends on the incoming command.
@@ -551,8 +548,8 @@ Explanation for the different properties of the JSON object in the array.
 
 Transformations serve two purpose
 
-* `readTransform`: doing preprocessing transformations to read binary data and to make it more usable in openHAB
-* `writeTransform`: doing preprocessing to openHAB commands before writing them to Modbus slave
+- `readTransform`: doing preprocessing transformations to read binary data and to make it more usable in openHAB
+- `writeTransform`: doing preprocessing to openHAB commands before writing them to Modbus slave
 
 Note that transformation is only one part of the overall process how polled data is converted to openHAB state, or how commands are converted to Modbus writes.
 Consult [Read steps](#read-steps) and [Write steps](#write-steps) for more details.
@@ -582,6 +579,7 @@ There are three different format to specify the configuration:
 1. String `"default"`, in which case the default transformation is used. The default is to do no conversion to the command.
 1. `"SERVICENAME:ARG"` for calling a transformation service. The transformation receives the command as input. This is useful for applying complex arithmetic for commands before the data is written to Modbus. See examples for more details.
 1. Any other value is interpreted as static text, in which case the actual command is ignored. Transformation result is always the same.
+
 #### Example: Inverting Binary Data On Read And Write
 
 This example transformation is able to invert "boolean" input.
@@ -613,7 +611,7 @@ Please refer to the comments for more explanations.
 
 `things/modbus_ex1.things`:
 
-```
+```java
 Bridge modbus:tcp:localhostTCP [ host="127.0.0.1", port=502, id=2 ] {
 
     // read-write for coils. Reading 4 coils, with index 4, and 5.
@@ -661,7 +659,7 @@ Bridge modbus:tcp:localhostTCP [ host="127.0.0.1", port=502, id=2 ] {
 
 `items/modbus_ex1.items`:
 
-```
+```java
 Switch DO4            "Digital Output index 4 [%d]"    { channel="modbus:data:localhostTCP:coils:do4:switch" }
 Switch DO5            "Digital Output index 5 [%d]"    { channel="modbus:data:localhostTCP:coils:do5:switch" }
 
@@ -679,7 +677,7 @@ Number Holding5writeonly            "Holding index 5 [%.1f]"    { channel="modbu
 
 `sitemaps/modbus_ex1.sitemap`:
 
-```
+```perl
 sitemap modbus_ex1 label="modbus_ex1"
 {
     Frame {
@@ -711,7 +709,7 @@ Toggling these switches always have the same effect: either setting or resetting
 
 `things/modbus_ex2.things`:
 
-```
+```java
 Bridge modbus:tcp:localhostTCPex2 [ host="127.0.0.1", port=502 ] {
 
     Bridge poller items [ start=4, length=2, refresh=1000, type="discrete" ] {
@@ -729,7 +727,7 @@ Bridge modbus:tcp:localhostTCPex2 [ host="127.0.0.1", port=502 ] {
 
 `items/modbus_ex2.items`:
 
-```
+```java
 Switch ReadDI4WriteDO5            "Coil 4/5 mix [%d]"    { channel="modbus:data:localhostTCPex2:items:readDiscrete4WriteCoil5:switch" }
 Switch ResetDO5            "Flip to turn Coil 5 OFF [%d]"    { channel="modbus:data:localhostTCPex2:items:resetCoil5:switch" }
 Switch SetDO5            "Flip to turn Coil 5 ON [%d]"    { channel="modbus:data:localhostTCPex2:items:setCoil5:switch" }
@@ -739,7 +737,7 @@ Contact Coil5            "Coil 5 [%d]"    { channel="modbus:data:localhostTCPex2
 
 `sitemaps/modbus_ex2.sitemap`:
 
-```
+```perl
 sitemap modbus_ex2 label="modbus_ex2"
 {
     Frame {
@@ -766,7 +764,7 @@ The profile also works the other way round, scaling the commands sent to the ite
 
 `things/modbus_ex_scaling.things`:
 
-```
+```java
 Bridge modbus:tcp:localhostTCP3 [ host="127.0.0.1", port=502 ] {
     Bridge poller holdingPoller [ start=5, length=1, refresh=5000, type="holding" ] {
         Thing data temperatureDeciCelsius [ readStart="5", readValueType="int16", writeStart="5", writeValueType="int16", writeType="holding" ]
@@ -776,13 +774,13 @@ Bridge modbus:tcp:localhostTCP3 [ host="127.0.0.1", port=502 ] {
 
 `items/modbus_ex_scaling.items`:
 
-```
+```java
 Number:Temperature TemperatureItem            "Temperature [%.1f °C]"   { channel="modbus:data:localhostTCP3:holdingPoller:temperatureDeciCelsius:number"[ profile="modbus:gainOffset", gain="0.1 °C", pre-gain-offset="0" ] }
 ```
 
 `sitemaps/modbus_ex_scaling.sitemap`:
 
-```
+```perl
 sitemap modbus_ex_scaling label="modbus_ex_scaling"
 {
     Frame {
@@ -792,7 +790,6 @@ sitemap modbus_ex_scaling label="modbus_ex_scaling"
 }
 ```
 
-
 ### Commanding Individual Bits
 
 In Modbus, holding registers represent 16 bits of data. The protocol allow to write the whole register at once.
@@ -803,7 +800,7 @@ In order to use this feature, one specifies `writeStart="X.Y"` (register `X`, bi
 
 `things/modbus_ex_command_bit.things`:
 
-```
+```java
 Bridge modbus:tcp:localhostTCP3 [ host="127.0.0.1", port=502 ] {
     Bridge poller holdingPoller [ start=5, length=1, refresh=5000, type="holding" ] {
         Thing data register5 [ readStart="5.1", readValueType="bit", writeStart="5.1", writeValueType="bit", writeType="holding" ]
@@ -814,14 +811,14 @@ Bridge modbus:tcp:localhostTCP3 [ host="127.0.0.1", port=502 ] {
 
 `items/modbus_ex_command_bit.items`:
 
-```
+```java
 Switch SecondLeastSignificantBit            "2nd least significant bit write switch [%d]"   { channel="modbus:data:localhostTCP3:holdingPoller:register5:switch" }
 Number SecondLeastSignificantBitAltRead            "2nd least significant bit is now [%d]"   { channel="modbus:data:localhostTCP3:holdingPoller:register5Bit1:number" }
 ```
 
 `sitemaps/modbus_ex_command_bit.sitemap`:
 
-```
+```perl
 sitemap modbus_ex_command_bit label="modbus_ex_command_bit"
 {
     Frame {
@@ -841,22 +838,23 @@ Example for a dimmer device where 255 register value = 100% for fully ON:
 
 `things/modbus_ex_dimmer.things`:
 
-```
+```java
 Bridge modbus:tcp:remoteTCP [ host="192.168.0.10", port=502 ]  {
    Bridge poller MBDimmer [ start=4700, length=2, refresh=1000, type="holding" ]  {
-	         Thing data DimmerReg [ readStart="4700", readValueType="uint16", readTransform="JS:dimread255.js", writeStart="4700", writeValueType="uint16", writeType="holding", writeTransform="JS:dimwrite255.js" ]
+          Thing data DimmerReg [ readStart="4700", readValueType="uint16", readTransform="JS:dimread255.js", writeStart="4700", writeValueType="uint16", writeType="holding", writeTransform="JS:dimwrite255.js" ]
    }
 }
 ```
 
 `items/modbus_ex_dimmer.items`:
-```
+
+```java
 Dimmer myDimmer "My Dimmer d2 [%.1f]"   { channel="modbus:data:remoteTCP:MBDimmer:DimmerReg:dimmer" }
 ```
 
 `sitemaps/modbus_ex_dimmer.sitemap`:
 
-```
+```perl
 sitemap modbus_ex_dimmer label="modbus_ex_dimmer"
 {
     Frame {
@@ -867,6 +865,7 @@ sitemap modbus_ex_dimmer label="modbus_ex_dimmer"
 ```
 
 `transform/dimread255.js`:
+
 ```javascript
 // Wrap everything in a function (no global variable pollution)
 // variable "input" contains data string passed by binding
@@ -879,6 +878,7 @@ sitemap modbus_ex_dimmer label="modbus_ex_dimmer"
 ```
 
 `transform/dimwrite255.js`:
+
 ```javascript
 // variable "input" contains command string passed by openHAB
 (function(inputData) {
@@ -898,7 +898,6 @@ sitemap modbus_ex_dimmer label="modbus_ex_dimmer"
 })(input)
 ```
 
-
 ### Rollershutter Example
 
 #### Rollershutter
@@ -916,10 +915,9 @@ The logic of processing commands are summarized in the table
 | `MOVE`  | `1`                            | 2              |
 | `STOP`  | `0`                            | 2              |
 
-
 `things/modbus_ex_rollershutter.things`:
 
-```
+```java
 Bridge modbus:tcp:localhostTCPRollerShutter [ host="127.0.0.1", port=502 ] {
     Bridge poller holding [ start=0, length=3, refresh=1000, type="holding" ] {
         // Since we are using advanced transformation outputting JSON,
@@ -936,7 +934,7 @@ Bridge modbus:tcp:localhostTCPRollerShutter [ host="127.0.0.1", port=502 ] {
 
 `items/modbus_ex_rollershutter.items`:
 
-```
+```java
 // We disable auto-update to make sure that rollershutter position is updated from the slave, not "automatically" via commands
 Rollershutter RollershutterItem "Roller shutter position [%.1f]" <temperature> { autoupdate="false", channel="modbus:data:localhostTCPRollerShutter:holding:rollershutterData:rollershutter" }
 
@@ -948,7 +946,7 @@ Number RollershutterItemDebug2 "Roller shutter Debug 2 [%d]" <temperature> { cha
 
 `sitemaps/modbus_ex_rollershutter.sitemap`:
 
-```
+```perl
 sitemap modbus_ex_rollershutter label="modbus_ex_rollershutter" {
     Switch item=RollershutterItem label="Roller shutter [(%d)]" mappings=[UP="up", STOP="X", DOWN="down", MOVE="move"]
 
@@ -1031,15 +1029,15 @@ Please be aware that `REFRESH` commands are "throttled" (to be exact, responses
 Modbus, while simple at its heart, potentially is a complicated standard to use because there's a lot of freedom (and bugs) when it comes to implementations.
 There are many device or vendor specific quirks and wrinkles you might stumble across. Here's some:
 
-* With Modbus TCP devices, there may be multiple network interfaces available, e.g. Wifi and wired Ethernet. However, with some devices the Modbus data is accessible via only one of the interfaces. You need to check the device manufacturer manual, or simply try out which of the IPs are returning valid modbus data.
+- With Modbus TCP devices, there may be multiple network interfaces available, e.g. Wifi and wired Ethernet. However, with some devices the Modbus data is accessible via only one of the interfaces. You need to check the device manufacturer manual, or simply try out which of the IPs are returning valid modbus data.
 Attention: a device may have an interface with a port open (502 or other) that it responds to Modbus requests on, but that may have no connection to the real bus hardware, resulting in generic Modbus error responses to _every_ request.
 So check ALL interfaces. Usually either the IP on Ethernet will do.
 
-* some devices do not allow to query a range of registers that is too large or spans reserved registers. Do not poll more than 123 registers.
+- some devices do not allow to query a range of registers that is too large or spans reserved registers. Do not poll more than 123 registers.
 Devices may respond with an error or no error but invalid register data so this error can easily go undedetected.
 Turn your poller thing into multiple things to cover smaller ranges to work around this problem.
 
-* there's potentially many more or less weird inconsistencies with some devices.
+- there's potentially many more or less weird inconsistencies with some devices.
 If you fail to read a register or you only ever get invalid values (such as 00 or FF bytes), try with various poller lengths such as the exact length of a register in question or twice the amount.
 In extreme cases you might even need more than a poller for a single register so you have two or more poller with two or more data things and need to combine these into another item using a rule.
 
@@ -1056,8 +1054,8 @@ The major differences in configuration logic are:
 
 ### Absolute Addresses Instead Of Relative
 
-The new Modbus binding uses *absolute* addresses.
-This means that all parameters referring to addresses of input registers, holding registers, discrete inputs or coils are *entity addresses*.
+The new Modbus binding uses _absolute_ addresses.
+This means that all parameters referring to addresses of input registers, holding registers, discrete inputs or coils are _entity addresses_.
 This means that the addresses start from zero (first entity), and can go up to 65 535. See [Wikipedia explanation](https://en.wikipedia.org/wiki/Modbus#Coil.2C_discrete_input.2C_input_register.2C_holding_register_numbers_and_addresses) for more information.
 
 Previous binding sometimes used absolute addresses (`modbus.cfg`), sometimes relative to polled data (items configuration).
@@ -1105,7 +1103,7 @@ The 1.x modbus configuration to be updated defined 4 slaves:
 
 `modbus.cfg`
 
-```
+```text
     poll=500
 
     tcp.slave1.connection=192.168.2.9:502
@@ -1140,11 +1138,12 @@ The 2.x modbus binding uses a three-level definition.
 Level one defines a `Bridge` for every modbus device that is to be addressed.
 The 1.x configuration in this example only addresses one device, so there will be one top level bridge.
 
-```
+```java
 Bridge modbus:tcp:wago [ host="192.168.2.9", port=502 ] {
 
 }
 ```
+
 Host and Port are taken from the 1.x modbus config.
 
 Within the top level `Bridge` there are one or more second level bridges that replace the former `slave` configurations.
@@ -1152,7 +1151,7 @@ The poll frequency can now be set per `poller`, so you may want to define differ
 The slave `Bridge` configs go inside the top level config.
 For the four `poller`s defined in this example the 2.x configuration looks like this:
 
-```
+```java
 Bridge modbus:tcp:wago [ host="192.168.2.9", port=502, id=1 ] {
 
     Bridge poller wago_slave1 [ start=12288, length=128, refresh=500, type="coil" ] {
@@ -1181,7 +1180,7 @@ Here a few examples of the Item configuration from the 1.x binding:
 
 The first Item polled with the first `poller` used this configuration (with offset 0):
 
-```
+```java
 Switch FooSwitch  "Foo Switch"  {modbus="slave1:0"}
 ```
 
@@ -1190,19 +1189,19 @@ Now we have to define a `Thing` that can later be bound to that Item.
 The `slave1` `poller` uses `12288` as start address.
 So we define the first data Thing within the `poller` `wago_slave1` with this address and choose a name that ends with `0`:
 
-```
+```java
 Thing data wago_s1_000 [ readStart="12288", readValueType="bit", writeStart="12288", writeValueType="bit", writeType="coil" ]
 ```
 
 The second Item of the 1.x binding (offset `1`) is defined as follows.
 
-```
+```java
 Switch BarSwitch  "Bar Switch" {modbus="slave1:1"}
 ```
 
 This leads to the thing definition
 
-```
+```java
 Thing data wago_s1_001 [ readStart="12289", readValueType="bit", writeStart="12289", writeValueType="bit", writeType="coil" ]
 ```
 
@@ -1212,7 +1211,7 @@ Incorporating this definitions into the thing file leads to:
 
 `wago.things`:
 
-```
+```java
 Bridge modbus:tcp:wago [ host="192.168.2.9", port=502, id=1 ] {
 
     Bridge poller wago_slave1 [ start=12288, length=128, refresh=500, type="coil" ] {
@@ -1238,14 +1237,14 @@ Given that there are no config errors, they quickly change from `INITIALIZING` t
 Finally the Item definition has to be changed to refer to the new created `data` `Thing`.
 You can copy the names you need for this directly from the `events.log` file:
 
-```
+```java
 Switch FooSwitch  "Foo Switch" {modbus="slave1:0"}
 Switch BarSwitch  "Bar Switch" {modbus="slave1:1"}
 ```
 
 turn into
 
-```
+```java
 Switch FooSwitch  "Foo Switch" {channel="modbus:data:wago:wago_slave1:wago_s1_000:switch", autopudate="false"}
 Switch BarSwitch  "Bar Switch" {channel="modbus:data:wago:wago_slave1:wago_s1_001:switch", autoupdate="false"}
 ```
@@ -1283,7 +1282,7 @@ Continue to add `data` `Thing`s for all your other Items the same way and link t
 
 Save your updated item file and check whether updates come in as expected.
 
-## Troubleshooting
+## Troubleshooting Tips
 
 ### Thing Status
 
@@ -1293,9 +1292,9 @@ Check thing status for errors in configuration or communication.
 
 Enable `DEBUG` or `TRACE` (even more verbose) logging for the loggers named:
 
-* `org.openhab.binding.modbus`
-* `org.openhab.core.io.transport.modbus`
-* `net.wimpi.modbus`
+- `org.openhab.binding.modbus`
+- `org.openhab.core.io.transport.modbus`
+- `net.wimpi.modbus`
 
 Consult [openHAB logging documentation](https://www.openhab.org/docs/administration/logging.html#defining-what-to-log) for more information.
 
diff --git a/bundles/org.openhab.binding.monopriceaudio/README.md b/bundles/org.openhab.binding.monopriceaudio/README.md
index eb30ee1fd35f1..c8561f4bad778 100644
--- a/bundles/org.openhab.binding.monopriceaudio/README.md
+++ b/bundles/org.openhab.binding.monopriceaudio/README.md
@@ -7,8 +7,8 @@ Activating the 'Page All Zones' feature can only be done through the +12v trigge
 
 The binding supports two different kinds of connections:
 
-* serial connection,
-* serial over IP connection
+- serial connection,
+- serial over IP connection
 
 For users without a serial port on the server side, you can use a USB to serial adapter.
 
@@ -53,13 +53,13 @@ The thing has the following configuration parameters:
 
 Some notes:
 
-* On Linux, you may get an error stating the serial port cannot be opened when the MonopriceAudio binding tries to load.
-* You can get around this by adding the `openhab` user to the `dialout` group like this: `usermod -a -G dialout openhab`.
-* Also on Linux you may have issues with the USB if using two serial USB devices e.g. MonopriceAudio and RFXcom.
-* See the [general documentation about serial port configuration](/docs/administration/serial.html) for more on symlinking the USB ports.
-* Here is an example of ser2net.conf you can use to share your serial port /dev/ttyUSB0 on IP port 8080 using [ser2net Linux tool](https://sourceforge.net/projects/ser2net/):
+- On Linux, you may get an error stating the serial port cannot be opened when the MonopriceAudio binding tries to load.
+- You can get around this by adding the `openhab` user to the `dialout` group like this: `usermod -a -G dialout openhab`.
+- Also on Linux you may have issues with the USB if using two serial USB devices e.g. MonopriceAudio and RFXcom.
+- See the [general documentation about serial port configuration](/docs/administration/serial.html) for more on symlinking the USB ports.
+- Here is an example of ser2net.conf you can use to share your serial port /dev/ttyUSB0 on IP port 8080 using [ser2net Linux tool](https://sourceforge.net/projects/ser2net/):
 
-```
+```text
 8080:raw:0:/dev/ttyUSB0:9600 8DATABITS NONE 1STOPBIT LOCAL
 ```
 
@@ -88,7 +88,7 @@ The following channels are available:
 
 monoprice.things:
 
-```
+```java
 // serial port connection
 monopriceaudio:amplifier:myamp "Monoprice WHA" [ serialPort="COM5", pollingInterval=15, numZones=6, inputLabel1="Chromecast", inputLabel2="Radio", inputLabel3="CD Player", inputLabel4="Bluetooth Audio", inputLabel5="HTPC", inputLabel6="Phono"]
 
@@ -99,7 +99,7 @@ monopriceaudio:amplifier:myamp "Monoprice WHA" [ host="192.168.0.10", port=8080,
 
 monoprice.items:
 
-```
+```java
 Switch all_allpower "All Zones Power" { channel="monopriceaudio:amplifier:myamp:all#allpower" }
 Number all_source "Source Input [%s]" { channel="monopriceaudio:amplifier:myamp:all#allsource" }
 Dimmer all_volume "Volume [%d %%]" { channel="monopriceaudio:amplifier:myamp:all#allvolume" }
@@ -121,7 +121,7 @@ Switch z1_keypad "Keypad Connected: [%s]" { channel="monopriceaudio:amplifier:my
 
 monoprice.sitemap:
 
-```
+```perl
 sitemap monoprice label="Audio Control" {
     Frame label="All Zones" {
         Switch item=all_allpower label="All Zones On" mappings=[ON=" "]
diff --git a/bundles/org.openhab.binding.mpd/README.md b/bundles/org.openhab.binding.mpd/README.md
index 10236a4de1d0a..7264fe186c353 100644
--- a/bundles/org.openhab.binding.mpd/README.md
+++ b/bundles/org.openhab.binding.mpd/README.md
@@ -4,7 +4,6 @@
 
 With the openHAB MPD binding you can control Music Player Daemons.
 
-
 ## Supported Things
 
 This binding supports one ThingType: mpd
@@ -13,7 +12,6 @@ This binding supports one ThingType: mpd
 
 If zeroconf is enabled in the Music Player Daemon, it is discovered. Each Music Player daemon requires a unique zeroconf_name for correct discovery.
 
-
 ## Thing Configuration
 
 The ThingType mpd requires the following configuration parameters:
@@ -24,7 +22,6 @@ The ThingType mpd requires the following configuration parameters:
 | Port            | port         | Port number on which the Music Player Daemon is listening. Default: 6600 | yes      |
 | Password        | password     | Password to access the Music Player Daemon                               | no       |
 
-
 ## Channels
 
 The following channels are currently available:
@@ -42,18 +39,17 @@ The following channels are currently available:
 | currenttitle    | String    | Current title             |
 | currenttrack    | Number    | Current track             |
 
-
 ## Full Example
 
-#### Thing
+### Thing
 
-```
+```java
 mpd:mpd:music  [ ipAddress="192.168.1.2", port=6600 ]
 ```
 
-#### Items
+### Items
 
-```
+```java
 Switch morning_music "Morning music"
 
 Player mpd_music_player "Player" { channel = "mpd:mpd:music:control" }
@@ -68,9 +64,9 @@ String mpd_music_title "Title [%s]" { channel = "mpd:mpd:music:currenttitle" }
 Number mpd_music_track "Track [%d]" { channel = "mpd:mpd:music:currenttrack" }
 ```
 
-#### Sitemap
+### Sitemap
 
-```
+```perl
 Frame label="Music" {
     Default item=mpd_music_player
     Slider item=mpd_music_volume
@@ -85,9 +81,9 @@ Frame label="Music" {
 }
 ```
 
-#### Rule
+### Rule
 
-```
+```java
 rule "turn on morning music"
 when
         Item morning_music changed to ON
diff --git a/bundles/org.openhab.binding.mqtt.espmilighthub/README.md b/bundles/org.openhab.binding.mqtt.espmilighthub/README.md
index 7de8c6c8b676e..0ced3f94524f1 100644
--- a/bundles/org.openhab.binding.mqtt.espmilighthub/README.md
+++ b/bundles/org.openhab.binding.mqtt.espmilighthub/README.md
@@ -6,9 +6,9 @@ They can be very easy to build with no soldering needed.
 
 Advantages to using this DIY bridge over the OEM bridge:
 
-+ Almost unlimited groups to give individual control over an entire house of Milight globes without needing multiple bridges.
-+ If using the Milight remotes to control the globes, this binding can update the openHAB controls the moment a key is pressed on the physical remotes.
-+ Supports auto discovery.
+- Almost unlimited groups to give individual control over an entire house of Milight globes without needing multiple bridges.
+- If using the Milight remotes to control the globes, this binding can update the openHAB controls the moment a key is pressed on the physical remotes.
+- Supports auto discovery.
 
 ## Setup the hardware
 
@@ -16,16 +16,16 @@ In depth details on how to build and what the bridge is can be found here: <http
 
 A quick overview of the steps to get the hardware going are:
 
-+ Connect a nodemcu/D1 mini/esp8266 to your computer via a USB cable.
-+ Download the latest BIN file from here <https://github.com/sidoh/esp8266_milight_hub/releases>
-+ Download esp8266flasher if you are on windows <https://github.com/nodemcu/nodemcu-flasher>
-+ Check the blog above on more info for Mac or Linux.
-+ Open the flasher tool and make sure the flash size is 4mb or whatever your esp8266 board has.
-+ Flash the bin and press the reset button on the board when it completes.
-+ Connect to the wifi access point of the esp directly with your phone/tablet and setup wifi details.
-+ Login by using the IP address of the esp8266 in a web browser and the control panel will show up.
-+ Connect 7 wires between the two ready made PCBs as shown in the blog.
-+ Setup a MQTT broker as this method uses the faster and lightweight MQTT protocol and not UDP.
+- Connect a nodemcu/D1 mini/esp8266 to your computer via a USB cable.
+- Download the latest BIN file from here <https://github.com/sidoh/esp8266_milight_hub/releases>
+- Download esp8266flasher if you are on windows <https://github.com/nodemcu/nodemcu-flasher>
+- Check the blog above on more info for Mac or Linux.
+- Open the flasher tool and make sure the flash size is 4mb or whatever your esp8266 board has.
+- Flash the bin and press the reset button on the board when it completes.
+- Connect to the wifi access point of the esp directly with your phone/tablet and setup wifi details.
+- Login by using the IP address of the esp8266 in a web browser and the control panel will show up.
+- Connect 7 wires between the two ready made PCBs as shown in the blog.
+- Setup a MQTT broker as this method uses the faster and lightweight MQTT protocol and not UDP.
 
 ## Setup the Firmware
 
@@ -45,13 +45,13 @@ Leave this blank.
 **group_state_fields:**
 IMPORTANT: Make sure only the following are ticked:
 
-+ state
-+ level
-+ hue
-+ saturation
-+ mode
-+ color_temp
-+ bulb_mode
+- state
+- level
+- hue
+- saturation
+- mode
+- color_temp
+- bulb_mode
 
 Fill in the MQTT broker fields with the correct details so the hub can connect and then click **save**.
 Now when you use any Milight remote control, you will see MQTT topics being created that should include `level` and `hsb` in the messages.
@@ -59,7 +59,7 @@ If you see `brightness` and not `level`, then go back and follow the above setup
 
 You can use this Linux command to watch all MQTT topics from Milight:
 
-```
+```shell
 mosquitto_sub -u usernamehere -P passwordhere -p 1883 -v -t 'milight/#'
 ```
 
@@ -89,7 +89,7 @@ This binding should then detect the new device the moment the control is moved a
 
 To remove a saved state from your MQTT broker that causes an entry in your INBOX you can use this command or use the ignore feature of openHAB.
 
-```
+```shell
 mosquitto_pub -u username -P password -p 1883 -t 'milight/states/0x0/rgb_cct/1' -n -r
 ```
 
@@ -106,7 +106,7 @@ Note that the group 0 (or ALL group) is not auto discovered as a thing and thus
 | `oneTriggersNightMode` | Night mode is a much lower level of light and this feature allows it to be auto selected when your fader/slider moves to 1%. NOTE: Night mode by design locks out some controls of a physical remote, so this feature is disabled by default. | Y | false |
 | `powerFailsToMinimum` | If lights loose power from the power switch OR a power outage, they will default to using the lowest brightness if the light was turned off before the power failure occurred. | Y | true |
 | `whiteThreshold` | This feature allows you to use a color control to change to using the real white LEDs when the saturation is equal to, or below this threshold. -1 will disable this feature. | Y | 12 |
-| `duvThreshold` | This feature allows you to use a color control to change to using the real warm/cool white LEDs to set a white color temperature if the color is within a certain threshold of the block body curve. 1 will effectively disable this feature. The default settings maps well to Apple's HomeKit that will allow you to choose a color temperature, but sends it as an HSB value. See https://www.waveformlighting.com/tech/calculate-duv-from-cie-1931-xy-coordinates/ for more information. | Y | 0.003 |
+| `duvThreshold` | This feature allows you to use a color control to change to using the real warm/cool white LEDs to set a white color temperature if the color is within a certain threshold of the block body curve. 1 will effectively disable this feature. The default settings maps well to Apple's HomeKit that will allow you to choose a color temperature, but sends it as an HSB value. See <https://www.waveformlighting.com/tech/calculate-duv-from-cie-1931-xy-coordinates/> for more information. | Y | 0.003 |
 
 ## Channels
 
@@ -129,10 +129,10 @@ You can reduce the packet repeats to speed up the response of this binding and t
 Settings can be found on the radio tab in the esp control panel using your browser.
 Suggested settings are as follows:
 
-+ Packet repeats = 12 (if you only turn 1 globe on or off it uses this value)
-+ Packet repeat throttle threshold = 200
-+ Packet repeat throttle sensitivity = 0
-+ Packet repeat minimum = 8 (When turning multiple globes on and off it will use this value as it throttles the repeats back to reduce latency/delay between each globe)
+- Packet repeats = 12 (if you only turn 1 globe on or off it uses this value)
+- Packet repeat throttle threshold = 200
+- Packet repeat throttle sensitivity = 0
+- Packet repeat minimum = 8 (When turning multiple globes on and off it will use this value as it throttles the repeats back to reduce latency/delay between each globe)
 
 ## Important for Textual Configuration
 
@@ -178,14 +178,14 @@ The first line in the things file will create a `broker` thing and this can be r
 
 *.things
 
-```
+```java
 Bridge mqtt:broker:myBroker [ host="localhost", secure=false, password="*******", qos=1, username="user"]
 Thing mqtt:rgb_cct:myBroker:0xE6C4 "Hallway" (mqtt:broker:myBroker) @ "MQTT"
 ```
 
 *.items
 
-```
+```java
 Dimmer Hallway_Level "Front Hall" {channel="mqtt:rgb_cct:myBroker:0xE6C4:level"}
 Dimmer Hallway_ColourTemperature "White Color Temp" {channel="mqtt:rgb_cct:myBroker:0xE6C4:colourTemperature"}
 Color  Hallway_Colour "Front Hall" ["Lighting"] {channel="mqtt:rgb_cct:myBroker:0xE6C4:colour"}
@@ -197,15 +197,15 @@ String Hallway_BulbMode "Bulb Mode" {channel="mqtt:rgb_cct:myBroker:0xE6C4:bulbM
 
 *.sitemap
 
-```
-        Text label="Hallway" icon="light"
-        {
-            Switch      item=Hallway_Level
-            Slider      item=Hallway_Level
-            Slider      item=Hallway_ColourTemperature
-            Colorpicker item=Hallway_Colour
-            Selection   item=Hallway_DiscoMode
-            Text        item=Hallway_BulbMode
-            Switch item=Hallway_BulbCommand mappings=[next_mode='Mode +', previous_mode='Mode -', mode_speed_up='Speed +', mode_speed_down='Speed -', set_white='White', night_mode='Night' ]
-        }
+```perl
+Text label="Hallway" icon="light"
+{
+    Switch      item=Hallway_Level
+    Slider      item=Hallway_Level
+    Slider      item=Hallway_ColourTemperature
+    Colorpicker item=Hallway_Colour
+    Selection   item=Hallway_DiscoMode
+    Text        item=Hallway_BulbMode
+    Switch item=Hallway_BulbCommand mappings=[next_mode='Mode +', previous_mode='Mode -', mode_speed_up='Speed +', mode_speed_down='Speed -', set_white='White', night_mode='Night' ]
+}
 ```
diff --git a/bundles/org.openhab.binding.mqtt.generic/README.md b/bundles/org.openhab.binding.mqtt.generic/README.md
index d87dc0d3abbb0..c235db69503d2 100644
--- a/bundles/org.openhab.binding.mqtt.generic/README.md
+++ b/bundles/org.openhab.binding.mqtt.generic/README.md
@@ -8,13 +8,13 @@ It is designed as a lightweight messaging protocol that uses publish/subscribe o
 
 MQTT servers are called brokers and the clients are simply the connected devices.
 
-* When a device (a client) wants to send data to the broker, we call this operation a “publish”.
-* When a device (a client) wants to receive data from the broker, we call this operation a “subscribe”.
+- When a device (a client) wants to send data to the broker, we call this operation a “publish”.
+- When a device (a client) wants to receive data from the broker, we call this operation a “subscribe”.
 
 ![Publish and Subscribe](doc/subpub.png)
 
 openHAB itself is not an MQTT Broker and needs to connect to one as a regular client.
-Therefore you must have configured a *Broker Thing* first via the **MQTT Broker Binding**!
+Therefore you must have configured a _Broker Thing_ first via the **MQTT Broker Binding**!
 
 ## MQTT Topics
 
@@ -55,54 +55,54 @@ Remember that you need a configured broker Thing first!
 
 The following optional parameters can be set for the Thing:
 
-* __availabilityTopic__: The MQTT topic that represents the availability of the thing. This can be the thing's LWT topic.
-* __payloadAvailable__: Payload of the `Availability Topic`, when the device is available. Default: `ON`.
-* __payloadNotAvailable__: Payload of the `Availability Topic`, when the device is *not* available. Default: `OFF`.
-* __transformationPattern__: An optional transformation pattern like [JSONPath](https://goessner.net/articles/JsonPath/index.html#e2) that is applied to the incoming availability payload. Transformations can be chained by separating them with the mathematical intersection character "∩". The result of the transformations is then checked against `payloadAvailable` and `payloadNotAvailable`.
+- **availabilityTopic**: The MQTT topic that represents the availability of the thing. This can be the thing's LWT topic.
+- **payloadAvailable**: Payload of the `Availability Topic`, when the device is available. Default: `ON`.
+- **payloadNotAvailable**: Payload of the `Availability Topic`, when the device is _not_ available. Default: `OFF`.
+- **transformationPattern**: An optional transformation pattern like [JSONPath](https://goessner.net/articles/JsonPath/index.html#e2) that is applied to the incoming availability payload. Transformations can be chained by separating them with the mathematical intersection character "∩". The result of the transformations is then checked against `payloadAvailable` and `payloadNotAvailable`.
 
 ## Supported Channels
 
 You can add the following channels:
 
-* **string**: This channel can show the received text on the given topic and can send text to a given topic.
-* **number**: This channel can show the received number on the given topic and can send a number to a given topic. It can have a min, max and step values.
-* **dimmer**: This channel handles numeric values as percentages. It can have min, max and step values.
-* **contact**: This channel represents an open/close state of a given topic.
-* **switch**: This channel represents an on/off state of a given topic and can send an on/off value to a given topic.
-* **colorRGB**: This channel handles color values in RGB format. (Deprecated)
-* **colorHSB**: This channel handles color values in HSB format. (Deprecated)
-* **color**: This channel handles color values in HSB, RGB or xyY (x,y,brightness) formats.
-* **location**: This channel handles a location.
-* **image**: This channel handles binary images in common java supported formats (bmp,jpg,png).
-* **datetime**: This channel handles date/time values.
-* **rollershutter**: This channel is for rollershutters.
+- **string**: This channel can show the received text on the given topic and can send text to a given topic.
+- **number**: This channel can show the received number on the given topic and can send a number to a given topic. It can have a min, max and step values.
+- **dimmer**: This channel handles numeric values as percentages. It can have min, max and step values.
+- **contact**: This channel represents an open/close state of a given topic.
+- **switch**: This channel represents an on/off state of a given topic and can send an on/off value to a given topic.
+- **colorRGB**: This channel handles color values in RGB format. (Deprecated)
+- **colorHSB**: This channel handles color values in HSB format. (Deprecated)
+- **color**: This channel handles color values in HSB, RGB or xyY (x,y,brightness) formats.
+- **location**: This channel handles a location.
+- **image**: This channel handles binary images in common java supported formats (bmp,jpg,png).
+- **datetime**: This channel handles date/time values.
+- **rollershutter**: This channel is for rollershutters.
 
 ## Channel Configuration
 
-* __stateTopic__: The MQTT topic that represents the state of the thing. This can be empty, the thing channel will be a state-less trigger then. You can use a wildcard topic like "sensors/+/event" to retrieve state from multiple MQTT topics.
-* __transformationPattern__: An optional transformation pattern like [JSONPath](https://goessner.net/articles/JsonPath/index.html#e2) that is applied to all incoming MQTT values.
-* __transformationPatternOut__: An optional transformation pattern like [JSONPath](https://goessner.net/articles/JsonPath/index.html#e2) that is applied before publishing a value to MQTT.
-* __commandTopic__: The MQTT topic that commands are send to. This can be empty, the thing channel will be read-only then. Transformations are not applied for sending data.
-* __formatBeforePublish__: Format a value before it is published to the MQTT broker. The default is to just pass the channel/item state. If you want to apply a prefix, say "MYCOLOR,", you would use "MYCOLOR,%s". Currently only "%s" is supported.
-* __postCommand__: If `true`, the received MQTT value will not only update the state of linked items, but command it.
+- **stateTopic**: The MQTT topic that represents the state of the thing. This can be empty, the thing channel will be a state-less trigger then. You can use a wildcard topic like "sensors/+/event" to retrieve state from multiple MQTT topics.
+- **transformationPattern**: An optional transformation pattern like [JSONPath](https://goessner.net/articles/JsonPath/index.html#e2) that is applied to all incoming MQTT values.
+- **transformationPatternOut**: An optional transformation pattern like [JSONPath](https://goessner.net/articles/JsonPath/index.html#e2) that is applied before publishing a value to MQTT.
+- **commandTopic**: The MQTT topic that commands are send to. This can be empty, the thing channel will be read-only then. Transformations are not applied for sending data.
+- **formatBeforePublish**: Format a value before it is published to the MQTT broker. The default is to just pass the channel/item state. If you want to apply a prefix, say "MYCOLOR,", you would use "MYCOLOR,%s". Currently only "%s" is supported.
+- **postCommand**: If `true`, the received MQTT value will not only update the state of linked items, but command it.
   The default is `false`.
   You usually need this to be `true` if your item is also linked to another channel, say a KNX actor, and you want a received MQTT payload to command that KNX actor.
-* __retained__: The value will be published to the command topic as retained message. A retained value stays on the broker and can even be seen by MQTT clients that are subscribing at a later point in time.
-* __qos__: QoS of this channel. Overrides the connection  QoS (defined in broker connection).
-* __trigger__: If `true`, the state topic will not update a state, but trigger a channel instead.
+- **retained**: The value will be published to the command topic as retained message. A retained value stays on the broker and can even be seen by MQTT clients that are subscribing at a later point in time.
+- **qos**: QoS of this channel. Overrides the connection  QoS (defined in broker connection).
+- **trigger**: If `true`, the state topic will not update a state, but trigger a channel instead.
 
 ### Channel Type "string"
 
-* __allowedStates__: An optional comma separated list of allowed states. Example: "ONE,TWO,THREE"
+- **allowedStates**: An optional comma separated list of allowed states. Example: "ONE,TWO,THREE"
 
 You can connect this channel to a String item.
 
 ### Channel Type "number"
 
-* __min__: An optional minimum value.
-* __max__: An optional maximum value.
-* __step__: For decrease, increase commands the step needs to be known
-* __unit__: Unit of measurement (optional). For supported units see [OpenHAB: List of Units](https://www.openhab.org/docs/concepts/units-of-measurement.html#list-of-units). Examples: "°C", "°F"
+- **min**: An optional minimum value.
+- **max**: An optional maximum value.
+- **step**: For decrease, increase commands the step needs to be known
+- **unit**: Unit of measurement (optional). For supported units see [OpenHAB: List of Units](https://www.openhab.org/docs/concepts/units-of-measurement.html#list-of-units). Examples: "°C", "°F"
 
 A decimal value (like 0.2) is send to the MQTT topic if the number has a fractional part.
 If you always require an integer, please use the formatter.
@@ -111,11 +111,11 @@ You can connect this channel to a Number item.
 
 ### Channel Type "dimmer"
 
-* __on__: An optional string (like "ON"/"Open") that is recognized as minimum.
-* __off__: An optional string (like "OFF"/"Close") that is recognized as maximum.
-* __min__: A required minimum value.
-* __max__: A required maximum value.
-* __step__: For decrease, increase commands the step needs to be known
+- **on**: An optional string (like "ON"/"Open") that is recognized as minimum.
+- **off**: An optional string (like "OFF"/"Close") that is recognized as maximum.
+- **min**: A required minimum value.
+- **max**: A required maximum value.
+- **step**: For decrease, increase commands the step needs to be known
 
 The value is internally stored as a percentage for a value between **min** and **max**.
 
@@ -125,8 +125,8 @@ You can connect this channel to a Rollershutter or Dimmer item.
 
 ### Channel Type "contact", "switch"
 
-* __on__: An optional number (like 1, 10) or a string (like "ON"/"Open") that is recognized as on/open state.
-* __off__: An optional number (like 0, -10) or a string (like "OFF"/"Close") that is recognized as off/closed state.
+- **on**: An optional number (like 1, 10) or a string (like "ON"/"Open") that is recognized as on/open state.
+- **off**: An optional number (like 0, -10) or a string (like "OFF"/"Close") that is recognized as off/closed state.
 
 The contact channel by default recognizes `"OPEN"` and `"CLOSED"`. You can connect this channel to a Contact item.
 The switch channel by default recognizes `"ON"` and `"OFF"`. You can connect this channel to a Switch item.
@@ -137,10 +137,10 @@ You can connect this channel to a Contact or Switch item.
 
 ### Channel Type "color"
 
-* __colorMode__: An optional string that defines the color representation: `HSB`, `RGB` or `XYY` (x,y,brightness). Defaults to `HSB` when not specified.
-* __on__: An optional string (like "BRIGHT") that is recognized as on state. (ON will always be recognized.)
-* __off__: An optional string (like "DARK") that is recognized as off state. (OFF will always be recognized.)
-* __onBrightness__: If you connect this channel to a Switch item and turn it on,
+- **colorMode**: An optional string that defines the color representation: `HSB`, `RGB` or `XYY` (x,y,brightness). Defaults to `HSB` when not specified.
+- **on**: An optional string (like "BRIGHT") that is recognized as on state. (ON will always be recognized.)
+- **off**: An optional string (like "DARK") that is recognized as off state. (OFF will always be recognized.)
+- **onBrightness**: If you connect this channel to a Switch item and turn it on,
 
 color and saturation are preserved from the last state, but
 the brightness will be set to this configured initial brightness (default: 10%).
@@ -155,9 +155,9 @@ The channel expects values on the corresponding MQTT topic to be in this format
 
 ### Channel Type "colorRGB", "colorHSB" (Deprecated)
 
-* __on__: An optional string (like "BRIGHT") that is recognized as on state. (ON will always be recognized.)
-* __off__: An optional string (like "DARK") that is recognized as off state. (OFF will always be recognized.)
-* __onBrightness__: If you connect this channel to a Switch item and turn it on,
+- **on**: An optional string (like "BRIGHT") that is recognized as on state. (ON will always be recognized.)
+- **off**: An optional string (like "DARK") that is recognized as off state. (OFF will always be recognized.)
+- **onBrightness**: If you connect this channel to a Switch item and turn it on,
 
 color and saturation are preserved from the last state, but
 the brightness will be set to this configured initial brightness (default: 10%).
@@ -196,29 +196,28 @@ The channel expects values on the corresponding MQTT topic to be in this format
 
 ### Channel Type "rollershutter"
 
-* __on__: An optional string (like "Open") that is recognized as `UP` state.
-* __off__: An optional string (like "Close") that is recognized as `DOWN` state.
-* __stop__: An optional string (like "Stop") that is recognized as `STOP` state.
+- **on**: An optional string (like "Open") that is recognized as `UP` state.
+- **off**: An optional string (like "Close") that is recognized as `DOWN` state.
+- **stop**: An optional string (like "Stop") that is recognized as `STOP` state.
 
 Internally `UP` is converted to 0%, `DOWN` to 100%.
 If strings are defined for these values, they are used for sending commands to the broker, too.
 
 You can connect this channel to a Rollershutter or Dimmer item.
 
-
 ## Rule Actions
 
 This binding includes a rule action, which allows one to publish MQTT messages from within rules.
 There is a separate instance for each MQTT broker (i.e. bridge), which can be retrieved through
 
-```
+```java
 val mqttActions = getActions("mqtt","mqtt:broker:myBroker")
 ```
 
 where the first parameter always has to be `mqtt` and the second (`mqtt:broker:myBroker`) is the Thing UID of the broker that should be used.
 Once this action instance is retrieved, you can invoke the `publishMQTT(String topic, String value, Boolean retained)` method on it:
 
-```
+```java
 mqttActions.publishMQTT("mytopic","myvalue", true)
 ```
 
@@ -228,9 +227,9 @@ The retained argument is optional and if not supplied defaults to `false`.
 
 ## Configuration via Text Files
 
-*broker.things* file:
+_broker.things_ file:
 
-```
+```java
 mqtt:broker:mySecureBroker [ host="192.168.0.41", secure=true, certificatepin=true, publickeypin=true ]
 mqtt:broker:myInsecureBroker [ host="192.168.0.42", secure=false ]
 mqtt:broker:myAuthenticatedBroker [ host="192.168.0.43",secure=true, username="user", password="password" ]
@@ -246,9 +245,9 @@ In a fourth connection, the public key pinning is enabled again. This time, a pu
 
 Files can also be used to create topic things and channels and to combine them with a broker connection:
 
-*mqtt.things* file:
+_mqtt.things_ file:
 
-```
+```java
 Bridge mqtt:broker:myInsecureBroker [ host="192.168.0.42", secure=false ]
 
 Thing mqtt:topic:mything "mything" (mqtt:broker:myInsecureBroker) {
@@ -263,19 +262,19 @@ Thing mqtt:topic:mything "mything" (mqtt:broker:myInsecureBroker) {
 
 If the availability status is available, it can be configured to set the Thing status:
 
-```
+```java
 Thing mqtt:topic:bedroom1-switch (mqtt:broker:myInsecureBroker) [ availabilityTopic="tele/bedroom1-switch/LWT", payloadAvailable="Online", payloadNotAvailable="Offline" ] {
     Channels:
          Type switch        : power        [ stateTopic="stat/bedroom1-switch/RESULT", transformationPattern="REGEX:(.*POWER.*)∩JSONPATH:$.POWER", commandTopic="cmnd/bedroom1-switch/POWER" ]
 }
 ```
-    
+
 ## Limitations
 
-* The HomeAssistant Fan Components only support ON/OFF.
-* The HomeAssistant Cover Components only support OPEN/CLOSE/STOP.
-* The HomeAssistant Light Component does not support XY color changes.
-* The HomeAssistant Climate Components is not yet supported.
+- The HomeAssistant Fan Components only support ON/OFF.
+- The HomeAssistant Cover Components only support OPEN/CLOSE/STOP.
+- The HomeAssistant Light Component does not support XY color changes.
+- The HomeAssistant Climate Components is not yet supported.
 
 ## Incoming Value Transformation
 
@@ -310,34 +309,34 @@ The default is "%s" which means: Output the item state as string.
 
 Here are a few examples:
 
-* All uppercase: "%S". Just use the upper case letter for the conversion argument.
-* Apply a prefix: "myprefix%s"
-* Apply a suffix: "%s suffix"
-* Number precision: ".4f" for a 4 digit precision. Use the "+" flag to always add a sign: "+.4f".
-* Decimal to Hexadecimal/Octal/Scientific: For example "60" with "%x", "%o", "%e" becomes "3C", "74", "60".
-* Date/Time: To reference the item state multiple times, use "%1$". Use the "tX" conversion where "X" can be any of [h,H,m,M,I,k,l,S,p,B,b,A,a,y,Y,d,e].
-  - For an output of *May 23, 1995* use "%1$**tb** %1$**te**,%1$**tY**".
-  - For an output of *23.05.1995* use "%1$**td**.%1$**tm**.%1$**tY**".
-  - For an output of *23:15* use "%1$**tH**:%1$**tM**".
+- All uppercase: "%S". Just use the upper case letter for the conversion argument.
+- Apply a prefix: "myprefix%s"
+- Apply a suffix: "%s suffix"
+- Number precision: ".4f" for a 4 digit precision. Use the "+" flag to always add a sign: "+.4f".
+- Decimal to Hexadecimal/Octal/Scientific: For example "60" with "%x", "%o", "%e" becomes "3C", "74", "60".
+- Date/Time: To reference the item state multiple times, use "%1$". Use the "tX" conversion where "X" can be any of [h,H,m,M,I,k,l,S,p,B,b,A,a,y,Y,d,e].
+  - For an output of _May 23, 1995_ use "%1$**tb** %1$**te**,%1$**tY**".
+  - For an output of _23.05.1995_ use "%1$**td**.%1$**tm**.%1$**tY**".
+  - For an output of _23:15_ use "%1$**tH**:%1$**tM**".
 
 Default pattern applied for each type:
 | Type             | Parameter                         | Pattern             | Comment |
 | ---------------- | --------------------------------- | ------------------- | ------- |
-| __string__       | String                            | "%s"                |
-| __number__       | BigDecimal                        | "%f"                | The default will remove trailing zeros after the decimal point.
-| __dimmer__       | BigDecimal                        | "%f"                | The default will remove trailing zeros after the decimal point.
-| __contact__      | String                            | --                  | No pattern supported. Always **on** and **off** strings.
-| __switch__       | String                            | --                  | No pattern supported. Always **on** and **off** strings.
-| __colorRGB__     | BigDecimal, BigDecimal, BigDecimal| "%1$d,%2$d,%3$d"    | Parameters are **red**, **green** and **blue** components.
-| __colorHSB__     | BigDecimal, BigDecimal, BigDecimal| "%1$d,%2$d,%3$d"    | Parameters are **hue**, **saturation** and **brightness** components.
-| __location__     | BigDecimal, BigDecimal            | "%2$f,%3$f,%1$f"    | Parameters are **altitude**, **latitude** and **longitude**, altitude is only in default pattern, if value is not '0'.
-| __image__        | --                                | --                  | No publishing supported.
-| __datetime__     | ZonedDateTime                     | "%1$tY-%1$tm-%1$tdT%1$tH:%1$tM:%1$tS.%1$tN" | Trailing zeros of the nanoseconds are removed.
-| __rollershutter__| String                            | "%s"                | No pattern supported. Always **up**, **down**, **stop** string or integer percent value.
-
-Any outgoing value transformation will **always** result in a __string__ value.
+| **string**       | String                            | "%s"                |
+| **number**       | BigDecimal                        | "%f"                | The default will remove trailing zeros after the decimal point.
+| **dimmer**       | BigDecimal                        | "%f"                | The default will remove trailing zeros after the decimal point.
+| **contact**      | String                            | --                  | No pattern supported. Always **on** and **off** strings.
+| **switch**       | String                            | --                  | No pattern supported. Always **on** and **off** strings.
+| **colorRGB**     | BigDecimal, BigDecimal, BigDecimal| "%1$d,%2$d,%3$d"    | Parameters are **red**, **green** and **blue** components.
+| **colorHSB**     | BigDecimal, BigDecimal, BigDecimal| "%1$d,%2$d,%3$d"    | Parameters are **hue**, **saturation** and **brightness** components.
+| **location**     | BigDecimal, BigDecimal            | "%2$f,%3$f,%1$f"    | Parameters are **altitude**, **latitude** and **longitude**, altitude is only in default pattern, if value is not '0'.
+| **image**        | --                                | --                  | No publishing supported.
+| **datetime**     | ZonedDateTime                     | "%1$tY-%1$tm-%1$tdT%1$tH:%1$tM:%1$tS.%1$tN" | Trailing zeros of the nanoseconds are removed.
+| **rollershutter**| String                            | "%s"                | No pattern supported. Always **up**, **down**, **stop** string or integer percent value.
+
+Any outgoing value transformation will **always** result in a **string** value.
 
 ## Troubleshooting
 
-* If you get the error "No MQTT client": Please update your installation.
-* If you use the Mosquitto broker: Please be aware that there is a relatively low setting for retained messages. If at some point messages stop being delivered change the setting.
+- If you get the error "No MQTT client": Please update your installation.
+- If you use the Mosquitto broker: Please be aware that there is a relatively low setting for retained messages. If at some point messages stop being delivered change the setting.
diff --git a/bundles/org.openhab.binding.mqtt.generic/xtend_examples.md b/bundles/org.openhab.binding.mqtt.generic/xtend_examples.md
index cb69f5837416e..f28e8ea045633 100644
--- a/bundles/org.openhab.binding.mqtt.generic/xtend_examples.md
+++ b/bundles/org.openhab.binding.mqtt.generic/xtend_examples.md
@@ -1,13 +1,14 @@
+# Xtend Examples
 
 ## Examples
 
 Have a look at the following textual examples.
 
-### A broker Thing with a Generic MQTT Thing and a few channels 
+### A broker Thing with a Generic MQTT Thing and a few channels
 
 demo1.things:
 
-```xtend
+```java
 Bridge mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 {
     Thing topic mything {
@@ -23,7 +24,7 @@ Bridge mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 
 demo2.things:
 
-```xtend
+```java
 Bridge mqtt:broker:WorkBroker "Work Broker" [ host="localhost", port="1883", secure=false, username="openhabian", password="ohmqtt", clientID="WORKOPENHAB24" ]
 
 Thing mqtt:topic:WorkBroker:WorkSonoff "Work Sonoff" (mqtt:broker:WorkBroker) @ "Home" {
@@ -32,8 +33,10 @@ Thing mqtt:topic:WorkBroker:WorkSonoff "Work Sonoff" (mqtt:broker:WorkBroker) @
         Type switch : WorkLightTele "Work Tele" [ stateTopic="tele/worklight/STATE", transformationPattern="JSONPATH:$.POWER" ]
 }
 ```
+
 tasmota.things: Example of a Tasmota Device with Availablity-Topic state and standard Online/Offline message-payload
-```xtend
+
+```java
 Bridge mqtt:broker:mybroker [ host="192.168.0.42", secure=false ]
 {
     Thing mqtt:topic:SP111 "SP111" [availabilityTopic="tele/tasmota/LWT", payloadAvailable="Online", payloadNotAvailable="Offline"]{
@@ -51,20 +54,20 @@ Bridge mqtt:broker:mybroker [ host="192.168.0.42", secure=false ]
 
 When using .things and .items files for configuration, items and channels follow the format of:
 
-```xtend
+```java
 <ITEM-TYPE> <ITEM-NAME> "<FRIENDLY-NAME>" { channel="mqtt:topic:<BROKER-NAME>:<THING-NAME>:<CHANNEL-NAME>" }
 ```
 
 demo1.items:
 
-```xtend
+```java
 Switch Kitchen_Light "Kitchen Light" { channel="mqtt:topic:myUnsecureBroker:mything:lamp" }
 Rollershutter shutter "Blind" { channel="mqtt:topic:myUnsecureBroker:mything:blind" }
 ```
 
 demo2.items:
 
-```xtend
+```java
 Switch SW_WorkLight "Work Light Switch" { channel="mqtt:topic:WorkBroker:WorkSonoff:WorkLight", channel="mqtt:topic:WorkBroker:WorkSonoff:WorkLightTele" }
 ```
 
@@ -72,7 +75,7 @@ Switch SW_WorkLight "Work Light Switch" { channel="mqtt:topic:WorkBroker:WorkSon
 
 An example "demo.rules" rule to publish to `system/started` with the value `true` on every start:
 
-```xtend
+```java
 rule "Send startup message"
 when
   System started
@@ -88,7 +91,7 @@ To synchronize item items from a SOURCE openHAB instance to a DESTINATION instan
 
 Define a broker and a trigger channel for your DESTINATION openHAB installation (`thing` file):
 
-```xtend
+```java
 Bridge mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 {
     Channels:
@@ -99,7 +102,7 @@ Bridge mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 The trigger channel will trigger for each received message on the MQTT topic "allItems/".
 Now push those changes to your items in a `rules` file:
 
-```xtend
+```java
 rule "Receive all"
 when 
       Channel "mqtt:broker:myUnsecureBroker:myTriggerChannel" triggered
@@ -114,7 +117,7 @@ end
 On your SOURCE openHAB installation, you need to define a group `myGroupOfItems` and add all items
 to it that you want to synchronize. Then add this rule to a `rule` file:
 
-```xtend
+```java
 rule "Publish all"
 when 
       Member of myGroupOfItems changed
@@ -131,17 +134,17 @@ You do not need to convert everything in one go. MQTT1 and MQTT2 can coexist.
 
 > For mqtt1 make sure you have enabled the Legacy 1.x repository and installed "mqtt1".
 
-### 1 Command / 1 State topic 
+### 1 Command / 1 State topic
 
 Assume you have this item:
 
-```xtend
+```java
 Switch ExampleItem "Heatpump Power" { mqtt=">[mosquitto:heatpump/set:command:*:DEFAULT)],<[mosquitto:heatpump:JSONPATH($.power)]" }
 ```
 
 This converts to an entry in your *.things file with a **Broker Thing** and a **Generic MQTT Thing** that uses the bridge:
 
-```xtend
+```java
 Bridge mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 {
     Thing topic mything "My Thing" {
@@ -151,26 +154,25 @@ Bridge mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 }
 ```
 
-Add as many channels as you have items and add the *stateTopic* and *commandTopic* accordingly. 
+Add as many channels as you have items and add the _stateTopic_ and _commandTopic_ accordingly.
 
 Your items change to:
 
-```xtend
+```java
 Switch ExampleItem "Heatpump Power" { channel="mqtt:topic:myUnsecureBroker:mything:heatpumpChannel" }
 ```
 
-
-### 1 Command / 2 State topics 
+### 1 Command / 2 State topics
 
 If you receive updates from two different topics, you need to create multiple channels now, 1 for each MQTT receive topic.
 
-```xtend
+```java
 Switch ExampleItem "Heatpump Power" { mqtt=">[mosquitto:heatpump/set:command:*:DEFAULT)],<[mosquitto:heatpump/state1:state:*:DEFAULT,<[mosquitto:heatpump/state2:state:*:DEFAULT" }
 ```
 
 This converts to:
 
-```xtend
+```java
 Bridge mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 {
     Thing topic mything "My Thing" {
@@ -184,7 +186,7 @@ Bridge mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 Link both channels to one item. That item will publish to "heatpump/set" on a change and
 receive values from "heatpump/state1" and "heatpump/state2".
 
-```xtend
+```java
 Switch ExampleItem "Heatpump Power" { channel="mqtt:topic:myUnsecureBroker:mything:heatpumpChannel",
                                       channel="mqtt:topic:myUnsecureBroker:mything:heatpumpChannel2" }
 ```
diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/README.md b/bundles/org.openhab.binding.mqtt.homeassistant/README.md
index 09dd009cfb681..dc59a54045b97 100644
--- a/bundles/org.openhab.binding.mqtt.homeassistant/README.md
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/README.md
@@ -13,26 +13,26 @@ The mapping is structured like this:
 
 The HomeAssistant MQTT requires two transformations to be installed:
 
-* JINJA-Transformations
-* JSONPath-Transformations
+- JINJA-Transformations
+- JSONPath-Transformations
 
 These can be installed under `Settings` &rarr; `Addon` &rarr; `Transformations`
 
 ## Limitations
 
-* The HomeAssistant Fan Components only support ON/OFF.
-* The HomeAssistant Cover Components only support OPEN/CLOSE/STOP.
-* The HomeAssistant Light Component only support on/off, brightness, and RGB.
+- The HomeAssistant Fan Components only support ON/OFF.
+- The HomeAssistant Cover Components only support OPEN/CLOSE/STOP.
+- The HomeAssistant Light Component only support on/off, brightness, and RGB.
   Other color spaces, color temperature, effects, and white channel may work, but are untested.
-* The HomeAssistant Climate Components is not yet supported.
+- The HomeAssistant Climate Components is not yet supported.
 
 ## Tasmota auto discovery
 
 To activate HomeAssistant discovery support on your Tasmota device you need to do the following:
 
-* `Configuration` &rarr; `MQTT`: You must have unique `Client` name and `Topic` (should be the default).
-* `Configuration` &rarr; `Other`: The `Device Name` will be used to identify the newly found device.
+- `Configuration` &rarr; `MQTT`: You must have unique `Client` name and `Topic` (should be the default).
+- `Configuration` &rarr; `Other`: The `Device Name` will be used to identify the newly found device.
   And you need to enable MQTT, of course.
-* `Console`: Enter `SetOption19 1`.
+- `Console`: Enter `SetOption19 1`.
 
 Your Tasmota device should now show up in your inbox.
diff --git a/bundles/org.openhab.binding.mqtt.homie/README.md b/bundles/org.openhab.binding.mqtt.homie/README.md
index d6098312d4601..f9bd92d140926 100644
--- a/bundles/org.openhab.binding.mqtt.homie/README.md
+++ b/bundles/org.openhab.binding.mqtt.homie/README.md
@@ -5,7 +5,7 @@ NOTE: This binding is provided by the [MQTT binding](https://www.openhab.org/add
 Devices that follow the [Homie convention](https://homieiot.github.io/) 3.x and better
 are auto-discovered and represented by this binding and the Homie Thing.
 
-Find the next table to understand the topology mapping from Homie to the Framework: 
+Find the next table to understand the topology mapping from Homie to the Framework:
 
 | Homie    | Framework     | Example MQTT topic                 |
 |----------|---------------|------------------------------------|
@@ -13,8 +13,8 @@ Find the next table to understand the topology mapping from Homie to the Framewo
 | Node     | Channel Group | homie/super-car/engine             |
 | Property | Channel       | homie/super-car/engine/temperature |
 
-System trigger channels are supported using non-retained properties, with *enum* data type and with the following formats:
+System trigger channels are supported using non-retained properties, with _enum_ data type and with the following formats:
 
-* Format: "PRESSED,RELEASED" -> system.rawbutton
-* Format: "SHORT\_PRESSED,DOUBLE\_PRESSED,LONG\_PRESSED" -> system.button
-* Format: "DIR1\_PRESSED,DIR1\_RELEASED,DIR2\_PRESSED,DIR2\_RELEASED" -> system.rawrocker
+- Format: "PRESSED,RELEASED" -> system.rawbutton
+- Format: "SHORT\_PRESSED,DOUBLE\_PRESSED,LONG\_PRESSED" -> system.button
+- Format: "DIR1\_PRESSED,DIR1\_RELEASED,DIR2\_PRESSED,DIR2\_RELEASED" -> system.rawrocker
diff --git a/bundles/org.openhab.binding.mqtt/README.md b/bundles/org.openhab.binding.mqtt/README.md
index 02fe391284e19..100af4bb7c764 100644
--- a/bundles/org.openhab.binding.mqtt/README.md
+++ b/bundles/org.openhab.binding.mqtt/README.md
@@ -16,71 +16,71 @@ MQTT topics. Please check out the available extensions:
 
 ## Supported Bridges
 
-* Broker: This bridge represents an MQTT Broker connection, configured and managed by this binding.
+- Broker: This bridge represents an MQTT Broker connection, configured and managed by this binding.
 
 ## Bridge Configuration
- 
+
 Required configuration parameters are:
 
-* __host__: The IP/Hostname of the MQTT broker. Be aware that this binding allows only one bridge / one connection per unique host:port.
-* __port__: The optional port of the MQTT broker. If none is provided, the typical ports 1883 and 8883 (SSL) are used. Be aware that this binding allows only one bridge / one connection per unique host:port.
-* __secure__: Uses TLS/SSL to establish a secure connection to the broker. Can be true or false. Defaults to false.
+- **host**: The IP/Hostname of the MQTT broker. Be aware that this binding allows only one bridge / one connection per unique host:port.
+- **port**: The optional port of the MQTT broker. If none is provided, the typical ports 1883 and 8883 (SSL) are used. Be aware that this binding allows only one bridge / one connection per unique host:port.
+- **secure**: Uses TLS/SSL to establish a secure connection to the broker. Can be true or false. Defaults to false.
 
 Additionally the following parameters can be set:
 
-* __hostnameValidated__: Validate hostname from certificate against server hostname for secure connection. Defaults to true.
-* __protocol__:  The protocol used for communicating with the broker (TCP, WEBSOCKETS). Defaults to TCP.
-* __mqttVersion__: The MQTT version used for communicating with the broker (V3, V5). Defaults to V3.
-* __qos__: Quality of Service. Can be 0, 1 or 2. Please read the MQTT specification for details. Defaults to 0.
-* __clientID__: Use a fixed client ID. Defaults to empty which means a user ID is generated for this connection.
+- **hostnameValidated**: Validate hostname from certificate against server hostname for secure connection. Defaults to true.
+- **protocol**:  The protocol used for communicating with the broker (TCP, WEBSOCKETS). Defaults to TCP.
+- **mqttVersion**: The MQTT version used for communicating with the broker (V3, V5). Defaults to V3.
+- **qos**: Quality of Service. Can be 0, 1 or 2. Please read the MQTT specification for details. Defaults to 0.
+- **clientID**: Use a fixed client ID. Defaults to empty which means a user ID is generated for this connection.
 
 Reconnect parameters are:
 
-* __reconnectTime__: Reconnect time in ms. If a connection is lost, the binding will wait this time before it tries to reconnect. Defaults to 60000 (60s).
-* __keepAlive__: Keep alive / heartbeat timer in s. It can take up to this time to determine if a server connection is lost. A lower value may keep the broker unnecessarily busy for no or little additional value. Defaults to 60s.
+- **reconnectTime**: Reconnect time in ms. If a connection is lost, the binding will wait this time before it tries to reconnect. Defaults to 60000 (60s).
+- **keepAlive**: Keep alive / heartbeat timer in s. It can take up to this time to determine if a server connection is lost. A lower value may keep the broker unnecessarily busy for no or little additional value. Defaults to 60s.
 
 An MQTT last will and testament can be configured:
 
-* __lwtMessage__: An optional last will and testament message. Defaults to empty.
-* __lwtTopic__: The last will topic. Defaults to empty and therefore disables the last will.
-* __lwtQos__: The optional qos of the last will. Defaults to 0.
-* __lwtRetain__: Retain last will message. Defaults to true.
+- **lwtMessage**: An optional last will and testament message. Defaults to empty.
+- **lwtTopic**: The last will topic. Defaults to empty and therefore disables the last will.
+- **lwtQos**: The optional qos of the last will. Defaults to 0.
+- **lwtRetain**: Retain last will message. Defaults to true.
 
 An MQTT message can be published upon a successful connection to the MQTT broker with these parameters:
 
-* __birthMessage__: An optional message to be published once the bridge established a connection to the MQTT broker. Defaults to empty.
-* __birthTopic__: The birth topic. Defaults to empty and therefore no birth message will be published.
-* __birthRetain__: Retain the birth message. Defaults to true.
+- **birthMessage**: An optional message to be published once the bridge established a connection to the MQTT broker. Defaults to empty.
+- **birthTopic**: The birth topic. Defaults to empty and therefore no birth message will be published.
+- **birthRetain**: Retain the birth message. Defaults to true.
 
 An MQTT message can be published just before disconnecting from the broker with these parameters:
 
-* __shutdownMessage__: An optional message to be published before the bridge disconnects from the MQTT broker. Defaults to empty.
-* __shutdownTopic__: The shutdown topic. Defaults to empty and therefore no shutdown message will be published.
-* __shutdownRetain__: Retain the shutdown message. Defaults to true.
+- **shutdownMessage**: An optional message to be published before the bridge disconnects from the MQTT broker. Defaults to empty.
+- **shutdownTopic**: The shutdown topic. Defaults to empty and therefore no shutdown message will be published.
+- **shutdownRetain**: Retain the shutdown message. Defaults to true.
 
 For more security, the following optional parameters can be altered:
 
-* __username__: The MQTT username (since MQTT 3.1). Defaults to empty.
-* __password__: The MQTT password (since MQTT 3.1). Defaults to empty.
-* __certificatepin__: If this is set: After the next connection has been successfully established, the certificate is pinned. The connection will be refused if another certificate is used. Clear **certificate** to allow a new certificate for the next connection attempt. This option will increase security.
-* __publickeypin__: If this is set: After the next connection has been successfully established, the public key of the broker is pinned. The connection will be refused if another public key is used. Clear **publickey** to allow a new public key for the next connection attempt. This option will increase security.
-* __certificate__: The certificate hash. If **certificatepin** is set this hash is used to verify the connection. Clear to allow a new certificate pinning on the next connection attempt. If empty will be filled automatically by the next successful connection. An example input would be `SHA-256:83F9171E06A313118889F7D79302BD1B7A2042EE0CFD029ABF8DD06FFA6CD9D3`.
-* __publickey__: The public key hash. If **publickeypin** is set this hash is used to verify the connection. Clear to allow a new public key pinning on the next connection attempt. If empty will be filled automatically by the next successful connection. An example input would be `SHA-256:83F9171E06A313118889F7D79302BD1B7A2042EE0CFD029ABF8DD06FFA6CD9D3`.
+- **username**: The MQTT username (since MQTT 3.1). Defaults to empty.
+- **password**: The MQTT password (since MQTT 3.1). Defaults to empty.
+- **certificatepin**: If this is set: After the next connection has been successfully established, the certificate is pinned. The connection will be refused if another certificate is used. Clear **certificate** to allow a new certificate for the next connection attempt. This option will increase security.
+- **publickeypin**: If this is set: After the next connection has been successfully established, the public key of the broker is pinned. The connection will be refused if another public key is used. Clear **publickey** to allow a new public key for the next connection attempt. This option will increase security.
+- **certificate**: The certificate hash. If **certificatepin** is set this hash is used to verify the connection. Clear to allow a new certificate pinning on the next connection attempt. If empty will be filled automatically by the next successful connection. An example input would be `SHA-256:83F9171E06A313118889F7D79302BD1B7A2042EE0CFD029ABF8DD06FFA6CD9D3`.
+- **publickey**: The public key hash. If **publickeypin** is set this hash is used to verify the connection. Clear to allow a new public key pinning on the next connection attempt. If empty will be filled automatically by the next successful connection. An example input would be `SHA-256:83F9171E06A313118889F7D79302BD1B7A2042EE0CFD029ABF8DD06FFA6CD9D3`.
 
 By default discovery services (like homie or homeassistant) are enabled on a broker.
 This behaviour can be controlled with a configuration parameter.
 
-* __enableDiscovery__:If set to true, enables discovery on this broker, if set to false, disables discovery services on this broker.
+- **enableDiscovery**:If set to true, enables discovery on this broker, if set to false, disables discovery services on this broker.
 
 ## Supported Channels
 
 You can extend your broker connection bridges with a channel:
 
-* __publishTrigger__: This channel is triggered when a value is published to the configured MQTT topic on this broker connection. The event payload (in `receivedEvent`) will be the received MQTT topic and its value, separated by the hash character (`#`).
+- **publishTrigger**: This channel is triggered when a value is published to the configured MQTT topic on this broker connection. The event payload (in `receivedEvent`) will be the received MQTT topic and its value, separated by the hash character (`#`).
 
 Configuration parameters are:
 
-* __stateTopic__: This channel will trigger on this MQTT topic. This topic can contain wildcards like + and # for example "all/in/#" or "sensors/+/config".
-* __payload__: An optional condition on the value of the MQTT topic that must match before this channel is triggered.
+- **stateTopic**: This channel will trigger on this MQTT topic. This topic can contain wildcards like + and # for example "all/in/#" or "sensors/+/config".
+- **payload**: An optional condition on the value of the MQTT topic that must match before this channel is triggered.
 
 Note for new users - direct broker Bridge channels are rarely needed. You almost certainly will want to be using one of the binding extensions, or the generic Things and Channels features for most devices or services.
diff --git a/bundles/org.openhab.binding.mqtt/xtend_examples.md b/bundles/org.openhab.binding.mqtt/xtend_examples.md
index abca13191fb6e..8735256794f28 100644
--- a/bundles/org.openhab.binding.mqtt/xtend_examples.md
+++ b/bundles/org.openhab.binding.mqtt/xtend_examples.md
@@ -1,12 +1,14 @@
+# Xtend Examples
+
 ## Secure connection
 
 In a first example a very secure connection to a broker is defined. It pins the returned certificate and public key.
 If someone tries a man in the middle attack later on, this broker connection will recognize it and refuse a connection.
-Be aware that if your brokers certificate changes, you need to remove the connection entry and add it again. 
+Be aware that if your brokers certificate changes, you need to remove the connection entry and add it again.
 
 `mqttConnections.things`:
 
-```xtend
+```java
 mqtt:broker:mySecureBroker [ host="192.168.0.41", secure=true, certificatepin=true, publickeypin=true ]
 ```
 
@@ -16,7 +18,7 @@ The second connection is a plain, unsecured one. Unsecure connections are defaul
 
 `mqttConnections.things`:
 
-```xtend
+```java
 mqtt:broker:myUnsecureBroker [ host="192.168.0.42", secure=false ]
 ```
 
@@ -28,20 +30,19 @@ The credentials are plain values on the wire, therefore you should only use this
 
 `mqttConnections.things`:
 
-```xtend
+```java
 mqtt:broker:myAuthentificatedBroker [ host="192.168.0.43", secure=false, username="user", password="password" ]
 ```
 
-
 ## Public key pinning
 
 In a fourth connection, the public key pinning is enabled again.
 This time, a public key hash is provided to pin the connection to a specific server.
-It follows the form "hashname:hashvalue". Valid *hashnames* are SHA-1, SHA-224, SHA-256, SHA-384, SHA-512 and all others listed
+It follows the form "hashname:hashvalue". Valid _hashnames_ are SHA-1, SHA-224, SHA-256, SHA-384, SHA-512 and all others listed
 in [Java MessageDigest Algorithms](https://docs.oracle.com/javase/9/docs/specs/security/standard-names.html#messagedigest-algorithms).
 
 `mqttConnections.things`:
 
-```xtend
+```java
 mqtt:broker:pinToPublicKey [ host="192.168.0.44", secure=true, publickeypin=true, publickey="SHA-256:9a6f30e67ae9723579da2575c35daf7da3b370b04ac0bde031f5e1f5e4617eb8" ]
 ```
diff --git a/bundles/org.openhab.binding.mybmw/README.md b/bundles/org.openhab.binding.mybmw/README.md
index d0dc7a475f3ae..36f70c3103f4c 100644
--- a/bundles/org.openhab.binding.mybmw/README.md
+++ b/bundles/org.openhab.binding.mybmw/README.md
@@ -1,25 +1,25 @@
 # MyBMW Binding
 
 The binding provides access like [MyBMW App](https://www.bmw.com/en/footer/mybmw-app.html) to openHAB.
-All vehicles connected to an account will be detected by the discovery with the correct type: 
+All vehicles connected to an account will be detected by the discovery with the correct type:
 
-* Conventional Fuel Vehicle
-* Plugin-Hybrid Electrical Vehicle 
-* Battery Electric Vehicle with Range Extender
-* Battery Electric Vehicle 
+- Conventional Fuel Vehicle
+- Plugin-Hybrid Electrical Vehicle
+- Battery Electric Vehicle with Range Extender
+- Battery Electric Vehicle
 
 In addition properties are attached with information and services provided by this vehicle.
-The provided data depends on 
+The provided data depends on
 
-1. the [Thing Type](#things) and 
-2. the [Properties](#properties) mentioned in Services
+1. the [Thing Type](#things) and
+1. the [Properties](#properties) mentioned in Services
 
 Different channel groups are clustering all information.
 Check for each group if it's supported by your vehicle.
 
-Please note **this isn't a real-time binding**. 
-If a door is opened the state isn't transmitted and changed immediately. 
-It's not a flaw in the binding itself because the state in BMW's own MyBMW App is also updated with some delay. 
+Please note **this isn't a real-time binding**.
+If a door is opened the state isn't transmitted and changed immediately.
+It's not a flaw in the binding itself because the state in BMW's own MyBMW App is also updated with some delay.
 
 ## Supported Things
 
@@ -31,14 +31,13 @@ The bridge establishes the connection between BMW API and openHAB.
 |----------------------------|----------------|------------------------------------------|
 | MyBMW Account              | `account`      | Access to BMW API for a specific user    |
 
-
 ### Things
 
-Four different vehicle types are provided. 
-They differ in the supported channel groups & channels. 
-Conventional Fuel Vehicles don't provide e.g. _Charging Profile_, Electric Vehicles don't provide a _Fuel Range_. 
+Four different vehicle types are provided.
+They differ in the supported channel groups & channels.
+Conventional Fuel Vehicles don't provide e.g. _Charging Profile_, Electric Vehicles don't provide a _Fuel Range_.
 For hybrid vehicles in addition to _Fuel and Electric Range_ the _Hybrid Range_ is shown.
- 
+
 | Name                                | Thing Type ID | Supported Channel Groups                                            |
 |-------------------------------------|---------------|---------------------------------------------------------------------|
 | BMW Electric Vehicle                | `bev`         | Vehicle with electric drive train                                   |
@@ -46,21 +45,20 @@ For hybrid vehicles in addition to _Fuel and Electric Range_ the _Hybrid Range_
 | BMW Plug-In-Hybrid Electric Vehicle | `phev`        | Vehicle with combustion and electric drive train                    |
 | BMW Conventional Vehicle            | `conv`        | Vehicle with combustion drive train                                 |
 
- 
 #### Properties
 
 <img align="right" src="./doc/vehicle-properties.png" width="500" height="350"/>
 
-For each vehicle properties are available. 
+For each vehicle properties are available.
 Basic information is given regarding
 
-* Vehicle properties like model type, drive train and construction year
-* Which services are available / not available
+- Vehicle properties like model type, drive train and construction year
+- Which services are available / not available
 
-In the right picture can see in *remoteServicesEnabled* e.g. the *Door Lock* and *Door Unlock* services are mentioned. 
+In the right picture can see in _remoteServicesEnabled_ e.g. the _Door Lock_ and _Door Unlock_ services are mentioned.
 This ensures channel group [Remote Services](#remote-services) is supporting door lock and unlock remote control.
 
-In *Services Supported* the entry *ChargingHistory* is mentioned.
+In _Services Supported_ the entry _ChargingHistory_ is mentioned.
 So it's valid to connect channel group [Charge Sessions](#charge-sessions) in order to display your last charging sessions.
 
 | Property Key           | Property Value      |  Supported Channel Groups    |
@@ -68,12 +66,11 @@ So it's valid to connect channel group [Charge Sessions](#charge-sessions) in or
 | servicesSupported      | ChargingHistory     | session                      |
 | remoteServicesEnabled  | _list of services_  | remote                       |
 
-
 ## Discovery
 
-Auto discovery is starting after the bridge is created. 
+Auto discovery is starting after the bridge is created.
 A list of your registered vehicles is queried and all found things are added in the inbox.
-Unique identifier is the *Vehicle Identification Number* (VIN). 
+Unique identifier is the _Vehicle Identification Number_ (VIN).
 If a thing is already declared in a  _.things_ configuration, discovery won't highlight it again.
 Properties will be attached to predefined vehicles if the VIN is matching.
 
@@ -81,7 +78,7 @@ Properties will be attached to predefined vehicles if the VIN is matching.
 
 ### Bridge Configuration
 
-| Parameter       | Type    | Description                                                        |           
+| Parameter       | Type    | Description                                                        |
 |-----------------|---------|--------------------------------------------------------------------|
 | userName        | text    | MyBMW Username                                                     |
 | password        | text    | MyBMW Password                                                     |
@@ -89,53 +86,49 @@ Properties will be attached to predefined vehicles if the VIN is matching.
 
 The region Configuration has 3 different options
 
-* _NORTH_AMERICA_
-* _CHINA_
-* _ROW_  (Rest of World)
-
+- _NORTH_AMERICA_
+- _CHINA_
+- _ROW_  (Rest of World)
 
 #### Advanced Configuration
 
-| Parameter       | Type    | Description                                             |           
+| Parameter       | Type    | Description                                             |
 |-----------------|---------|---------------------------------------------------------|
 | language        | text    | Channel data can be returned in the desired language    |
 
-Language is predefined as *AUTODETECT*.
+Language is predefined as _AUTODETECT_.
 Some textual descriptions, date and times are delivered based on your local language.
 You can overwrite this setting with lowercase 2-letter [language code reagrding ISO 639](https://www.oracle.com/java/technologies/javase/jdk8-jre8-suported-locales.html)
-So if want your UI in english language place *en* as desired language.
+So if want your UI in english language place _en_ as desired language.
 
 ### Thing Configuration
 
 Same configuration is needed for all things
 
-| Parameter       | Type    | Description                           |           
+| Parameter       | Type    | Description                           |
 |-----------------|---------|---------------------------------------|
 | vin             | text    | Vehicle Identification Number (VIN)   |
 | refreshInterval | integer | Refresh Interval in Minutes           |
 
-
 #### Advanced Configuration
 
-| Parameter       | Type    | Description                       |           
+| Parameter       | Type    | Description                       |
 |-----------------|---------|-----------------------------------|
 | vehicleBrand    | text    | Vehicle Brand like BMW or Mini    |
 
 The _vehicleBrand_ is automatically obtained by the discovery service and shall not be changed.
 If thing is defined manually via *.things file following brands are supported
 
-* BMW
-* MINI
-
+- BMW
+- MINI
 
 ## Channels
 
-There are many channels available for each vehicle. 
+There are many channels available for each vehicle.
 For better overview they are clustered in different channel groups.
 They differ for each vehicle type, build-in sensors and activated services.
 
-
-### Thing Channel Groups 
+### Thing Channel Groups
 
 | Channel Group ID                 | Description                                       | conv | phev | bev_rex | bev |
 |----------------------------------|---------------------------------------------------|------|------|---------|-----|
@@ -152,14 +145,13 @@ They differ for each vehicle type, build-in sensors and activated services.
 | [tires](#tire-pressure)          | Current and wanted pressure for all tires         |  X   |  X   |    X    |  X  |
 | [image](#image)                  | Provides an image of your vehicle                 |  X   |  X   |    X    |  X  |
 
-
 #### Vehicle Status
 
 Reflects overall status of the vehicle.
 
-* Channel Group ID is **status**
-* Available for all vehicles
-* Read-only values
+- Channel Group ID is **status**
+- Available for all vehicles
+- Read-only values
 
 | Channel Label             | Channel ID          | Type          | Description                                    | conv | phev | bev_rex | bev |
 |---------------------------|---------------------|---------------|------------------------------------------------|------|------|---------|-----|
@@ -177,44 +169,44 @@ Reflects overall status of the vehicle.
 
 Overall Door Status values
 
-* _Closed_ - all doors closed
-* _Open_ - at least one door is open
-* _Undef_ - no door data delivered at all
+- _Closed_ - all doors closed
+- _Open_ - at least one door is open
+- _Undef_ - no door data delivered at all
 
 Overall Windows Status values
 
-* _Closed_ - all windows closed
-* _Open_ - at least one window is completely open
-* _Intermediate_ - at least one window is partially open
-* _Undef_ - no window data delivered at all
+- _Closed_ - all windows closed
+- _Open_ - at least one window is completely open
+- _Intermediate_ - at least one window is partially open
+- _Undef_ - no window data delivered at all
 
 Check Control values
 
 Localized String of current active warnings.
 Examples:
 
-* No Issues
-* Multiple Issues
+- No Issues
+- Multiple Issues
 
 Charging Status values
 
-* _Not Charging_
-* _Charging_
-* _Plugged In_
-* _Fully Charged_
+- _Not Charging_
+- _Charging_
+- _Plugged In_
+- _Fully Charged_
 
 Charging Information values
 Localized String of current active charging session
 Examples
 
-* 100% at ~00:43
-* Starts at ~09:00
+- 100% at ~00:43
+- Starts at ~09:00
 
 ##### Vehicle Status Raw Data
 
 The _raw data channel_ is marked as _advanced_ and isn't shown by default.
 Target are advanced users to derive even more data out of BMW API replies.
-As the replies are formatted as JSON use the [JsonPath Transformation Service](https://www.openhab.org/addons/transformations/jsonpath/) to extract data for an item,   
+As the replies are formatted as JSON use the [JsonPath Transformation Service](https://www.openhab.org/addons/transformations/jsonpath/) to extract data for an item,
 
 | Channel Label             | Channel ID          | Type          | Description                                    |
 |---------------------------|---------------------|---------------|------------------------------------------------|
@@ -224,51 +216,50 @@ As the replies are formatted as JSON use the [JsonPath Transformation Service](h
 
 Examples:
 
-_Country ISO Code_
+###### Country ISO Code
 
-```
+```json
 $.properties.originCountryISO
 ```
 
-_Drivers Guide URL_
+###### Drivers Guide URL
 
-```
+```json
 $.driverGuideInfo.androidStoreUrl
 ```
 
 #### Range Data
 
-Based on vehicle type some channels are present or not. 
-Conventional fuel vehicles don't provide *Electric Range* and battery electric vehicles don't show *Fuel Range*.
-Hybrid vehicles have both and in addition *Hybrid Range*.
+Based on vehicle type some channels are present or not.
+Conventional fuel vehicles don't provide _Electric Range_ and battery electric vehicles don't show _Fuel Range_.
+Hybrid vehicles have both and in addition _Hybrid Range_.
 See description [Range vs Range Radius](#range-vs-range-radius) to get more information.
 
-* Channel Group ID is **range**
-* Availability according to table
-* Read-only values
+- Channel Group ID is **range**
+- Availability according to table
+- Read-only values
 
 | Channel Label             | Channel ID              | Type                 | conv | phev | bev_rex | bev |
 |---------------------------|-------------------------|----------------------|------|------|---------|-----|
 | Mileage                   | mileage                 | Number:Length        |  X   |  X   |    X    |  X  |
 | Fuel Range                | range-fuel              | Number:Length        |  X   |  X   |    X    |     |
-| Electric Range            | range-electric          | Number:Length        |      |  X   |    X    |  X  | 
-| Hybrid Range              | range-hybrid            | Number:Length        |      |  X   |    X    |     | 
+| Electric Range            | range-electric          | Number:Length        |      |  X   |    X    |  X  |
+| Hybrid Range              | range-hybrid            | Number:Length        |      |  X   |    X    |     |
 | Battery Charge Level      | soc                     | Number:Dimensionless |      |  X   |    X    |  X  |
-| Remaining Fuel            | remaining-fuel          | Number:Volume        |  X   |  X   |    X    |     | 
-| Fuel Range Radius         | range-radius-fuel       | Number:Length        |  X   |  X   |    X    |     | 
-| Electric Range Radius     | range-radius-electric   | Number:Length        |      |  X   |    X    |  X  | 
-| Hybrid Range Radius       | range-radius-hybrid     | Number:Length        |      |  X   |    X    |     | 
-
+| Remaining Fuel            | remaining-fuel          | Number:Volume        |  X   |  X   |    X    |     |
+| Fuel Range Radius         | range-radius-fuel       | Number:Length        |  X   |  X   |    X    |     |
+| Electric Range Radius     | range-radius-electric   | Number:Length        |      |  X   |    X    |  X  |
+| Hybrid Range Radius       | range-radius-hybrid     | Number:Length        |      |  X   |    X    |     |
 
 #### Doors Details
 
 Detailed status of all doors and windows.
 
-* Channel Group ID is **doors**
-* Available for all vehicles if corresponding sensors are built-in 
-* Read-only values
- 
-| Channel Label              | Channel ID              | Type          | 
+- Channel Group ID is **doors**
+- Available for all vehicles if corresponding sensors are built-in
+- Read-only values
+
+| Channel Label              | Channel ID              | Type          |
 |----------------------------|-------------------------|---------------|
 | Driver Door                | driver-front            | String        |
 | Driver Door Rear           | driver-rear             | String        |
@@ -285,21 +276,20 @@ Detailed status of all doors and windows.
 
 Possible states
 
-* _Undef_ - no status data available
-* _Invalid_ - this door / window isn't applicable for this vehicle
-* _Closed_ - the door / window is closed
-* _Open_ - the door / window is open
-* _Intermediate_ - window in intermediate position, not applicable for doors
-
+- _Undef_ - no status data available
+- _Invalid_ - this door / window isn't applicable for this vehicle
+- _Closed_ - the door / window is closed
+- _Open_ - the door / window is open
+- _Intermediate_ - window in intermediate position, not applicable for doors
 
 #### Check Control
 
 Group for all current active Check Control messages.
 If more than one message is active the channel _name_ contains all active messages as options.
 
-* Channel Group ID is **check**
-* Available for all vehicles
-* Read/Write access
+- Channel Group ID is **check**
+- Available for all vehicles
+- Read/Write access
 
 | Channel Label                   | Channel ID          | Type           | Access     |
 |---------------------------------|---------------------|----------------|------------|
@@ -309,19 +299,18 @@ If more than one message is active the channel _name_ contains all active messag
 
 Severity Levels
 
-* Ok
-* Low
-* Medium
-
+- Ok
+- Low
+- Medium
 
 #### Services
 
 Group for all upcoming services with description, service date and/or service mileage.
 If more than one service is scheduled in the future the channel _name_ contains all future services as options.
 
-* Channel Group ID is **service**
-* Available for all vehicles
-* Read/Write access
+- Channel Group ID is **service**
+- Available for all vehicles
+- Read/Write access
 
 | Channel Label                  | Channel ID          | Type           | Access     |
 |--------------------------------|---------------------|----------------|------------|
@@ -330,33 +319,31 @@ If more than one service is scheduled in the future the channel _name_ contains
 | Service Date                   | date                | DateTime       | Read       |
 | Mileage till Service           | mileage             | Number:Length  | Read       |
 
-
 #### Location
 
 GPS location and heading of the vehicle.
 
-* Channel Group ID is **location**
-* Available for all vehicles with built-in GPS sensor. Function can be enabled/disabled in the head unit
-* Read-only values
+- Channel Group ID is **location**
+- Available for all vehicles with built-in GPS sensor. Function can be enabled/disabled in the head unit
+- Read-only values
 
-| Channel Label       | Channel ID          | Type          | 
+| Channel Label       | Channel ID          | Type          |
 |---------------------|---------------------|---------------|
-| GPS Coordinates     | gps                 | Location      | 
-| Heading             | heading             | Number:Angle  | 
-| Address             | address             | String        | 
-| Distance from Home  | home-distance       | Number:Length | 
+| GPS Coordinates     | gps                 | Location      |
+| Heading             | heading             | Number:Angle  |
+| Address             | address             | String        |
+| Distance from Home  | home-distance       | Number:Length |
 
 #### Remote Services
 
-Remote control of the vehicle. 
-Send a *command* to the vehicle and the *state* is reporting the execution progress.
+Remote control of the vehicle.
+Send a _command_ to the vehicle and the _state_ is reporting the execution progress.
 Only one command can be executed each time.
 Parallel execution isn't supported.
 
-* Channel Group ID is **remote**
-* Available for all commands mentioned in *Services Activated*. See [Vehicle Properties](#properties) for further details
-* Read/Write access
-
+- Channel Group ID is **remote**
+- Available for all commands mentioned in _Services Activated_. See [Vehicle Properties](#properties) for further details
+- Read/Write access
 
 | Channel Label           | Channel ID          | Type    | Access |
 |-------------------------|---------------------|---------|--------|
@@ -365,85 +352,82 @@ Parallel execution isn't supported.
 
 The channel _command_ provides options
 
-* _flash-lights_
-* _vehicle-finder_
-* _door-lock_
-* _door-unlock_
-* _horn-low_
-* _climate-now-start_
-* _climate-now-stop_
+- _flash-lights_
+- _vehicle-finder_
+- _door-lock_
+- _door-unlock_
+- _horn-low_
+- _climate-now-start_
+- _climate-now-stop_
 
 The channel _state_ shows the progress of the command execution in the following order
 
-1) _initiated_ 
-2) _pending_
-3) _delivered_
-4) _executed_
-
+1. _initiated_
+1. _pending_
+1. _delivered_
+1. _executed_
 
 #### Charge Profile
 
 Charging options with date and time for preferred time windows and charging modes.
 
-* Channel Group ID is **profile**
-* Available for electric and hybrid vehicles
-* Read access for UI. 
-* There are 4 timers *T1, T2, T3 and T4* available. Replace *X* with number 1,2 or 3 to target the correct timer
-
-| Channel Label              | Channel ID                | Type     | 
-|----------------------------|---------------------------|----------| 
-| Charge Mode                | mode                      | String   | 
-| Charge Preferences         | prefs                     | String   | 
-| Charging Plan              | control                   | String   | 
-| SoC Target                 | target                    | String   | 
-| Charging Energy Limited    | limit                     | Switch   | 
-| Window Start Time          | window-start              | DateTime | 
-| Window End Time            | window-end                | DateTime | 
-| A/C at Departure           | climate                   | Switch   | 
-| T*X* Enabled               | timer*X*-enabled          | Switch   | 
-| T*X* Departure Time        | timer*X*-departure        | DateTime | 
-| T*X* Monday                | timer*X*-day-mon          | Switch   | 
-| T*X* Tuesday               | timer*X*-day-tue          | Switch   | 
-| T*X* Wednesday             | timer*X*-day-wed          | Switch   | 
-| T*X* Thursday              | timer*X*-day-thu          | Switch   | 
-| T*X* Friday                | timer*X*-day-fri          | Switch   | 
-| T*X* Saturday              | timer*X*-day-sat          | Switch   | 
-| T*X* Sunday                | timer*X*-day-sun          | Switch   | 
+- Channel Group ID is **profile**
+- Available for electric and hybrid vehicles
+- Read access for UI.
+- There are 4 timers _T1, T2, T3 and T4_ available. Replace _X_ with number 1,2 or 3 to target the correct timer
+
+| Channel Label              | Channel ID                | Type     |
+|----------------------------|---------------------------|----------|
+| Charge Mode                | mode                      | String   |
+| Charge Preferences         | prefs                     | String   |
+| Charging Plan              | control                   | String   |
+| SoC Target                 | target                    | String   |
+| Charging Energy Limited    | limit                     | Switch   |
+| Window Start Time          | window-start              | DateTime |
+| Window End Time            | window-end                | DateTime |
+| A/C at Departure           | climate                   | Switch   |
+| T_X_ Enabled               | timer_X_-enabled          | Switch   |
+| T_X_ Departure Time        | timer_X_-departure        | DateTime |
+| T_X_ Monday                | timer_X_-day-mon          | Switch   |
+| T_X_ Tuesday               | timer_X_-day-tue          | Switch   |
+| T_X_ Wednesday             | timer_X_-day-wed          | Switch   |
+| T_X_ Thursday              | timer_X_-day-thu          | Switch   |
+| T_X_ Friday                | timer_X_-day-fri          | Switch   |
+| T_X_ Saturday              | timer_X_-day-sat          | Switch   |
+| T_X_ Sunday                | timer_X_-day-sun          | Switch   |
 
 The channel _profile-mode_ supports
 
-* *immediateCharging*
-* *delayedCharging*
+- _immediateCharging_
+- _delayedCharging_
 
 The channel _profile-prefs_ supports
 
-* *noPreSelection*
-* *chargingWindow*
-
+- _noPreSelection_
+- _chargingWindow_
 
 #### Charge Statistics
 
 Shows charge statistics of the current month
 
-* Channel Group ID is **statistic**
-* Available for electric and hybrid vehicles 
-* Read-only values
- 
-| Channel Label              | Channel ID              | Type           | 
+- Channel Group ID is **statistic**
+- Available for electric and hybrid vehicles
+- Read-only values
+
+| Channel Label              | Channel ID              | Type           |
 |----------------------------|-------------------------|----------------|
 | Charge Statistic Month     | title                   | String         |
 | Energy Charged             | energy                  | Number:Energy  |
 | Charge Sessions            | sessions                | Number         |
 
-
 #### Charge Sessions
 
 Group for past charging sessions.
 If more than one message is active the channel _name_ contains all active messages as options.
 
-* Channel Group ID is **session**
-* Available for electric and hybrid vehicles
-* Read-only values
+- Channel Group ID is **session**
+- Available for electric and hybrid vehicles
+- Read-only values
 
 | Channel Label                   | Channel ID   | Type     |
 |---------------------------------|--------------|----------|
@@ -453,16 +437,15 @@ If more than one message is active the channel _name_ contains all active messag
 | Issues during Session           | issue        | String   |
 | Session Status                  | status       | String   |
 
-
 #### Tire Pressure
 
 Current and target tire pressure values
 
-* Channel Group ID is **tires**
-* Available for all vehicles if corresponding sensors are built-in 
-* Read-only values
- 
-| Channel Label              | Channel ID              | Type             | 
+- Channel Group ID is **tires**
+- Available for all vehicles if corresponding sensors are built-in
+- Read-only values
+
+| Channel Label              | Channel ID              | Type             |
 |----------------------------|-------------------------|------------------|
 | Front Left                 | fl-current              | Number:Pressure  |
 | Front Left Target          | fl-target               | Number:Pressure  |
@@ -473,14 +456,13 @@ Current and target tire pressure values
 | Rear Right                 | rr-current              | Number:Pressure  |
 | Rear Right Target          | rr-target               | Number:Pressure  |
 
-
 #### Image
 
-Image representation of the vehicle. 
+Image representation of the vehicle.
 
-* Channel Group ID is **image**
-* Available for all vehicles
-* Read/Write access
+- Channel Group ID is **image**
+- Available for all vehicles
+- Read/Write access
 
 | Channel Label              | Channel ID          | Type   |  Access  |
 |----------------------------|---------------------|--------|----------|
@@ -489,11 +471,10 @@ Image representation of the vehicle.
 
 Possible view ports:
 
-* _VehicleStatus_ Front Side View
-* _VehicleInfo_ Front View
-* _ChargingHistory_ Side View
-* _Default_ Front Side View
-
+- _VehicleStatus_ Front Side View
+- _VehicleInfo_ Front View
+- _ChargingHistory_ Side View
+- _Default_ Front Side View
 
 ## Further Descriptions
 
@@ -503,35 +484,34 @@ Possible view ports:
 
 There are 3 occurrences of dynamic data delivered
 
-* Upcoming Services delivered in group [Services](#services)
-* Check Control Messages delivered in group [Check Control](#check-control)
-* Charging Session data delivered in group [Charge Sessions](#charge-sessions)
+- Upcoming Services delivered in group [Services](#services)
+- Check Control Messages delivered in group [Check Control](#check-control)
+- Charging Session data delivered in group [Charge Sessions](#charge-sessions)
 
-The channel id _name_ shows the first element as default. 
-All other possibilities are attached as options. 
-The picture on the right shows the _Session Title_ item and 3 possible options. 
+The channel id _name_ shows the first element as default.
+All other possibilities are attached as options.
+The picture on the right shows the _Session Title_ item and 3 possible options.
 Select the desired service and the corresponding Charge Session with _Energy Charged_, _Session Status_ and _Session Issues_ will be shown.  
 
 ### TroubleShooting
 
 BMW has a high range of vehicles supported by their API.
-In case of any issues with this binding help to resolve it! 
+In case of any issues with this binding help to resolve it!
 Please perform the following steps:
 
-* Can you log into MyBMW App with your credentials? 
-* Is the vehicle listed in your account? 
-* Is the [MyBMW Brige](#bridge) status _Online_?
+- Can you log into MyBMW App with your credentials?
+- Is the vehicle listed in your account?
+- Is the [MyBMW Brige](#bridge) status _Online_?
 
-If these preconditions are fulfilled proceed with the fingerprint generation. 
+If these preconditions are fulfilled proceed with the fingerprint generation.
 
 #### Generate Debug Fingerprint
 
 <img align="right" src="./doc/DiscoveryScan.png" width="400" height="350"/>
 
-
 First [enable debug logging](https://www.openhab.org/docs/administration/logging.html#defining-what-to-log) for the binding.
 
-```
+```shell
 log:set DEBUG org.openhab.binding.mybmw
 ```
 
@@ -540,48 +520,47 @@ To force a new fingerprint perform a _Scan_ for MyBMW things.
 Personal data is eliminated from the log entries so it should be possible to share them in public.
 Data like
 
-* Vehicle Identification Number (VIN)
-* Location data
+- Vehicle Identification Number (VIN)
+- Location data
 
 are anonymized.
 You'll find the fingerprint in the logs with the command
 
-```
+```shell
 grep "Discovery Fingerprint Data" openhab.log
 ```
 
 After the corresponding fingerprint is generated please [follow the instructions to raise an issue](https://community.openhab.org/t/how-to-file-an-issue/68464) and attach the fingerprint data!
 Your feedback is highly appreciated!
 
-
 ### Range vs Range Radius
 
 <img align="right" src="./doc/range-radius.png" width="400" height="350"/>
 
-You will observe differences in the vehicle range and range radius values. 
+You will observe differences in the vehicle range and range radius values.
 While range is indicating the possible distance to be driven on roads the range radius indicates the reachable range on the map.
 
-The right picture shows the distance between Kassel and Frankfurt in Germany. 
+The right picture shows the distance between Kassel and Frankfurt in Germany.
 While the air-line distance is 145 kilometers the route distance is 192 kilometers.
 So range value is the normal remaining range while the range radius values can be used e.g. on [Mapview](https://www.openhab.org/docs/ui/sitemaps.html#element-type-mapview) to indicate the reachable range on map.
 Please note this is just an indicator of the effective range.
-Especially for electric vehicles it depends on many factors like driving style and usage of electric consumers. 
+Especially for electric vehicles it depends on many factors like driving style and usage of electric consumers.
 
 ## Full Example
 
-The example is based on a BMW i3 with range extender (REX). 
+The example is based on a BMW i3 with range extender (REX).
 Exchange configuration parameters in the Things section
 
-* 4711 - any id you want
-* YOUR_USERNAME - with your MyBMW login username
-* YOUR_PASSWORD - with your MyBMW password credentials
-* VEHICLE_VIN - the vehicle identification number
+- 4711 - any id you want
+- YOUR_USERNAME - with your MyBMW login username
+- YOUR_PASSWORD - with your MyBMW password credentials
+- VEHICLE_VIN - the vehicle identification number
 
-In addition search for all occurrences of *i3* and replace it with your Vehicle Identification like *x3* or *535d* and you're ready to go!
+In addition search for all occurrences of _i3_ and replace it with your Vehicle Identification like _x3_ or _535d_ and you're ready to go!
 
 ### Things File
 
-```
+```java
 Bridge mybmw:account:4711   "MyBMW Account" [userName="YOUR_USERNAME",password="YOUR_PASSWORD",region="ROW"] {
          Thing bev_rex i3       "BMW i3 94h REX"                [ vin="VEHICLE_VIN",refreshInterval=5,vehicleBrand="BMW"]
 }
@@ -589,7 +568,7 @@ Bridge mybmw:account:4711   "MyBMW Account" [userName="YOUR_USERNAME",password="
 
 ### Items File
 
-```
+```java
 Number:Length           i3Mileage                 "Odometer [%d %unit%]"                        <line>          (i3)        {channel="mybmw:bev_rex:4711:i3:range#mileage" }                                                                           
 Number:Length           i3Range                   "Range [%d %unit%]"                           <motion>        (i3)        {channel="mybmw:bev_rex:4711:i3:range#hybrid"}
 Number:Length           i3RangeElectric           "Electric Range [%d %unit%]"                  <motion>        (i3,long)   {channel="mybmw:bev_rex:4711:i3:range#electric"}   
@@ -710,7 +689,7 @@ String                  i3ImageViewport           "Image Viewport [%s]"
 
 ### Sitemap File
 
-```
+```perl
 sitemap BMW label="BMW" {
   Frame label="BMW i3" {
     Image  item=i3Image  
@@ -842,5 +821,4 @@ sitemap BMW label="BMW" {
 
 ## Credits
 
-This work is based on the project of [Bimmer Connected](https://github.com/bimmerconnected/bimmer_connected). 
-
+This work is based on the project of [Bimmer Connected](https://github.com/bimmerconnected/bimmer_connected).
diff --git a/bundles/org.openhab.binding.mycroft/README.md b/bundles/org.openhab.binding.mycroft/README.md
index 5ad2007c9c2cd..2b0ca0cd26dbd 100644
--- a/bundles/org.openhab.binding.mycroft/README.md
+++ b/bundles/org.openhab.binding.mycroft/README.md
@@ -12,7 +12,6 @@ Possibilies include:
 - React to all the aforementioned events ...
 - ... and send/receive any other kind of messages on the message bus
 
-
 ## Supported Things
 
 The only thing managed by this binding is a Mycroft instance
@@ -21,19 +20,16 @@ The only thing managed by this binding is a Mycroft instance
 |--------------------|----------------------------------------------------------------------------|
 |   mycroft          |    A Mark I/II, a Picroft, or any other variant exposing the message bus   |
 
-
-
 ## Discovery
 
 There is no discovery service, as Mycroft doesn't announce itself on the network.
 
-
 ## Thing Configuration
 
 The configuration is simple, as you just need to give the IP/hostname of the Mycroft instance accessible on the network.
 The default port is 8181, which can be changed.
 
-```
+```java
 Thing mycroft:mycroft:myMycroft "Mycroft A.I." @ "Living Room" [host="192.168.X.X"]
 ```
 
@@ -43,12 +39,10 @@ Thing mycroft:mycroft:myMycroft "Mycroft A.I." @ "Living Room" [host="192.168.X.
 | port                     | integer                | Port to reach Mycroft (default 8181)                             |   No      |
 | volume_restoration_level | integer                | When unmuted, force Mycroft to restore volume to this value      |   No      |
 
-
 ## Channels
 
 A Mycroft thing has the following channels:
 
-
 | channel type id              | Item type | description                                                                                    |
 |------------------------------|-----------|------------------------------------------------------------------------------------------------|
 | listen                       | Switch    | Switch to ON when Mycroft is listening. Can simulate a wake word detection to trigger the STT  |
@@ -59,14 +53,12 @@ A Mycroft thing has the following channels:
 | volume                       | Dimmer    | The volume of the Mycroft speaker. (Note : Value unreliable until a volume change occured)     |
 | full_message                 | String    | The last message (full json) seen on the Mycroft Bus. Filtered by the messageTypes properties  |
 
-
 The channel 'full_message' has the following configuration available:
 
 | property      |  type                           | description                                                             | mandatory |
 |---------------|---------------------------------|-------------------------------------------------------------------------|-----------|
 | messageTypes  | List of string, comma separated | Only these message types will be forwarded to the Full Message Channel  |   No      |
 
-
 ## Full Example
 
 A manual setup through a `things/mycroft.things` file could look like this:
@@ -98,7 +90,7 @@ String myMycroft_fullmessage           "Full JSON message"         { channel="my
 
 A `demo.sitemap` file:
 
-```
+```perl
 sitemap demo label="myMycroft"
 {
     Frame label="myMycroft" {
@@ -113,7 +105,6 @@ sitemap demo label="myMycroft"
 }
 ```
 
-
 ### Ask Mycroft to say something
 
 mycroft.rules
diff --git a/bundles/org.openhab.binding.myq/README.md b/bundles/org.openhab.binding.myq/README.md
index 88407bde2d3f4..510285cfa6ce8 100644
--- a/bundles/org.openhab.binding.myq/README.md
+++ b/bundles/org.openhab.binding.myq/README.md
@@ -40,7 +40,7 @@ Once an account has been added, garage doors and lamps will automatically be dis
 
 ### Thing Configuration
 
-```xtend
+```java
 Bridge myq:account:home "MyQ Account" [ username="foo@bar.com", password="secret", refreshInterval=60 ] {
     Thing garagedoor abcd12345 "MyQ Garage Door" [ serialNumber="abcd12345" ]
     Thing lamp efgh6789 "MyQ Lamp" [ serialNumber="efgh6789" ]
@@ -49,7 +49,7 @@ Bridge myq:account:home "MyQ Account" [ username="foo@bar.com", password="secret
 
 ### Items
 
-```xtend
+```java
 String MyQGarageDoor1Status "Door Status [%s]" {channel = "myq:garagedoor:home:abcd12345:status"}
 Switch MyQGarageDoor1Switch "Door Switch [%s]" {channel = "myq:garagedoor:home:abcd12345:switch"}
 Switch MyQGarageDoor1CloseError "Door Close Error [%s]" {channel = "myq:garagedoor:home:abcd12345:closeError"}
@@ -61,7 +61,7 @@ Switch MyQGarageDoorLamp "Lamp [%s]" {channel = "myq:lamp:home:efgh6789:switch"}
 
 ### Sitemaps
 
-```xtend
+```perl
 sitemap MyQ label="MyQ Demo Sitemap" {
   Frame label="Garage Door" {
     String item=MyQGarageDoor1Status
diff --git a/bundles/org.openhab.binding.mystrom/README.md b/bundles/org.openhab.binding.mystrom/README.md
index b73f1dcd6c76a..7a42372fe6166 100644
--- a/bundles/org.openhab.binding.mystrom/README.md
+++ b/bundles/org.openhab.binding.mystrom/README.md
@@ -19,7 +19,6 @@ According to the myStrom API documentation all request specific to the myStrom B
 
 This extension does not support autodiscovery. The things need to be added manually.
 
-
 ## Thing Configuration
 
 The following parameters are valid for all thing types:
@@ -68,14 +67,14 @@ Disabling/enabling the thing can be used to update the properties.
 
 ### Thing Configuration
 
-```
+```java
 Thing mystrom:mystromplug:d6217a31 "Plug" [hostname="hostname|ip"]
 ```
 
 ### Item Configuration
 
-```
-Switch PlugSwitch		"Plug" 	                		 		{channel="mystrom:mystromplug:d6217a31:switch"}
+```java
+Switch PlugSwitch  "Plug"                       {channel="mystrom:mystromplug:d6217a31:switch"}
 Number:Temperature PlugTemperature "Temperature: [%.1f °C]"     {channel="mystrom:mystromplug:d6217a31:temperature"}  
 Number:Power PlugPower "Power: [%.1f W]"                        {channel="mystrom:mystromplug:d6217a31:power"} 
 
@@ -83,7 +82,7 @@ Number:Power PlugPower "Power: [%.1f W]"                        {channel="mystro
 
 ### Sitemap Configuration
 
-```
+```perl
 Frame label="myStrom Plug" { 
     Switch item=PlugSwitch
     Text item=PlugTemperature

From 02398b14a38b5b4299cc07c2893c0c4e80199c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Austvik?= <jaustvik@acm.org>
Date: Thu, 8 Dec 2022 22:39:45 +0100
Subject: [PATCH 05/48] [Nanoleaf] Support lines (#13881)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lines is a Nanoleaf shape we haven't been able to test earlier.

Now we have tested them, and added support for painting them as well.

They do unfortunately not support touch gestures.

Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
---
 .../org.openhab.binding.nanoleaf/README.md    |   4 +-
 .../nanoleaf/internal/layout/ShapeType.java   |   4 +-
 .../internal/layout/shape/NoDraw.java         |  50 +++++++
 .../internal/layout/shape/PanelFactory.java   |  12 +-
 .../internal/layout/shape/SingleLine.java     | 128 ++++++++++++++++++
 .../internal/layout/NanoleafLayoutTest.java   |   3 +-
 .../src/test/resources/lines.json             |   1 +
 7 files changed, 195 insertions(+), 7 deletions(-)
 create mode 100644 bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/NoDraw.java
 create mode 100644 bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/SingleLine.java
 create mode 100644 bundles/org.openhab.binding.nanoleaf/src/test/resources/lines.json

diff --git a/bundles/org.openhab.binding.nanoleaf/README.md b/bundles/org.openhab.binding.nanoleaf/README.md
index c6226731fedd9..df5d8f52a9d8c 100644
--- a/bundles/org.openhab.binding.nanoleaf/README.md
+++ b/bundles/org.openhab.binding.nanoleaf/README.md
@@ -33,8 +33,8 @@ You can set the **color** for each panel and in the case of a Nanoleaf Canvas or
 | Shapes Mini Triangles  | NL48 | Mini Triangles                                             |     X     |       X       |
 | Elements Hexagon       | NL52 | Elements Hexagons                                          |     X     |       X       |
 | Smart Bulb             | NL45 | Smart Bulb                                                 |     -     |               |
-| Lightstrip             | NL55 | Lightstrip                                                 |     -     |               |
-| Lines                  | NL59 | Lines                                                      |     -     |               |
+| Lightstrip             | NL55 | Lightstrip                                                 |     -     |       -       |
+| Lines                  | NL59 | Lines                                                      |     X     |               |
 | Canvas                 | NL29 | Squares                                                    |     X     |       X       |
 
  x  = Supported  (-) = unknown (no device available to test)
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/ShapeType.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/ShapeType.java
index 471dafb362268..4e63d3de46712 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/ShapeType.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/ShapeType.java
@@ -35,9 +35,9 @@ public enum ShapeType {
     SHAPES_CONTROLLER("Controller (Shapes)", 12, 0, 0, 1, DrawingAlgorithm.NONE),
     ELEMENTS_HEXAGON("Elements Hexagon", 14, 134, 6, 1, DrawingAlgorithm.HEXAGON),
     ELEMENTS_HEXAGON_CORNER("Elements Hexagon - Corner", 15, 58, 6, 6, DrawingAlgorithm.CORNER),
-    LINES_CONNECTOR("Lines Connector", 16, 11, 1, 1, DrawingAlgorithm.LINE),
+    LINES_CONNECTOR("Lines Connector", 16, 11, 1, 1, DrawingAlgorithm.NONE),
     LIGHT_LINES("Light Lines", 17, 154, 1, 1, DrawingAlgorithm.LINE),
-    LINES_LINES_SINGLE("Light Lines - Single Sone", 18, 77, 1, 1, DrawingAlgorithm.LINE),
+    LINES_LINES_SINGLE("Light Lines - Single Sone", 18, 77, 2, 2, DrawingAlgorithm.LINE),
     CONTROLLER_CAP("Controller Cap", 19, 11, 0, 1, DrawingAlgorithm.NONE),
     POWER_CONNECTOR("Power Connector", 20, 11, 0, 1, DrawingAlgorithm.NONE);
 
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/NoDraw.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/NoDraw.java
new file mode 100644
index 0000000000000..991066fd62c27
--- /dev/null
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/NoDraw.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.nanoleaf.internal.layout.shape;
+
+import java.awt.Graphics2D;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.nanoleaf.internal.layout.DrawingSettings;
+import org.openhab.binding.nanoleaf.internal.layout.PanelState;
+import org.openhab.binding.nanoleaf.internal.layout.Point2D;
+import org.openhab.binding.nanoleaf.internal.layout.ShapeType;
+
+/**
+ * A panel that shouldn't be drawn (power connector, controller, ...).
+ *
+ * Especially lines can have controllers and power connectors etc on top of each other.
+ *
+ * @author Jørgen Austvik - Initial contribution
+ */
+@NonNullByDefault
+public class NoDraw extends Panel {
+
+    private final Point2D position;
+
+    public NoDraw(ShapeType shapeType, int panelId, Point2D position) {
+        super(shapeType);
+        this.position = position;
+    }
+
+    @Override
+    public List<Point2D> generateOutline() {
+        return Arrays.asList(position);
+    }
+
+    @Override
+    public void draw(Graphics2D graphics, DrawingSettings settings, PanelState state) {
+    }
+}
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/PanelFactory.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/PanelFactory.java
index ec15a0f6743ff..f0425f45b5b3f 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/PanelFactory.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/PanelFactory.java
@@ -81,13 +81,21 @@ private static Panel createPanel(ShapeType shapeType, List<PositionDatum> positi
                 Point2D pos3 = new Point2D(hexShape.getPosX(), hexShape.getPosY());
                 return new Hexagon(shapeType, hexShape.getPanelId(), pos3, hexShape.getOrientation());
 
+            case LINE:
+                return new SingleLine(shapeType, positionDatum);
+
             case CORNER:
                 return new HexagonCorners(shapeType, positionDatum);
 
+            case NONE:
+                PositionDatum noShape = positionDatum.get(0);
+                Point2D pos4 = new Point2D(noShape.getPosX(), noShape.getPosY());
+                return new NoDraw(shapeType, noShape.getPanelId(), pos4);
+
             default:
                 PositionDatum shape = positionDatum.get(0);
-                Point2D pos4 = new Point2D(shape.getPosX(), shape.getPosY());
-                return new Point(shapeType, shape.getPanelId(), pos4);
+                Point2D pos5 = new Point2D(shape.getPosX(), shape.getPosY());
+                return new Point(shapeType, shape.getPanelId(), pos5);
         }
     }
 }
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/SingleLine.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/SingleLine.java
new file mode 100644
index 0000000000000..2097f422a466c
--- /dev/null
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/SingleLine.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.nanoleaf.internal.layout.shape;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Polygon;
+import java.awt.Stroke;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.nanoleaf.internal.layout.DrawingSettings;
+import org.openhab.binding.nanoleaf.internal.layout.ImagePoint2D;
+import org.openhab.binding.nanoleaf.internal.layout.PanelState;
+import org.openhab.binding.nanoleaf.internal.layout.Point2D;
+import org.openhab.binding.nanoleaf.internal.layout.ShapeType;
+import org.openhab.binding.nanoleaf.internal.model.PositionDatum;
+import org.openhab.core.library.types.HSBType;
+
+/**
+ * A single line.
+ *
+ * @author Jørgen Austvik - Initial contribution
+ */
+@NonNullByDefault
+public class SingleLine extends Panel {
+
+    private static final int CORNER_DIAMETER = 4;
+    private static final int LINE_WIDTH = 6;
+
+    private final List<PositionDatum> corners;
+
+    public SingleLine(ShapeType shapeType, List<PositionDatum> corners) {
+        super(shapeType);
+
+        this.corners = Collections.unmodifiableList(new ArrayList<>(corners));
+    }
+
+    @Override
+    public List<Point2D> generateOutline() {
+        List<Point2D> result = new ArrayList<>(corners.size());
+        for (PositionDatum corner : corners) {
+            result.add(new Point2D(corner.getPosX(), corner.getPosY()));
+        }
+
+        return result;
+    }
+
+    @Override
+    public void draw(Graphics2D graphics, DrawingSettings settings, PanelState state) {
+        List<ImagePoint2D> outline = settings.generateImagePoints(generateOutline());
+        Polygon p = new Polygon();
+        for (int i = 0; i < outline.size(); i++) {
+            ImagePoint2D pos = outline.get(i);
+            p.addPoint(pos.getX(), pos.getY());
+        }
+
+        if (settings.shouldFillWithColor()) {
+            Color corner1Color = getColor(corners.get(0).getPanelId(), state);
+            Color corner2Color = getColor(corners.get(0).getPanelId(), state);
+
+            ImagePoint2D center = findCenter(outline);
+
+            Stroke oldStroke = graphics.getStroke();
+            Stroke lineStroke = new BasicStroke(LINE_WIDTH, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+            graphics.setStroke(lineStroke);
+            graphics.setColor(corner1Color);
+            graphics.drawLine(outline.get(0).getX(), outline.get(0).getY(), center.getX(), center.getY());
+            graphics.setColor(corner2Color);
+            graphics.drawLine(outline.get(1).getX(), outline.get(1).getY(), center.getX(), center.getY());
+            graphics.setStroke(oldStroke);
+        }
+
+        if (settings.shouldDrawOutline()) {
+            graphics.setColor(settings.getOutlineColor());
+            graphics.drawPolygon(p);
+        }
+
+        if (settings.shouldDrawCorners()) {
+            for (PositionDatum corner : corners) {
+                ImagePoint2D position = settings.generateImagePoint(new Point2D(corner.getPosX(), corner.getPosY()));
+                graphics.setColor(getColor(corner.getPanelId(), state));
+                graphics.fillOval(position.getX() - CORNER_DIAMETER / 2, position.getY() - CORNER_DIAMETER / 2,
+                        CORNER_DIAMETER, CORNER_DIAMETER);
+
+                if (settings.shouldDrawOutline()) {
+                    graphics.setColor(settings.getOutlineColor());
+                    graphics.drawOval(position.getX() - CORNER_DIAMETER / 2, position.getY() - CORNER_DIAMETER / 2,
+                            CORNER_DIAMETER, CORNER_DIAMETER);
+                }
+            }
+        }
+
+        if (settings.shouldDrawLabels()) {
+            graphics.setColor(settings.getLabelColor());
+
+            for (PositionDatum corner : corners) {
+                ImagePoint2D position = settings.generateImagePoint(new Point2D(corner.getPosX(), corner.getPosY()));
+                graphics.drawString(Integer.toString(corner.getPanelId()), position.getX(), position.getY());
+            }
+        }
+    }
+
+    private ImagePoint2D findCenter(List<ImagePoint2D> outline) {
+        Point2D[] bounds = findBounds(outline);
+        int midX = bounds[0].getX() + (bounds[1].getX() - bounds[0].getX()) / 2;
+        int midY = bounds[0].getY() + (bounds[1].getY() - bounds[0].getY()) / 2;
+        return new ImagePoint2D(midX, midY);
+    }
+
+    private static Color getColor(int panelId, PanelState state) {
+        HSBType color = state.getHSBForPanel(panelId);
+        return new Color(color.getRGB());
+    }
+}
diff --git a/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java b/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
index c6344abd54da0..e7704879424c6 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
@@ -47,7 +47,8 @@ public class NanoleafLayoutTest {
     static @Nullable Path temporaryDirectory;
 
     @ParameterizedTest
-    @ValueSource(strings = { "lasvegas.json", "theduck.json", "squares.json", "wings.json", "spaceinvader.json" })
+    @ValueSource(strings = { "lasvegas.json", "theduck.json", "squares.json", "wings.json", "spaceinvader.json",
+            "lines.json" })
     public void testFile(String fileName) throws Exception {
         Path file = Path.of("src/test/resources/", fileName);
         assertTrue(Files.exists(file), "File should exist: " + file);
diff --git a/bundles/org.openhab.binding.nanoleaf/src/test/resources/lines.json b/bundles/org.openhab.binding.nanoleaf/src/test/resources/lines.json
new file mode 100644
index 0000000000000..592d88627bb89
--- /dev/null
+++ b/bundles/org.openhab.binding.nanoleaf/src/test/resources/lines.json
@@ -0,0 +1 @@
+{"name":"Lines","serialNo":"S1234567","manufacturer":"Nanoleaf","firmwareVersion":"7.1.0","hardwareVersion":"0.0.4-0","model":"NL59","discovery":null,"effects":{"effectsList":["Beat Drop","Cotton Candy","Cozy Blaze","Fiesta","Good Vibes","Hip Hop","Jalapeno Heat","Kaleidoscope","Mountain Air","Mystic Night","Neon Dreams","Northern Lights","Pop Rocks","Prism","Radioactive","Raspberry Lemonade","Sakura Blossom","Starry Sky","Tuscany Sunset","Waterfall"],"select":"Raspberry Lemonade"},"firmwareUpgrade":null,"panelLayout":{"globalOrientation":{"value":88,"max":360,"min":0},"layout":{"numPanels":13,"sideLength":154,"positionData":[{"panelId":15376,"x":227,"y":337,"o":0,"shapeType":20},{"panelId":12105,"x":227,"y":212,"o":0,"shapeType":18},{"panelId":56841,"x":227,"y":289,"o":0,"shapeType":18},{"panelId":24127,"x":227,"y":164,"o":120,"shapeType":16},{"panelId":55776,"x":119,"y":274,"o":300,"shapeType":18},{"panelId":10400,"x":185,"y":313,"o":300,"shapeType":18},{"panelId":54069,"x":77,"y":250,"o":180,"shapeType":16},{"panelId":6876,"x":119,"y":226,"o":240,"shapeType":18},{"panelId":35357,"x":185,"y":188,"o":240,"shapeType":18},{"panelId":45376,"x":77,"y":125,"o":0,"shapeType":18},{"panelId":16384,"x":77,"y":202,"o":0,"shapeType":18},{"panelId":49828,"x":77,"y":77,"o":300,"shapeType":16},{"panelId":5591,"x":227,"y":337,"o":0,"shapeType":19}]}},"qkihnokomhartlnp":{},"schedules":{},"state":{"brightness":{"value":63,"max":100,"min":0},"colorMode":"effect","ct":{"value":4000,"max":6500,"min":1200},"hue":{"value":0,"max":360,"min":0},"on":{"value":true},"sat":{"value":0,"max":100,"min":0}}}

From 3e66cd1b33c623e6dccd100122d7477d3dcdeeea Mon Sep 17 00:00:00 2001
From: lsiepel <leosiepel@gmail.com>
Date: Thu, 8 Dec 2022 22:44:44 +0100
Subject: [PATCH 06/48] [TR064] Fix SAT warnings (#13873)

* Fix SAT warnings
* Fix markdown
* Properly annotate PhonebookProfileTest

Also-by: Wouter Born <github@maindrain.net>
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
---
 bundles/org.openhab.binding.tr064/README.md              | 4 ++++
 .../tr064/internal/phonebook/Tr064PhonebookImpl.java     | 2 +-
 .../binding/tr064/internal/soap/CallListType.java        | 4 ++++
 .../binding/tr064/internal/soap/SOAPValueConverter.java  | 6 +++---
 .../tr064/internal/phonebook/PhonebookProfileTest.java   | 9 ++++-----
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/bundles/org.openhab.binding.tr064/README.md b/bundles/org.openhab.binding.tr064/README.md
index 16ff47fc72270..9812f390368bc 100644
--- a/bundles/org.openhab.binding.tr064/README.md
+++ b/bundles/org.openhab.binding.tr064/README.md
@@ -7,10 +7,12 @@ Even though textual configuration is possible, it is strongly recommended to use
 ## Supported Things
 
 Two Bridge things are supported:
+
 - `generic`: the internet gateway device itself (generic device)
 - `fritzbox`: similar to `generic` with extensions for AVM FritzBox devices.
 
 Two kind of Things are supported:
+
 - `subDevice`: a sub-device of the Bridge thing (e.g. a WAN interface) 
 - `subDeviceLan`: a special type of sub-device that supports MAC-detection
 
@@ -198,6 +200,7 @@ Example (use all phonebooks, match 5 digits from right):
 val tr064Actions = getActions("tr064","tr064:fritzbox:2a28aee1ee")
 val result = tr064Actions.phonebookLookup("49157712341234", 5)
 ```
+
 ## A note on textual configuration
 
 Textual configuration through a `.things` file is possible but, at present, strongly discouraged because it is significantly more error-prone
@@ -208,6 +211,7 @@ an automatic scan through the user interface first in order to extract the requi
 needed subdevices).
 
 The definition of the bridge and of the subdevices things is the following
+
 ```
 Bridge tr064:fritzbox:rootuid "Root label" @ "location" [ host="192.168.1.1", user="user", password="passwd",
                                                          phonebookInterval="0"]{
diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/Tr064PhonebookImpl.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/Tr064PhonebookImpl.java
index fbaf5fc8a3b71..49ec8e1054f29 100644
--- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/Tr064PhonebookImpl.java
+++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/Tr064PhonebookImpl.java
@@ -63,7 +63,7 @@ private void getPhonebook() {
     // in case there are multiple phone entries with same number -> name mapping, i.e. in phonebooks exported from
     // mobiles containing multiple accounts like: local, cloudprovider1, messenger1, messenger2,...
     private String mergeSameContactNames(String nameA, String nameB) {
-        if (nameA != null && nameA.equals(nameB)) {
+        if (nameA.equals(nameB)) {
             return nameA;
         }
         throw new IllegalStateException(
diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/CallListType.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/CallListType.java
index a1f4b980d7a16..a49a6d9489391 100644
--- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/CallListType.java
+++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/CallListType.java
@@ -12,11 +12,15 @@
  */
 package org.openhab.binding.tr064.internal.soap;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link CallListType} is used for post processing the retrieved call list
  *
  * @author Jan N. Klug - Initial contribution
  */
+
+@NonNullByDefault
 public enum CallListType {
     MISSED_COUNT("2"),
     INBOUND_COUNT("1"),
diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java
index 1c606123867a6..f9ff295ea92be 100644
--- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java
+++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java
@@ -103,11 +103,11 @@ public Optional<String> getSOAPValueFromCommand(Command command, String dataType
                 default:
             }
         } else if (command instanceof StringType) {
-            if (dataType.equals("string")) {
+            if ("string".equals(dataType)) {
                 return Optional.of(command.toString());
             }
         } else if (command instanceof OnOffType) {
-            if (dataType.equals("boolean")) {
+            if ("boolean".equals(dataType)) {
                 return Optional.of(OnOffType.ON.equals(command) ? "1" : "0");
             }
         }
@@ -212,7 +212,7 @@ private State processMacSignalStrength(State state, Tr064ChannelConfig channelCo
     private State processDecaDecibel(State state, Tr064ChannelConfig channelConfig) {
         Float value = state.as(DecimalType.class).floatValue() / 10;
 
-        return new QuantityType(value, Units.DECIBEL);
+        return new QuantityType<>(value, Units.DECIBEL);
     }
 
     /**
diff --git a/bundles/org.openhab.binding.tr064/src/test/java/org/openhab/binding/tr064/internal/phonebook/PhonebookProfileTest.java b/bundles/org.openhab.binding.tr064/src/test/java/org/openhab/binding/tr064/internal/phonebook/PhonebookProfileTest.java
index 1176f0596130f..527ed022644ca 100644
--- a/bundles/org.openhab.binding.tr064/src/test/java/org/openhab/binding/tr064/internal/phonebook/PhonebookProfileTest.java
+++ b/bundles/org.openhab.binding.tr064/src/test/java/org/openhab/binding/tr064/internal/phonebook/PhonebookProfileTest.java
@@ -51,6 +51,7 @@
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
+@NonNullByDefault
 class PhonebookProfileTest {
 
     private static final String INTERNAL_PHONE_NUMBER = "999";
@@ -60,7 +61,6 @@ class PhonebookProfileTest {
     private static final ThingUID THING_UID = new ThingUID(BINDING_ID, THING_TYPE_FRITZBOX.getId(), "test");
     private static final String MY_PHONEBOOK = UIDUtils.encode(THING_UID.getAsString()) + ":MyPhonebook";
 
-    @NonNullByDefault
     public static class ParameterSet {
         public final State state;
         public final State resultingState;
@@ -101,11 +101,10 @@ public static Collection<Object[]> parameters() {
         });
     }
 
-    private @Mock ProfileCallback mockCallback;
-    private @Mock ProfileContext mockContext;
-    private @Mock PhonebookProvider mockPhonebookProvider;
+    private @Mock @NonNullByDefault({}) ProfileCallback mockCallback;
+    private @Mock @NonNullByDefault({}) ProfileContext mockContext;
+    private @Mock @NonNullByDefault({}) PhonebookProvider mockPhonebookProvider;
 
-    @NonNullByDefault
     private final Phonebook phonebook = new Phonebook() {
         @Override
         public Optional<String> lookupNumber(String number, int matchCount) {

From b56ab10e00b0eafb4db5668db08865e3883c18bd Mon Sep 17 00:00:00 2001
From: Cody Cutrer <cody@cutrer.us>
Date: Fri, 9 Dec 2022 00:56:27 -0700
Subject: [PATCH 07/48] [homekit] implement basic command completion (#13878)

just the sub-commands.

since the show command is already a "search", I didn't feel it's super
important to implement on that

Signed-off-by: Cody Cutrer <cody@cutrer.us>
---
 .../internal/HomekitCommandExtension.java     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitCommandExtension.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitCommandExtension.java
index c9b8b79213cc5..4cc5c3446ebad 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitCommandExtension.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitCommandExtension.java
@@ -17,7 +17,10 @@
 import java.util.concurrent.ExecutionException;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.ConsoleCommandCompleter;
+import org.openhab.core.io.console.StringsCompleter;
 import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
 import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.openhab.io.homekit.Homekit;
@@ -43,6 +46,20 @@ public class HomekitCommandExtension extends AbstractConsoleCommandExtension {
     private static final String SUBCMD_ALLOW_UNAUTHENTICATED = "allowUnauthenticated";
     private static final String SUBCMD_PRUNE_DUMMY_ACCESSORIES = "pruneDummyAccessories";
     private static final String SUBCMD_LIST_DUMMY_ACCESSORIES = "listDummyAccessories";
+    private static final StringsCompleter SUBCMD_COMPLETER = new StringsCompleter(
+            List.of(SUBCMD_CLEAR_PAIRINGS, SUBCMD_LIST_ACCESSORIES, SUBCMD_PRINT_ACCESSORY,
+                    SUBCMD_ALLOW_UNAUTHENTICATED, SUBCMD_PRUNE_DUMMY_ACCESSORIES, SUBCMD_LIST_DUMMY_ACCESSORIES),
+            false);
+
+    private class CommandCompleter implements ConsoleCommandCompleter {
+        public boolean complete(String[] args, int cursorArgumentIndex, int cursorPosition, List<String> candidates) {
+            if (cursorArgumentIndex == 0) {
+                boolean result = SUBCMD_COMPLETER.complete(args, cursorArgumentIndex, cursorPosition, candidates);
+                return result;
+            }
+            return false;
+        }
+    }
 
     private final Logger logger = LoggerFactory.getLogger(HomekitCommandExtension.class);
 
@@ -114,6 +131,11 @@ public void setHomekit(Homekit homekit) {
         this.homekit = homekit;
     }
 
+    @Override
+    public @Nullable ConsoleCommandCompleter getCompleter() {
+        return new CommandCompleter();
+    }
+
     private void clearHomekitPairings(Console console) {
         homekit.clearHomekitPairings();
         console.println("Cleared HomeKit pairings");

From 22d5518ff43f96792d217364c4ea4424a5b14b02 Mon Sep 17 00:00:00 2001
From: lsiepel <leosiepel@gmail.com>
Date: Fri, 9 Dec 2022 09:57:17 +0100
Subject: [PATCH 08/48] [livisismarthome] Fix checkstyle (#13883)

* Minor fixes and refactoring
* Fix checkstyle warnings
* Fix new ConcurrentHashMap

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
---
 .../internal/client/GsonOptional.java         |   3 +-
 .../internal/client/LivisiClient.java         |   6 +-
 .../internal/client/URLConnectionFactory.java |   1 -
 .../internal/handler/LivisiBridgeHandler.java |   7 +-
 .../manager/DeviceStructureManager.java       |   7 +-
 .../internal/manager/FullDeviceManager.java   |   5 -
 .../internal/client/URLCreatorTest.java       |   4 +-
 .../handler/LivisiBridgeHandlerTest.java      |   8 +-
 .../handler/LivisiDeviceHandlerTest.java      | 224 +++++++++---------
 9 files changed, 124 insertions(+), 141 deletions(-)

diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/GsonOptional.java b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/GsonOptional.java
index 5c65c9a2a3d11..dac7b7d6a6890 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/GsonOptional.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/GsonOptional.java
@@ -34,10 +34,9 @@ public class GsonOptional {
      */
     private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
 
-    private final Gson gson;
+    private final Gson gson = new GsonBuilder().setDateFormat(DATE_FORMAT).create();
 
     public GsonOptional() {
-        gson = new GsonBuilder().setDateFormat(DATE_FORMAT).create();
     }
 
     public <T> Optional<T> fromJson(String json, Class<T> clazz) throws JsonSyntaxException {
diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/LivisiClient.java b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/LivisiClient.java
index 93aa7650f1961..3669f62dc040c 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/LivisiClient.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/LivisiClient.java
@@ -74,7 +74,7 @@ public class LivisiClient {
 
     private final Logger logger = LoggerFactory.getLogger(LivisiClient.class);
 
-    private final GsonOptional gson;
+    private final GsonOptional gson = new GsonOptional();
     private final LivisiBridgeConfiguration bridgeConfiguration;
     private final OAuthClientService oAuthService;
     private final URLConnectionFactory connectionFactory;
@@ -84,7 +84,6 @@ public LivisiClient(final LivisiBridgeConfiguration bridgeConfiguration, final O
         this.bridgeConfiguration = bridgeConfiguration;
         this.oAuthService = oAuthService;
         this.connectionFactory = connectionFactory;
-        this.gson = new GsonOptional();
     }
 
     /**
@@ -114,7 +113,6 @@ public String refreshStatus() throws IOException {
      * @return response content
      */
     private <T> Optional<T> executeGet(final String url, final Class<T> clazz) throws IOException {
-
         HttpURLConnection connection = createBaseRequest(url, HttpMethod.GET);
         String responseContent = executeRequest(connection);
         return gson.fromJson(responseContent, clazz);
@@ -172,7 +170,6 @@ private String executeRequest(HttpURLConnection connection) throws IOException {
     }
 
     private HttpURLConnection createBaseRequest(String url, HttpMethod httpMethod) throws IOException {
-
         final AccessTokenResponse accessTokenResponse = getAccessTokenResponse();
         return connectionFactory.createBaseRequest(url, httpMethod, accessTokenResponse);
     }
@@ -200,7 +197,6 @@ public AccessTokenResponse getAccessTokenResponse() throws IOException {
      */
     private void handleResponseErrors(final HttpURLConnection connection, final String responseContent)
             throws IOException {
-
         final int status = connection.getResponseCode();
         if (HttpStatus.OK_200 == status) {
             logger.debug("Statuscode is OK: [{}]", connection.getURL());
diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/URLConnectionFactory.java b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/URLConnectionFactory.java
index c3d36de47ca58..42ea3d55667a0 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/URLConnectionFactory.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/client/URLConnectionFactory.java
@@ -41,7 +41,6 @@ public HttpURLConnection createRequest(String url) throws IOException {
 
     public HttpURLConnection createBaseRequest(String url, HttpMethod httpMethod,
             AccessTokenResponse accessTokenResponse) throws IOException {
-
         HttpURLConnection urlConnection = createRequest(url);
         urlConnection.setRequestMethod(httpMethod.asString());
         urlConnection.setRequestProperty(HttpHeader.ACCEPT.asString(), CONTENT_TYPE);
diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/handler/LivisiBridgeHandler.java b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/handler/LivisiBridgeHandler.java
index 176371de0bee4..2b62fe1e1d9fc 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/handler/LivisiBridgeHandler.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/handler/LivisiBridgeHandler.java
@@ -103,7 +103,7 @@ public class LivisiBridgeHandler extends BaseBridgeHandler
     private final Logger logger = LoggerFactory.getLogger(LivisiBridgeHandler.class);
     private final GsonOptional gson = new GsonOptional();
     private final Object lock = new Object();
-    private final Map<String, DeviceStatusListener> deviceStatusListeners;
+    private final Map<String, DeviceStatusListener> deviceStatusListeners = new ConcurrentHashMap<>();
     private final OAuthFactory oAuthFactory;
     private final HttpClient httpClient;
 
@@ -128,7 +128,6 @@ public LivisiBridgeHandler(final Bridge bridge, final OAuthFactory oAuthFactory,
         super(bridge);
         this.oAuthFactory = oAuthFactory;
         this.httpClient = httpClient;
-        deviceStatusListeners = new ConcurrentHashMap<>();
     }
 
     @Override
@@ -564,7 +563,6 @@ public void onError(final Throwable cause) {
      * @param event event
      */
     private void handleStateChangedEvent(final EventDTO event) throws IOException {
-
         // CAPABILITY
         if (event.isLinkedtoCapability()) {
             logger.trace("Event is linked to capability");
@@ -596,7 +594,6 @@ private void handleStateChangedEvent(final EventDTO event) throws IOException {
      * @param event event
      */
     private void handleControllerConnectivityChangedEvent(final EventDTO event) throws IOException {
-
         final Boolean connected = event.getIsConnected();
         if (connected != null) {
             final ThingStatus thingStatus;
@@ -621,7 +618,6 @@ private void handleControllerConnectivityChangedEvent(final EventDTO event) thro
      * @param event event
      */
     private void handleNewMessageReceivedEvent(final MessageEventDTO event) throws IOException {
-
         final MessageDTO message = event.getMessage();
         if (logger.isTraceEnabled()) {
             logger.trace("Message: {}", gson.toJson(message));
@@ -645,7 +641,6 @@ private void handleNewMessageReceivedEvent(final MessageEventDTO event) throws I
      * @param event event
      */
     private void handleMessageDeletedEvent(final EventDTO event) throws IOException {
-
         final String messageId = event.getData().getId();
         logger.debug("handleMessageDeletedEvent with messageId '{}'", messageId);
 
diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/manager/DeviceStructureManager.java b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/manager/DeviceStructureManager.java
index 939d236689d1c..4acbf657d4bb1 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/manager/DeviceStructureManager.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/manager/DeviceStructureManager.java
@@ -15,7 +15,6 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -44,8 +43,8 @@ public class DeviceStructureManager {
     private final Logger logger = LoggerFactory.getLogger(DeviceStructureManager.class);
 
     private final FullDeviceManager deviceManager;
-    private final Map<String, DeviceDTO> deviceMap;
-    private final Map<String, DeviceDTO> capabilityIdToDeviceMap;
+    private final Map<String, DeviceDTO> deviceMap = new ConcurrentHashMap<>();
+    private final Map<String, DeviceDTO> capabilityIdToDeviceMap = new ConcurrentHashMap<>();
     private String bridgeDeviceId = "";
 
     /**
@@ -55,8 +54,6 @@ public class DeviceStructureManager {
      */
     public DeviceStructureManager(FullDeviceManager deviceManager) {
         this.deviceManager = deviceManager;
-        deviceMap = Collections.synchronizedMap(new HashMap<>());
-        capabilityIdToDeviceMap = new ConcurrentHashMap<>();
     }
 
     /**
diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/manager/FullDeviceManager.java b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/manager/FullDeviceManager.java
index 0829b86201699..ae189b2f346ce 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/manager/FullDeviceManager.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/java/org/openhab/binding/livisismarthome/internal/manager/FullDeviceManager.java
@@ -57,7 +57,6 @@ public FullDeviceManager(LivisiClient client) {
      * states. Calling this may take a while...
      */
     public List<DeviceDTO> getFullDevices() throws IOException {
-
         final Map<String, LocationDTO> locationMap = createLocationMap(client);
         final Map<String, CapabilityDTO> capabilityMap = createCapabilityMap(client);
         final Map<String, DeviceStateDTO> deviceStateMap = createDeviceStateMap(client);
@@ -95,7 +94,6 @@ public Optional<DeviceDTO> getFullDeviceById(final String deviceId, final boolea
     private void initializeDevice(DeviceDTO device, @Nullable DeviceStateDTO deviceState,
             Map<String, LocationDTO> locationMap, Map<String, CapabilityDTO> capabilityMap,
             List<MessageDTO> messageList) {
-
         device.setDeviceState(deviceState);
 
         if (isBatteryPowered(device)) {
@@ -136,7 +134,6 @@ private static Map<String, CapabilityStateDTO> createCapabilityStateMap(LivisiCl
     }
 
     private static Map<String, CapabilityDTO> createCapabilityMap(LivisiClient client) throws IOException {
-
         final Map<String, CapabilityStateDTO> capabilityStateMap = createCapabilityStateMap(client);
         final List<CapabilityDTO> capabilityList = client.getCapabilities();
 
@@ -145,7 +142,6 @@ private static Map<String, CapabilityDTO> createCapabilityMap(LivisiClient clien
 
     private static Map<String, CapabilityDTO> createCapabilityMap(String deviceId, LivisiClient client)
             throws IOException {
-
         final Map<String, CapabilityStateDTO> capabilityStateMap = createCapabilityStateMap(client);
         final List<CapabilityDTO> capabilityList = client.getCapabilitiesForDevice(deviceId);
 
@@ -168,7 +164,6 @@ private static Map<String, CapabilityDTO> initializeCapabilities(Map<String, Cap
 
     private static Map<String, CapabilityDTO> createDeviceCapabilityMap(DeviceDTO device,
             Map<String, CapabilityDTO> capabilityMap) {
-
         final HashMap<String, CapabilityDTO> deviceCapabilityMap = new HashMap<>();
         for (final String capabilityValue : device.getCapabilities()) {
             final CapabilityDTO capability = capabilityMap.get(LinkDTO.getId(capabilityValue));
diff --git a/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/client/URLCreatorTest.java b/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/client/URLCreatorTest.java
index b5c1ea6db8d45..e957958bd0b4a 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/client/URLCreatorTest.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/client/URLCreatorTest.java
@@ -31,13 +31,13 @@ public void testCreateEventsURL() {
     }
 
     @Test
-    public void testCreateEventsURL_ClassicController() {
+    public void testCreateEventsURLClassicController() {
         String url = URLCreator.createEventsURL("localhost", "token123", true);
         assertEquals("ws://localhost:8080/events?token=token123", url);
     }
 
     @Test
-    public void testCreateEventsURL_Gen2Controller() {
+    public void testCreateEventsURLGen2Controller() {
         String url = URLCreator.createEventsURL("localhost", "token123", false);
         assertEquals("ws://localhost:9090/events?token=token123", url);
     }
diff --git a/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/handler/LivisiBridgeHandlerTest.java b/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/handler/LivisiBridgeHandlerTest.java
index 632833c8a8b48..132a9ccfb553c 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/handler/LivisiBridgeHandlerTest.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/handler/LivisiBridgeHandlerTest.java
@@ -198,7 +198,7 @@ public void testOnEventDisconnect() throws Exception {
     }
 
     @Test
-    public void testOnDeviceStateChanged_SHC_Classic() {
+    public void testOnDeviceStateChangedSHCClassic() {
         DeviceDTO bridgeDevice = createBridgeDevice(true);
 
         StateDTO state = new StateDTO();
@@ -220,7 +220,7 @@ public void testOnDeviceStateChanged_SHC_Classic() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_SHCA() {
+    public void testOnDeviceStateChangedSHCA() {
         DeviceDTO bridgeDevice = createBridgeDevice(false);
 
         StateDTO state = new StateDTO();
@@ -242,7 +242,7 @@ public void testOnDeviceStateChanged_SHCA() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_SHC_Classic() {
+    public void testOnDeviceStateChangedEventSHCClassic() {
         DeviceDTO bridgeDevice = createBridgeDevice(true);
 
         // Example SHC-Classic-Event
@@ -276,7 +276,7 @@ public void testOnDeviceStateChanged_Event_SHC_Classic() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_SHCA() {
+    public void testOnDeviceStateChangedEventSHCA() {
         DeviceDTO bridgeDevice = createBridgeDevice(false);
 
         EventDTO event = createDeviceEvent(c -> {
diff --git a/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/handler/LivisiDeviceHandlerTest.java b/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/handler/LivisiDeviceHandlerTest.java
index c27b7a2f24b53..463f6940ec5ae 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/handler/LivisiDeviceHandlerTest.java
+++ b/bundles/org.openhab.binding.livisismarthome/src/test/java/org/openhab/binding/livisismarthome/internal/handler/LivisiDeviceHandlerTest.java
@@ -120,7 +120,7 @@ public void testOnDeviceStateChanged() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_IsReachable() {
+    public void testOnDeviceStateChangedIsReachable() {
         DeviceStateDTO deviceState = new DeviceStateDTO();
         deviceState.setReachable(true);
 
@@ -135,7 +135,7 @@ public void testOnDeviceStateChanged_IsReachable() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_IsNotReachable() {
+    public void testOnDeviceStateChangedIsNotReachable() {
         DeviceStateDTO deviceState = new DeviceStateDTO();
         deviceState.setReachable(false);
 
@@ -150,7 +150,7 @@ public void testOnDeviceStateChanged_IsNotReachable() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_IsReachable_VariableActuator() {
+    public void testOnDeviceStateChangedIsReachableVariableActuator() {
         DeviceStateDTO deviceState = new DeviceStateDTO();
         deviceState.setReachable(true);
 
@@ -166,7 +166,7 @@ public void testOnDeviceStateChanged_IsReachable_VariableActuator() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_LowBattery() {
+    public void testOnDeviceStateChangedLowBattery() {
         DeviceDTO device = createDevice();
         device.setIsBatteryPowered(true);
         device.setLowBattery(true);
@@ -178,7 +178,7 @@ public void testOnDeviceStateChanged_LowBattery() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_NoLowBattery() {
+    public void testOnDeviceStateChangedNoLowBattery() {
         DeviceDTO device = createDevice();
         device.setIsBatteryPowered(true);
         device.setLowBattery(false);
@@ -190,7 +190,7 @@ public void testOnDeviceStateChanged_NoLowBattery() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_NotBatteryPowered() {
+    public void testOnDeviceStateChangedNotBatteryPowered() {
         DeviceDTO device = createDevice();
         device.setIsBatteryPowered(false);
 
@@ -201,7 +201,7 @@ public void testOnDeviceStateChanged_NotBatteryPowered() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_VariableActuator_On() {
+    public void testOnDeviceStateChangedVariableActuatorOn() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_VARIABLEACTUATOR, c -> c.setVariableActuatorState(true), device);
 
@@ -212,7 +212,7 @@ public void testOnDeviceStateChanged_VariableActuator_On() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_VariableActuator_Off() {
+    public void testOnDeviceStateChangedVariableActuatorOff() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_VARIABLEACTUATOR, c -> c.setVariableActuatorState(false), device);
 
@@ -223,7 +223,7 @@ public void testOnDeviceStateChanged_VariableActuator_Off() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_VariableActuator_EmptyState() {
+    public void testOnDeviceStateChangedVariableActuatorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_VARIABLEACTUATOR, null, device);
 
@@ -234,7 +234,7 @@ public void testOnDeviceStateChanged_VariableActuator_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_TemperatureSensor_FrostWarning_On() {
+    public void testOnDeviceStateChangedTemperatureSensorFrostWarningOn() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TEMPERATURESENSOR, c -> {
             c.setTemperatureSensorTemperatureState(21.5);
@@ -249,7 +249,7 @@ public void testOnDeviceStateChanged_TemperatureSensor_FrostWarning_On() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_TemperatureSensor_FrostWarning_Off() {
+    public void testOnDeviceStateChangedTemperatureSensorFrostWarningOff() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TEMPERATURESENSOR, c -> {
             c.setTemperatureSensorTemperatureState(21.5);
@@ -264,7 +264,7 @@ public void testOnDeviceStateChanged_TemperatureSensor_FrostWarning_Off() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_TemperatureSensor_EmptyState() {
+    public void testOnDeviceStateChangedTemperatureSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TEMPERATURESENSOR, null, device);
 
@@ -276,7 +276,7 @@ public void testOnDeviceStateChanged_TemperatureSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_ThermostatActuator_WindowReduction_On() {
+    public void testOnDeviceStateChangedThermostatActuatorWindowReductionOn() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_THERMOSTATACTUATOR, c -> {
             c.setThermostatActuatorPointTemperatureState(21.5);
@@ -293,7 +293,7 @@ public void testOnDeviceStateChanged_ThermostatActuator_WindowReduction_On() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_ThermostatActuator_WindowReduction_Off() {
+    public void testOnDeviceStateChangedThermostatActuatorWindowReductionOff() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_THERMOSTATACTUATOR, c -> {
             c.setThermostatActuatorPointTemperatureState(21.5);
@@ -310,7 +310,7 @@ public void testOnDeviceStateChanged_ThermostatActuator_WindowReduction_Off() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_ThermostatActuator_EmptyState() {
+    public void testOnDeviceStateChangedThermostatActuatorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_THERMOSTATACTUATOR, null, device);
 
@@ -323,7 +323,7 @@ public void testOnDeviceStateChanged_ThermostatActuator_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_HumiditySensor_MoldWarning_On() {
+    public void testOnDeviceStateChangedHumiditySensorMoldWarningOn() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_HUMIDITYSENSOR, c -> {
             c.setHumiditySensorHumidityState(35.5);
@@ -338,7 +338,7 @@ public void testOnDeviceStateChanged_HumiditySensor_MoldWarning_On() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_HumiditySensor_MoldWarning_Off() {
+    public void testOnDeviceStateChangedHumiditySensorMoldWarningOff() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_HUMIDITYSENSOR, c -> {
             c.setHumiditySensorHumidityState(35.5);
@@ -353,7 +353,7 @@ public void testOnDeviceStateChanged_HumiditySensor_MoldWarning_Off() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_HumiditySensor_EmptyState() {
+    public void testOnDeviceStateChangedHumiditySensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_HUMIDITYSENSOR, null, device);
 
@@ -365,7 +365,7 @@ public void testOnDeviceStateChanged_HumiditySensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_WindowDoorSensor_Open() {
+    public void testOnDeviceStateChangedWindowDoorSensorOpen() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_WINDOWDOORSENSOR, c -> c.setWindowDoorSensorState(true), device);
 
@@ -376,7 +376,7 @@ public void testOnDeviceStateChanged_WindowDoorSensor_Open() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_WindowDoorSensor_Closed() {
+    public void testOnDeviceStateChangedWindowDoorSensorClosed() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_WINDOWDOORSENSOR, c -> c.setWindowDoorSensorState(false), device);
 
@@ -387,7 +387,7 @@ public void testOnDeviceStateChanged_WindowDoorSensor_Closed() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_WindowDoorSensor_EmptyState() {
+    public void testOnDeviceStateChangedWindowDoorSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_WINDOWDOORSENSOR, null, device);
 
@@ -398,7 +398,7 @@ public void testOnDeviceStateChanged_WindowDoorSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_SmokeDetectorSensor_On() {
+    public void testOnDeviceStateChangedSmokeDetectorSensorOn() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_SMOKEDETECTORSENSOR, c -> c.setSmokeDetectorSensorState(true), device);
 
@@ -409,7 +409,7 @@ public void testOnDeviceStateChanged_SmokeDetectorSensor_On() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_SmokeDetectorSensor_Off() {
+    public void testOnDeviceStateChangedSmokeDetectorSensorOff() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_SMOKEDETECTORSENSOR, c -> c.setSmokeDetectorSensorState(false),
                 device);
@@ -421,7 +421,7 @@ public void testOnDeviceStateChanged_SmokeDetectorSensor_Off() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_SmokeDetectorSensor_EmptyState() {
+    public void testOnDeviceStateChangedSmokeDetectorSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_SMOKEDETECTORSENSOR, null, device);
 
@@ -432,7 +432,7 @@ public void testOnDeviceStateChanged_SmokeDetectorSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_AlarmActuator_On() {
+    public void testOnDeviceStateChangedAlarmActuatorOn() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ALARMACTUATOR, c -> c.setAlarmActuatorState(true), device);
 
@@ -443,7 +443,7 @@ public void testOnDeviceStateChanged_AlarmActuator_On() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_AlarmActuator_Off() {
+    public void testOnDeviceStateChangedAlarmActuatorOff() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ALARMACTUATOR, c -> c.setAlarmActuatorState(false), device);
 
@@ -454,7 +454,7 @@ public void testOnDeviceStateChanged_AlarmActuator_Off() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_AlarmActuator_EmptyState() {
+    public void testOnDeviceStateChangedAlarmActuatorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ALARMACTUATOR, null, device);
 
@@ -465,7 +465,7 @@ public void testOnDeviceStateChanged_AlarmActuator_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_SwitchActuator_On() {
+    public void testOnDeviceStateChangedSwitchActuatorOn() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_SWITCHACTUATOR, c -> c.setSwitchActuatorState(true), device);
 
@@ -476,7 +476,7 @@ public void testOnDeviceStateChanged_SwitchActuator_On() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_SwitchActuator_Off() {
+    public void testOnDeviceStateChangedSwitchActuatorOff() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_SWITCHACTUATOR, c -> c.setSwitchActuatorState(false), device);
 
@@ -487,7 +487,7 @@ public void testOnDeviceStateChanged_SwitchActuator_Off() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_SwitchActuator_EmptyState() {
+    public void testOnDeviceStateChangedSwitchActuatorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_SWITCHACTUATOR, null, device);
 
@@ -498,7 +498,7 @@ public void testOnDeviceStateChanged_SwitchActuator_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_DimmerActuator() {
+    public void testOnDeviceStateChangedDimmerActuator() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_DIMMERACTUATOR, c -> c.setDimmerActuatorState(50), device);
 
@@ -509,7 +509,7 @@ public void testOnDeviceStateChanged_DimmerActuator() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_DimmerActuator_EmptyState() {
+    public void testOnDeviceStateChangedDimmerActuatorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_DIMMERACTUATOR, null, device);
 
@@ -520,7 +520,7 @@ public void testOnDeviceStateChanged_DimmerActuator_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_RollerShutterActuator() {
+    public void testOnDeviceStateChangedRollerShutterActuator() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ROLLERSHUTTERACTUATOR, c -> c.setRollerShutterActuatorState(40),
                 device);
@@ -532,7 +532,7 @@ public void testOnDeviceStateChanged_RollerShutterActuator() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_RollerShutterActuator_Invert_True() {
+    public void testOnDeviceStateChangedRollerShutterActuatorInvertTrue() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ROLLERSHUTTERACTUATOR, c -> c.setRollerShutterActuatorState(40),
                 device);
@@ -550,7 +550,7 @@ public void testOnDeviceStateChanged_RollerShutterActuator_Invert_True() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_RollerShutterActuator_Invert_False() {
+    public void testOnDeviceStateChangedRollerShutterActuatorInvertFalse() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ROLLERSHUTTERACTUATOR, c -> c.setRollerShutterActuatorState(40),
                 device);
@@ -568,7 +568,7 @@ public void testOnDeviceStateChanged_RollerShutterActuator_Invert_False() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_RollerShutterActuator_EmptyState() {
+    public void testOnDeviceStateChangedRollerShutterActuatorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ROLLERSHUTTERACTUATOR, null, device);
 
@@ -579,7 +579,7 @@ public void testOnDeviceStateChanged_RollerShutterActuator_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_MotionDetectionSensor() {
+    public void testOnDeviceStateChangedMotionDetectionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_MOTIONDETECTIONSENSOR, c -> c.setMotionDetectionSensorState(50),
                 device);
@@ -591,7 +591,7 @@ public void testOnDeviceStateChanged_MotionDetectionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_MotionDetectionSensor_EmptyState() {
+    public void testOnDeviceStateChangedMotionDetectionSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_MOTIONDETECTIONSENSOR, null, device);
 
@@ -602,7 +602,7 @@ public void testOnDeviceStateChanged_MotionDetectionSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_LuminanceSensor() {
+    public void testOnDeviceStateChangedLuminanceSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_LUMINANCESENSOR, c -> c.setLuminanceSensorState(50.1), device);
 
@@ -613,7 +613,7 @@ public void testOnDeviceStateChanged_LuminanceSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_LuminanceSensor_EmptyState() {
+    public void testOnDeviceStateChangedLuminanceSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_LUMINANCESENSOR, null, device);
 
@@ -624,7 +624,7 @@ public void testOnDeviceStateChanged_LuminanceSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_EnergyConsumptionSensor() {
+    public void testOnDeviceStateChangedEnergyConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ENERGYCONSUMPTIONSENSOR, c -> {
             c.setEnergyConsumptionSensorEnergyConsumptionMonthKWhState(201.51);
@@ -648,7 +648,7 @@ public void testOnDeviceStateChanged_EnergyConsumptionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_EnergyConsumptionSensor_EmptyState() {
+    public void testOnDeviceStateChangedEnergyConsumptionSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ENERGYCONSUMPTIONSENSOR, null, device);
 
@@ -663,7 +663,7 @@ public void testOnDeviceStateChanged_EnergyConsumptionSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_PowerConsumptionSensor() {
+    public void testOnDeviceStateChangedPowerConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_POWERCONSUMPTIONSENSOR,
                 c -> c.setPowerConsumptionSensorPowerConsumptionWattState(350.5), device);
@@ -675,7 +675,7 @@ public void testOnDeviceStateChanged_PowerConsumptionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_PowerConsumptionSensor_EmptyState() {
+    public void testOnDeviceStateChangedPowerConsumptionSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_POWERCONSUMPTIONSENSOR, null, device);
 
@@ -686,7 +686,7 @@ public void testOnDeviceStateChanged_PowerConsumptionSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_GenerationMeterEnergySensor() {
+    public void testOnDeviceStateChangedGenerationMeterEnergySensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_GENERATIONMETERENERGYSENSOR, c -> {
             c.setGenerationMeterEnergySensorEnergyPerMonthInKWhState(201.51);
@@ -710,7 +710,7 @@ public void testOnDeviceStateChanged_GenerationMeterEnergySensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_GenerationMeterEnergySensor_EmptyState() {
+    public void testOnDeviceStateChangedGenerationMeterEnergySensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_GENERATIONMETERENERGYSENSOR, null, device);
 
@@ -725,7 +725,7 @@ public void testOnDeviceStateChanged_GenerationMeterEnergySensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_GenerationMeterPowerConsumptionSensor() {
+    public void testOnDeviceStateChangedGenerationMeterPowerConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_GENERATIONMETERPOWERCONSUMPTIONSENSOR,
                 c -> c.setGenerationMeterPowerConsumptionSensorPowerInWattState(350.5), device);
@@ -737,7 +737,7 @@ public void testOnDeviceStateChanged_GenerationMeterPowerConsumptionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_GenerationMeterPowerConsumptionSensor_EmptyState() {
+    public void testOnDeviceStateChangedGenerationMeterPowerConsumptionSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_GENERATIONMETERPOWERCONSUMPTIONSENSOR, null, device);
 
@@ -748,7 +748,7 @@ public void testOnDeviceStateChanged_GenerationMeterPowerConsumptionSensor_Empty
     }
 
     @Test
-    public void testOnDeviceStateChanged_TwoWayMeterEnergyConsumptionSensor() {
+    public void testOnDeviceStateChangedTwoWayMeterEnergyConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERENERGYCONSUMPTIONSENSOR, c -> {
             c.setTwoWayMeterEnergyConsumptionSensorEnergyPerMonthInKWhState(201.51);
@@ -769,7 +769,7 @@ public void testOnDeviceStateChanged_TwoWayMeterEnergyConsumptionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_TwoWayMeterEnergyConsumptionSensor_EmptyState() {
+    public void testOnDeviceStateChangedTwoWayMeterEnergyConsumptionSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERENERGYCONSUMPTIONSENSOR, null, device);
 
@@ -784,7 +784,7 @@ public void testOnDeviceStateChanged_TwoWayMeterEnergyConsumptionSensor_EmptySta
     }
 
     @Test
-    public void testOnDeviceStateChanged_TwoWayMeterEnergyFeedSensor() {
+    public void testOnDeviceStateChangedTwoWayMeterEnergyFeedSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERENERGYFEEDSENSOR, c -> {
             c.setTwoWayMeterEnergyFeedSensorEnergyPerMonthInKWhState(201.51);
@@ -805,7 +805,7 @@ public void testOnDeviceStateChanged_TwoWayMeterEnergyFeedSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_TwoWayMeterEnergyFeedSensor_EmptyState() {
+    public void testOnDeviceStateChangedTwoWayMeterEnergyFeedSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERENERGYFEEDSENSOR, null, device);
 
@@ -820,7 +820,7 @@ public void testOnDeviceStateChanged_TwoWayMeterEnergyFeedSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_TwoWayMeterPowerConsumptionSensor() {
+    public void testOnDeviceStateChangedTwoWayMeterPowerConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERPOWERCONSUMPTIONSENSOR,
                 c -> c.setTwoWayMeterPowerConsumptionSensorPowerInWattState(350.5), device);
@@ -832,7 +832,7 @@ public void testOnDeviceStateChanged_TwoWayMeterPowerConsumptionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_TwoWayMeterPowerConsumptionSensor_EmptyState() {
+    public void testOnDeviceStateChangedTwoWayMeterPowerConsumptionSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERPOWERCONSUMPTIONSENSOR, null, device);
 
@@ -843,7 +843,7 @@ public void testOnDeviceStateChanged_TwoWayMeterPowerConsumptionSensor_EmptyStat
     }
 
     @Test
-    public void testOnDeviceStateChanged_PushButtonSensor_Button1_ShortPress() {
+    public void testOnDeviceStateChangedPushButtonSensorButton1ShortPress() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_PUSHBUTTONSENSOR, c -> {
             c.setPushButtonSensorCounterState(10);
@@ -863,7 +863,7 @@ public void testOnDeviceStateChanged_PushButtonSensor_Button1_ShortPress() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_PushButtonSensor_Button1_LongPress() {
+    public void testOnDeviceStateChangedPushButtonSensorButton1LongPress() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_PUSHBUTTONSENSOR, c -> {
             c.setPushButtonSensorCounterState(10);
@@ -883,7 +883,7 @@ public void testOnDeviceStateChanged_PushButtonSensor_Button1_LongPress() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_PushButtonSensor_Button2_ShortPress() {
+    public void testOnDeviceStateChangedPushButtonSensorButton2ShortPress() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_PUSHBUTTONSENSOR, c -> {
             c.setPushButtonSensorCounterState(10);
@@ -903,7 +903,7 @@ public void testOnDeviceStateChanged_PushButtonSensor_Button2_ShortPress() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_PushButtonSensor_Button2_LongPress() {
+    public void testOnDeviceStateChangedPushButtonSensorButton2LongPress() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_PUSHBUTTONSENSOR, c -> {
             c.setPushButtonSensorCounterState(10);
@@ -923,7 +923,7 @@ public void testOnDeviceStateChanged_PushButtonSensor_Button2_LongPress() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_PushButtonSensor_EmptyState() {
+    public void testOnDeviceStateChangedPushButtonSensorEmptyState() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_PUSHBUTTONSENSOR, null, device);
 
@@ -938,7 +938,7 @@ public void testOnDeviceStateChanged_PushButtonSensor_EmptyState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_LinkedToDevice() {
+    public void testOnDeviceStateChangedEventLinkedToDevice() {
         DeviceStateDTO deviceState = new DeviceStateDTO();
         deviceState.setReachable(true);
 
@@ -956,7 +956,7 @@ public void testOnDeviceStateChanged_Event_LinkedToDevice() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_LinkedToCapability_WithoutState() {
+    public void testOnDeviceStateChangedEventLinkedToCapabilityWithoutState() {
         DeviceDTO device = createDevice();
 
         CapabilityConfigDTO capabilityConfig = new CapabilityConfigDTO();
@@ -991,7 +991,7 @@ public void testOnDeviceStateChanged_Event_LinkedToCapability_WithoutState() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_LinkedToCapability_WithoutStateAlsoAfterRefresh() {
+    public void testOnDeviceStateChangedEventLinkedToCapabilityWithoutStateAlsoAfterRefresh() {
         DeviceDTO device = createDevice();
 
         CapabilityConfigDTO capabilityConfig = new CapabilityConfigDTO();
@@ -1023,7 +1023,7 @@ public void testOnDeviceStateChanged_Event_LinkedToCapability_WithoutStateAlsoAf
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_VariableActuator() {
+    public void testOnDeviceStateChangedEventVariableActuator() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_VARIABLEACTUATOR, null, device);
 
@@ -1036,7 +1036,7 @@ public void testOnDeviceStateChanged_Event_VariableActuator() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_SwitchActuator() {
+    public void testOnDeviceStateChangedEventSwitchActuator() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_SWITCHACTUATOR, null, device);
 
@@ -1049,7 +1049,7 @@ public void testOnDeviceStateChanged_Event_SwitchActuator() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_DimmerActuator() {
+    public void testOnDeviceStateChangedEventDimmerActuator() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_DIMMERACTUATOR, null, device);
 
@@ -1062,7 +1062,7 @@ public void testOnDeviceStateChanged_Event_DimmerActuator() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_RollerShutterActuator() {
+    public void testOnDeviceStateChangedEventRollerShutterActuator() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ROLLERSHUTTERACTUATOR, null, device);
 
@@ -1075,7 +1075,7 @@ public void testOnDeviceStateChanged_Event_RollerShutterActuator() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_RollerShutter_PushButtonSensor() {
+    public void testOnDeviceStateChangedEventRollerShutterPushButtonSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ROLLERSHUTTERACTUATOR, null, device);
         addCapabilityToDevice(CapabilityDTO.TYPE_PUSHBUTTONSENSOR, null, device);
@@ -1098,7 +1098,7 @@ public void testOnDeviceStateChanged_Event_RollerShutter_PushButtonSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_TemperatureSensor() {
+    public void testOnDeviceStateChangedEventTemperatureSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TEMPERATURESENSOR, null, device);
 
@@ -1115,7 +1115,7 @@ public void testOnDeviceStateChanged_Event_TemperatureSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_ThermostatSensor() {
+    public void testOnDeviceStateChangedEventThermostatSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_THERMOSTATACTUATOR, null, device);
 
@@ -1134,7 +1134,7 @@ public void testOnDeviceStateChanged_Event_ThermostatSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_HumiditySensor() {
+    public void testOnDeviceStateChangedEventHumiditySensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_HUMIDITYSENSOR, null, device);
 
@@ -1151,7 +1151,7 @@ public void testOnDeviceStateChanged_Event_HumiditySensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_WindowDoorSensor() {
+    public void testOnDeviceStateChangedEventWindowDoorSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_WINDOWDOORSENSOR, null, device);
 
@@ -1164,7 +1164,7 @@ public void testOnDeviceStateChanged_Event_WindowDoorSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_SmokeDetectorSensor() {
+    public void testOnDeviceStateChangedEventSmokeDetectorSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_SMOKEDETECTORSENSOR, null, device);
 
@@ -1177,7 +1177,7 @@ public void testOnDeviceStateChanged_Event_SmokeDetectorSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_AlarmActuator() {
+    public void testOnDeviceStateChangedEventAlarmActuator() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ALARMACTUATOR, null, device);
 
@@ -1190,7 +1190,7 @@ public void testOnDeviceStateChanged_Event_AlarmActuator() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_MotionDetectionSensor() {
+    public void testOnDeviceStateChangedEventMotionDetectionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_MOTIONDETECTIONSENSOR, null, device);
 
@@ -1203,7 +1203,7 @@ public void testOnDeviceStateChanged_Event_MotionDetectionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_LuminanceSensor() {
+    public void testOnDeviceStateChangedEventLuminanceSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_LUMINANCESENSOR, null, device);
 
@@ -1216,7 +1216,7 @@ public void testOnDeviceStateChanged_Event_LuminanceSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_PushButtonSensor_Button1_ShortPress() {
+    public void testOnDeviceStateChangedEventPushButtonSensorButton1ShortPress() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_PUSHBUTTONSENSOR, null, device);
 
@@ -1237,7 +1237,7 @@ public void testOnDeviceStateChanged_Event_PushButtonSensor_Button1_ShortPress()
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_PushButtonSensor_Button1_LongPress() {
+    public void testOnDeviceStateChangedEventPushButtonSensorButton1LongPress() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_PUSHBUTTONSENSOR, null, device);
 
@@ -1258,7 +1258,7 @@ public void testOnDeviceStateChanged_Event_PushButtonSensor_Button1_LongPress()
     }
 
     @Test
-    public void testOnDeviceStateChanged_StateChangedEvent_PushButtonSensor_SHC_Classic() {
+    public void testOnDeviceStateChangedStateChangedEventPushButtonSensorSHCClassic() {
         when(bridgeHandlerMock.isSHCClassic()).thenReturn(true);
 
         DeviceDTO device = createDevice();
@@ -1282,7 +1282,7 @@ public void testOnDeviceStateChanged_StateChangedEvent_PushButtonSensor_SHC_Clas
     }
 
     @Test
-    public void testOnDeviceStateChanged_StateChangedEvent_PushButtonSensor_SHCA() {
+    public void testOnDeviceStateChangedStateChangedEventPushButtonSensorSHCA() {
         when(bridgeHandlerMock.isSHCClassic()).thenReturn(false);
 
         DeviceDTO device = createDevice();
@@ -1306,7 +1306,7 @@ public void testOnDeviceStateChanged_StateChangedEvent_PushButtonSensor_SHCA() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_EnergyConsumptionSensor() {
+    public void testOnDeviceStateChangedEventEnergyConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_ENERGYCONSUMPTIONSENSOR, null, device);
 
@@ -1332,7 +1332,7 @@ public void testOnDeviceStateChanged_Event_EnergyConsumptionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_PowerConsumptionSensor() {
+    public void testOnDeviceStateChangedEventPowerConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_POWERCONSUMPTIONSENSOR, null, device);
 
@@ -1345,7 +1345,7 @@ public void testOnDeviceStateChanged_Event_PowerConsumptionSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_GenerationMeterEnergySensor() {
+    public void testOnDeviceStateChangedEventGenerationMeterEnergySensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_GENERATIONMETERENERGYSENSOR, null, device);
 
@@ -1371,7 +1371,7 @@ public void testOnDeviceStateChanged_Event_GenerationMeterEnergySensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_GenerationMeterPowerConsumptionSensor() {
+    public void testOnDeviceStateChangedEventGenerationMeterPowerConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_GENERATIONMETERPOWERCONSUMPTIONSENSOR, null, device);
 
@@ -1384,7 +1384,7 @@ public void testOnDeviceStateChanged_Event_GenerationMeterPowerConsumptionSensor
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_TwoWayMeterEnergyConsumptionSensor() {
+    public void testOnDeviceStateChangedEventTwoWayMeterEnergyConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERENERGYCONSUMPTIONSENSOR, null, device);
 
@@ -1407,7 +1407,7 @@ public void testOnDeviceStateChanged_Event_TwoWayMeterEnergyConsumptionSensor()
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_TwoWayMeterEnergyFeedSensor() {
+    public void testOnDeviceStateChangedEventTwoWayMeterEnergyFeedSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERENERGYFEEDSENSOR, null, device);
 
@@ -1430,7 +1430,7 @@ public void testOnDeviceStateChanged_Event_TwoWayMeterEnergyFeedSensor() {
     }
 
     @Test
-    public void testOnDeviceStateChanged_Event_TwoWayMeterPowerConsumptionSensor() {
+    public void testOnDeviceStateChangedEventTwoWayMeterPowerConsumptionSensor() {
         DeviceDTO device = createDevice();
         addCapabilityToDevice(CapabilityDTO.TYPE_TWOWAYMETERPOWERCONSUMPTIONSENSOR, null, device);
 
@@ -1443,7 +1443,7 @@ public void testOnDeviceStateChanged_Event_TwoWayMeterPowerConsumptionSensor() {
     }
 
     @Test
-    public void testHandleCommand_UnsupportedChannel() {
+    public void testHandleCommandUnsupportedChannel() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_CONTACT);
@@ -1463,7 +1463,7 @@ public void testHandleCommand_UnsupportedChannel() {
     }
 
     @Test
-    public void testHandleCommand_CommandSwitchDevice_On() {
+    public void testHandleCommandCommandSwitchDeviceOn() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_SWITCH);
@@ -1475,7 +1475,7 @@ public void testHandleCommand_CommandSwitchDevice_On() {
     }
 
     @Test
-    public void testHandleCommand_CommandSwitchDevice_Off() {
+    public void testHandleCommandCommandSwitchDeviceOff() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_SWITCH);
@@ -1487,7 +1487,7 @@ public void testHandleCommand_CommandSwitchDevice_Off() {
     }
 
     @Test
-    public void testHandleCommand_CommandSwitchAlarm_On() {
+    public void testHandleCommandCommandSwitchAlarmOn() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_ALARM);
@@ -1499,7 +1499,7 @@ public void testHandleCommand_CommandSwitchAlarm_On() {
     }
 
     @Test
-    public void testHandleCommand_CommandSwitchAlarm_Off() {
+    public void testHandleCommandCommandSwitchAlarmOff() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_ALARM);
@@ -1511,7 +1511,7 @@ public void testHandleCommand_CommandSwitchAlarm_Off() {
     }
 
     @Test
-    public void testHandleCommand_CommandSetDimLevel_On() {
+    public void testHandleCommandCommandSetDimLevelOn() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_DIMMER);
@@ -1523,7 +1523,7 @@ public void testHandleCommand_CommandSetDimLevel_On() {
     }
 
     @Test
-    public void testHandleCommand_CommandSetDimLevel_Off() {
+    public void testHandleCommandCommandSetDimLevelOff() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_DIMMER);
@@ -1535,7 +1535,7 @@ public void testHandleCommand_CommandSetDimLevel_Off() {
     }
 
     @Test
-    public void testHandleCommand_CommandSetDimLevel_DecimalType() {
+    public void testHandleCommandCommandSetDimLevelDecimalType() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_DIMMER);
@@ -1547,7 +1547,7 @@ public void testHandleCommand_CommandSetDimLevel_DecimalType() {
     }
 
     @Test
-    public void testHandleCommand_CommandSetOperationMode_Auto() {
+    public void testHandleCommandCommandSetOperationModeAuto() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_OPERATION_MODE);
@@ -1559,7 +1559,7 @@ public void testHandleCommand_CommandSetOperationMode_Auto() {
     }
 
     @Test
-    public void testHandleCommand_CommandSetOperationMode_Manual() {
+    public void testHandleCommandCommandSetOperationModeManual() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_OPERATION_MODE);
@@ -1571,7 +1571,7 @@ public void testHandleCommand_CommandSetOperationMode_Manual() {
     }
 
     @Test
-    public void testHandleCommand_CommandSetOperationMode_Unknown() {
+    public void testHandleCommandCommandSetOperationModeUnknown() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_OPERATION_MODE);
@@ -1583,7 +1583,7 @@ public void testHandleCommand_CommandSetOperationMode_Unknown() {
     }
 
     @Test
-    public void testHandleCommand_CommandUpdatePointTemperature_QuantityType() {
+    public void testHandleCommandCommandUpdatePointTemperatureQuantityType() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_TARGET_TEMPERATURE);
@@ -1595,7 +1595,7 @@ public void testHandleCommand_CommandUpdatePointTemperature_QuantityType() {
     }
 
     @Test
-    public void testHandleCommand_CommandUpdatePointTemperature_DecimalType() {
+    public void testHandleCommandCommandUpdatePointTemperatureDecimalType() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_TARGET_TEMPERATURE);
@@ -1607,7 +1607,7 @@ public void testHandleCommand_CommandUpdatePointTemperature_DecimalType() {
     }
 
     @Test
-    public void testHandleCommand_CommandUpdatePointTemperature_MinTemperature() {
+    public void testHandleCommandCommandUpdatePointTemperatureMinTemperature() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_TARGET_TEMPERATURE);
@@ -1620,7 +1620,7 @@ public void testHandleCommand_CommandUpdatePointTemperature_MinTemperature() {
     }
 
     @Test
-    public void testHandleCommand_CommandUpdatePointTemperature_MaxTemperature() {
+    public void testHandleCommandCommandUpdatePointTemperatureMaxTemperature() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_TARGET_TEMPERATURE);
@@ -1633,7 +1633,7 @@ public void testHandleCommand_CommandUpdatePointTemperature_MaxTemperature() {
     }
 
     @Test
-    public void testHandleCommand_CommandRollerShutter_Up() {
+    public void testHandleCommandCommandRollerShutterUp() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_ROLLERSHUTTER);
@@ -1645,7 +1645,7 @@ public void testHandleCommand_CommandRollerShutter_Up() {
     }
 
     @Test
-    public void testHandleCommand_CommandRollerShutter_Down() {
+    public void testHandleCommandCommandRollerShutterDown() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_ROLLERSHUTTER);
@@ -1657,7 +1657,7 @@ public void testHandleCommand_CommandRollerShutter_Down() {
     }
 
     @Test
-    public void testHandleCommand_CommandRollerShutter_On() {
+    public void testHandleCommandCommandRollerShutterOn() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_ROLLERSHUTTER);
@@ -1669,7 +1669,7 @@ public void testHandleCommand_CommandRollerShutter_On() {
     }
 
     @Test
-    public void testHandleCommand_CommandRollerShutter_Off() {
+    public void testHandleCommandCommandRollerShutterOff() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_ROLLERSHUTTER);
@@ -1681,7 +1681,7 @@ public void testHandleCommand_CommandRollerShutter_Off() {
     }
 
     @Test
-    public void testHandleCommand_CommandRollerShutter_Stop() {
+    public void testHandleCommandCommandRollerShutterStop() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_ROLLERSHUTTER);
@@ -1693,7 +1693,7 @@ public void testHandleCommand_CommandRollerShutter_Stop() {
     }
 
     @Test
-    public void testHandleCommand_CommandRollerShutter_DecimalType() {
+    public void testHandleCommandCommandRollerShutterDecimalType() {
         DeviceDTO device = createDevice();
 
         ChannelUID channelMock = createChannel(CHANNEL_ROLLERSHUTTER);
@@ -1705,7 +1705,7 @@ public void testHandleCommand_CommandRollerShutter_DecimalType() {
     }
 
     @Test
-    public void testHandleCommand_CommandRollerShutter_DecimalType_Inverted() {
+    public void testHandleCommandCommandRollerShutterDecimalTypeInverted() {
         DeviceDTO device = createDevice();
 
         Channel rollerShutterChannelMock = createRollerShutterChannelMock(true);
@@ -1723,7 +1723,7 @@ public void testHandleCommand_CommandRollerShutter_DecimalType_Inverted() {
     }
 
     @Test
-    public void testHandleCommand_CommandRollerShutter_DecimalType_NotInverted() {
+    public void testHandleCommandCommandRollerShutterDecimalTypeNotInverted() {
         DeviceDTO device = createDevice();
 
         Channel rollerShutterChannelMock = createRollerShutterChannelMock(false);
@@ -1894,10 +1894,12 @@ public TriggeredEvent(String channelUID, String triggerValue) {
 
         @Override
         public boolean equals(@Nullable Object o) {
-            if (this == o)
+            if (this == o) {
                 return true;
-            if (o == null || getClass() != o.getClass())
+            }
+            if (o == null || getClass() != o.getClass()) {
                 return false;
+            }
             TriggeredEvent that = (TriggeredEvent) o;
             return channelUID.equals(that.channelUID) && triggerValue.equals(that.triggerValue);
         }

From a3ad12ba3969311adf6cb647e4062842dbe9f678 Mon Sep 17 00:00:00 2001
From: Hilbrand Bouwkamp <hilbrand@h72.nl>
Date: Fri, 9 Dec 2022 12:31:49 +0100
Subject: [PATCH 09/48] [astro] Fix IllegalArgumentException in debug message
 (#13884)

Formatter should get Date object.

Closes #13871

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
---
 .../binding/astro/internal/handler/AstroThingHandler.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java
index dfb34d61ccbae..c369eb99cde29 100644
--- a/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java
+++ b/bundles/org.openhab.binding.astro/src/main/java/org/openhab/binding/astro/internal/handler/AstroThingHandler.java
@@ -310,7 +310,7 @@ public void schedule(Job job, Calendar eventAt) {
             monitor.unlock();
         }
         if (logger.isDebugEnabled()) {
-            String formattedDate = this.isoFormatter.format(eventAt);
+            final String formattedDate = this.isoFormatter.format(eventAt.getTime());
             logger.debug("Scheduled {} in {}ms (at {})", job, sleepTime, formattedDate);
         }
     }

From 7480c63636404e1de3b7da48fca0a40151b7f92d Mon Sep 17 00:00:00 2001
From: mlobstein <michael.lobstein@gmail.com>
Date: Fri, 9 Dec 2022 05:32:47 -0600
Subject: [PATCH 10/48] Update README (#13868)

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
---
 bundles/org.openhab.binding.kaleidescape/README.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/bundles/org.openhab.binding.kaleidescape/README.md b/bundles/org.openhab.binding.kaleidescape/README.md
index 88bca36cf787e..74e252730f08d 100644
--- a/bundles/org.openhab.binding.kaleidescape/README.md
+++ b/bundles/org.openhab.binding.kaleidescape/README.md
@@ -1,8 +1,8 @@
 # Kaleidescape Binding
 
 This binding now makes it possible to easily integrate almost all of the capabilities of the Kaleidescape control protocol into openHAB.
-Beyond just integrating playback transport controls, all meta-data provided via the control protocol are made available for display purposes and to use in rules.
-By using rules, it is possible to control other Things such lighting, projector lens shift, screen masking, etc. based on events that occur during movie playback.
+Beyond just integrating playback transport controls, all meta-data provided via the control protocol is made available for display purposes and to use in rules.
+By using rules, it is possible to control other Things such as lighting, projector lens shift, screen masking, etc. based on events that occur during movie playback.
 Finally, any other command that is supported by the control protocol can be sent to the component through rules.
 See [Kaleidescape-System-Control-Protocol-Reference-Manual.pdf](https://support.kaleidescape.com/article/Control-Protocol-Reference-Manual) for a reference of available commands.
 
@@ -24,11 +24,6 @@ The binding supports either a TCP/IP connection or direct serial port connection
 Manually initiated Auto-discovery will locate all supported Kaleidescape components if they are on the same IP subnet of the openHAB server.
 In the Inbox, select Search For Things and then choose the Kaleidescape Binding to initiate a discovery scan.
 
-## Binding Configuration
-
-There are no overall binding configuration settings that need to be set.
-All settings are through thing configuration parameters.
-
 ## Thing Configuration
 
 The thing has the following configuration parameters:

From 76c785947badeb494787ae6efdced82aac48aab5 Mon Sep 17 00:00:00 2001
From: lsiepel <leosiepel@gmail.com>
Date: Fri, 9 Dec 2022 19:08:41 +0100
Subject: [PATCH 11/48] [plugwiseha] Fix set the scene for a zone (#13832)

* Fix request body

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
---
 .../api/model/PlugwiseHAController.java       | 11 ++++++-
 .../model/PlugwiseHAControllerRequest.java    | 18 +++++++++++
 .../internal/api/model/dto/Location.java      |  8 ++---
 .../api/model/dto/LocationsArray.java         | 31 +++++++++++++++++++
 .../api/model/dto/PlugwiseBaseModel.java      |  6 ++++
 .../internal/api/xml/PlugwiseHAXStream.java   |  2 ++
 6 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/LocationsArray.java

diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAController.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAController.java
index c46f0a8f09149..e1739c7953d3f 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAController.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAController.java
@@ -37,6 +37,7 @@
 import org.openhab.binding.plugwiseha.internal.api.model.dto.GatewayInfo;
 import org.openhab.binding.plugwiseha.internal.api.model.dto.Location;
 import org.openhab.binding.plugwiseha.internal.api.model.dto.Locations;
+import org.openhab.binding.plugwiseha.internal.api.model.dto.LocationsArray;
 import org.openhab.binding.plugwiseha.internal.api.xml.PlugwiseHAXStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -395,7 +396,15 @@ public void setPresetScene(Location location, String state) throws PlugwiseHAExc
 
         request.setPath("/core/locations");
         request.addPathParameter("id", String.format("%s", location.getId()));
-        request.setBodyParameter(new Location(state));
+
+        Location locationWithChangesOnly = new Location();
+        locationWithChangesOnly.setPreset(state);
+        locationWithChangesOnly.setId(location.getId());
+
+        LocationsArray locations = new LocationsArray();
+        locations.items = new Location[] { locationWithChangesOnly };
+
+        request.setBodyParameter(locations);
 
         executeRequest(request);
     }
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java
index b559f64cd0d55..f921e3a3994d6 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java
@@ -17,9 +17,11 @@
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
@@ -225,6 +227,22 @@ private ContentResponse getContentResponse(int retries) throws PlugwiseHAExcepti
 
         this.logger.debug("Performing API request: {} {}", request.getMethod(), request.getURI());
 
+        if (logger.isTraceEnabled()) {
+            String content = "";
+            final ContentProvider provider = request.getContent();
+            if (provider != null) {
+                final Iterator<ByteBuffer> it = provider.iterator();
+                while (it.hasNext()) {
+                    final ByteBuffer next = it.next();
+                    final byte[] bytes = new byte[next.capacity()];
+                    next.get(bytes);
+                    content += String.format("{}\n", new String(bytes, StandardCharsets.UTF_8));
+                }
+            }
+
+            logger.trace(">> \n{}", content);
+        }
+
         try {
             response = request.send();
         } catch (InterruptedException e) {
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java
index 6e6673e1f53bb..b2bbf92c9482d 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java
@@ -47,10 +47,6 @@ public class Location extends PlugwiseBaseModel implements PlugwiseComparableDat
     @XStreamImplicit(itemFieldName = "actuator_functionality", keyFieldName = "type")
     private ActuatorFunctionalities actuatorFunctionalities;
 
-    public Location(String presetScene) {
-        this.preset = presetScene;
-    }
-
     public String getName() {
         return name;
     }
@@ -116,6 +112,10 @@ public String getRegulationControl() {
         return null;
     }
 
+    public void setPreset(String preset) {
+        this.preset = preset;
+    }
+
     public int applianceCount() {
         if (this.locationAppliances == null) {
             return 0;
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/LocationsArray.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/LocationsArray.java
new file mode 100644
index 0000000000000..bf44ca32e87d8
--- /dev/null
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/LocationsArray.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.plugwiseha.internal.api.model.dto;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
+/**
+ * The {@link LocationsArray} class is an object model class that mirrors the XML
+ * structure provided by the Plugwise Home Automation controller for the
+ * collection of Plugwise locations/zones.
+ * 
+ * @author L. Siepel - Initial contribution
+ */
+
+@XStreamAlias("locations")
+public class LocationsArray {
+
+    @XStreamImplicit
+    public Location[] items;
+}
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/PlugwiseBaseModel.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/PlugwiseBaseModel.java
index a4638f1a2c008..a90327a0b9711 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/PlugwiseBaseModel.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/PlugwiseBaseModel.java
@@ -15,6 +15,7 @@
 import java.time.ZonedDateTime;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 
 /**
  * The {@link PlugwiseBaseModel} abstract class contains
@@ -24,6 +25,7 @@
  */
 public abstract class PlugwiseBaseModel {
 
+    @XStreamAsAttribute
     private String id;
 
     @XStreamAlias("created_date")
@@ -57,4 +59,8 @@ public ZonedDateTime getUpdatedDate() {
     public ZonedDateTime getDeletedDate() {
         return deletedDate;
     }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/xml/PlugwiseHAXStream.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/xml/PlugwiseHAXStream.java
index d8c16ab985730..51f6461237dcc 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/xml/PlugwiseHAXStream.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/xml/PlugwiseHAXStream.java
@@ -29,6 +29,7 @@
 import org.openhab.binding.plugwiseha.internal.api.model.dto.GatewayInfo;
 import org.openhab.binding.plugwiseha.internal.api.model.dto.Location;
 import org.openhab.binding.plugwiseha.internal.api.model.dto.Locations;
+import org.openhab.binding.plugwiseha.internal.api.model.dto.LocationsArray;
 import org.openhab.binding.plugwiseha.internal.api.model.dto.Log;
 import org.openhab.binding.plugwiseha.internal.api.model.dto.Logs;
 import org.openhab.binding.plugwiseha.internal.api.model.dto.Module;
@@ -87,6 +88,7 @@ protected void initialize() {
         this.allowClass(Appliance.class);
         this.allowClass(Modules.class);
         this.allowClass(Module.class);
+        this.allowClass(LocationsArray.class);
         this.allowClass(Locations.class);
         this.allowClass(Location.class);
         this.allowClass(Logs.class);

From 108c48dda54f24ce98c3576306c93c6113fb7039 Mon Sep 17 00:00:00 2001
From: Cody Cutrer <cody@cutrer.us>
Date: Fri, 9 Dec 2022 11:17:51 -0700
Subject: [PATCH 12/48] [homekit] add BasicFan accessory (#13564)

* [homekit] add BasicFan accessory

This is Fan v1. It's a subset of FanV2, except that Home allows you
to customize the icon to show a ceiling fan.

Signed-off-by: Cody Cutrer <cody@cutrer.us>
---
 bundles/org.openhab.io.homekit/README.md      |  4 ++
 .../internal/HomekitAccessoryType.java        |  1 +
 .../accessories/HomekitAccessoryFactory.java  |  2 +
 .../accessories/HomekitBasicFanImpl.java      | 65 +++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitBasicFanImpl.java

diff --git a/bundles/org.openhab.io.homekit/README.md b/bundles/org.openhab.io.homekit/README.md
index 475802dd5492b..23bd586a8bf8d 100644
--- a/bundles/org.openhab.io.homekit/README.md
+++ b/bundles/org.openhab.io.homekit/README.md
@@ -747,6 +747,10 @@ Support for this is planned for the future release of openHAB HomeKit binding.
 |                      |                             | RotationSpeed                | Number, Dimmer                | Fan rotation speed in % (1-100)                                                                                                                                                                                                                                                                                                                     |
 |                      |                             | SwingMode                    | Number, Switch                | Swing mode.  values: 0/OFF=SWING DISABLED, 1/ON=SWING ENABLED. Flag [inverted=true] swaps the default mapping                                                                                                                                                                                                                                       |
 |                      |                             | LockControl                  | Number, Switch                | Status of physical control lock.  values: 0/OFF=CONTROL LOCK DISABLED, 1/ON=CONTROL LOCK ENABLED.Flag [inverted=true] swaps the default mapping                                                                                                                                                                                                     |
+| BasicFan             |                             |                              |                               | Fan. A BasicFan is a subset of Fan, but the Home app allows you to customize the icon of the accessory to show a ceiling fan.                                                                                                                                                                                                                       |
+|                      | OnState                     |                              | Switch, Dimmer                | Accessory current working status. A value of "ON"/"OPEN" indicates that the accessory is active and is functioning without any errors.                                                                                                                                                                                                              |
+|                      |                             | RotationDirection            | Number, Switch                | Rotation direction.  values: 0/OFF=CLOCKWISE, 1/ON=COUNTER CLOCKWISE. Flag [inverted=true] swaps the default mapping                                                                                                                                                                                                                                |
+|                      |                             | RotationSpeed                | Number, Dimmer                | Fan rotation speed in % (1-100)                                                                                                                                                                                                                                                                                                                     |
 | Thermostat           |                             |                              |                               | A thermostat requires all mandatory characteristics defined below                                                                                                                                                                                                                                                                                   |
 |                      | CurrentTemperature          |                              | Number                        | Current temperature. supported configuration: minValue, maxValue, step                                                                                                                                                                                                                                                                              |
 |                      | TargetTemperature           |                              | Number                        | Target temperature. supported configuration: minValue, maxValue, step                                                                                                                                                                                                                                                                               |
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAccessoryType.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAccessoryType.java
index f4d03fa4a9938..1e96648f1b1a9 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAccessoryType.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitAccessoryType.java
@@ -39,6 +39,7 @@ public enum HomekitAccessoryType {
     SMOKE_SENSOR("SmokeSensor"),
     CARBON_MONOXIDE_SENSOR("CarbonMonoxideSensor"),
     CARBON_DIOXIDE_SENSOR("CarbonDioxideSensor"),
+    BASIC_FAN("BasicFan"),
     FAN("Fan"),
     LOCK("Lock"),
     SECURITY_SYSTEM("SecuritySystem"),
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
index f0bf4a188a796..ecdb2f02b6822 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
@@ -78,6 +78,7 @@ public class HomekitAccessoryFactory {
             put(CARBON_MONOXIDE_SENSOR, new HomekitCharacteristicType[] { CARBON_MONOXIDE_DETECTED_STATE });
             put(WINDOW_COVERING, new HomekitCharacteristicType[] { TARGET_POSITION, CURRENT_POSITION, POSITION_STATE });
             put(LIGHTBULB, new HomekitCharacteristicType[] { ON_STATE });
+            put(BASIC_FAN, new HomekitCharacteristicType[] { ON_STATE });
             put(FAN, new HomekitCharacteristicType[] { ACTIVE_STATUS });
             put(LIGHT_SENSOR, new HomekitCharacteristicType[] { LIGHT_LEVEL });
             put(TEMPERATURE_SENSOR, new HomekitCharacteristicType[] { CURRENT_TEMPERATURE });
@@ -119,6 +120,7 @@ public class HomekitAccessoryFactory {
             put(CARBON_MONOXIDE_SENSOR, HomekitCarbonMonoxideSensorImpl.class);
             put(WINDOW_COVERING, HomekitWindowCoveringImpl.class);
             put(LIGHTBULB, HomekitLightbulbImpl.class);
+            put(BASIC_FAN, HomekitBasicFanImpl.class);
             put(FAN, HomekitFanImpl.class);
             put(LIGHT_SENSOR, HomekitLightSensorImpl.class);
             put(TEMPERATURE_SENSOR, HomekitTemperatureSensorImpl.class);
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitBasicFanImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitBasicFanImpl.java
new file mode 100644
index 0000000000000..3c60e7d0a1d71
--- /dev/null
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitBasicFanImpl.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.io.homekit.internal.accessories;
+
+import static org.openhab.io.homekit.internal.HomekitCharacteristicType.ON_STATE;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.io.homekit.internal.HomekitAccessoryUpdater;
+import org.openhab.io.homekit.internal.HomekitSettings;
+import org.openhab.io.homekit.internal.HomekitTaggedItem;
+
+import io.github.hapjava.accessories.BasicFanAccessory;
+import io.github.hapjava.characteristics.HomekitCharacteristicChangeCallback;
+import io.github.hapjava.services.impl.BasicFanService;
+
+/**
+ * Implements Fan using an Item that provides an On/Off state
+ *
+ * @author Cody Cutrer - Initial contribution
+ */
+@NonNullByDefault({})
+class HomekitBasicFanImpl extends AbstractHomekitAccessoryImpl implements BasicFanAccessory {
+    private final BooleanItemReader onReader;
+
+    public HomekitBasicFanImpl(HomekitTaggedItem taggedItem, List<HomekitTaggedItem> mandatoryCharacteristics,
+            HomekitAccessoryUpdater updater, HomekitSettings settings) throws IncompleteAccessoryException {
+        super(taggedItem, mandatoryCharacteristics, updater, settings);
+        onReader = createBooleanReader(ON_STATE);
+        this.getServices().add(new BasicFanService(this));
+    }
+
+    @Override
+    public CompletableFuture<Boolean> isOn() {
+        return CompletableFuture.completedFuture(onReader.getValue());
+    }
+
+    @Override
+    public CompletableFuture<Void> setOn(boolean state) {
+        onReader.setValue(state);
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public void subscribeOn(HomekitCharacteristicChangeCallback callback) {
+        subscribe(ON_STATE, callback);
+    }
+
+    @Override
+    public void unsubscribeOn() {
+        unsubscribe(ON_STATE);
+    }
+}

From d85c2532e4d5604c3926a054730a5fba629344bb Mon Sep 17 00:00:00 2001
From: lsiepel <leosiepel@gmail.com>
Date: Fri, 9 Dec 2022 19:30:08 +0100
Subject: [PATCH 13/48] Add channel return temp (#13833)

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
---
 bundles/org.openhab.binding.plugwiseha/README.md   | 14 ++++++++------
 .../internal/PlugwiseHABindingConstants.java       |  1 +
 .../internal/api/model/dto/Appliance.java          |  8 ++++++++
 .../plugwiseha/internal/api/model/dto/Logs.java    |  9 +++++++++
 .../handler/PlugwiseHAApplianceHandler.java        |  9 +++++++++
 .../resources/OH-INF/i18n/plugwiseha.properties    |  2 ++
 .../src/main/resources/OH-INF/thing/channels.xml   |  8 ++++++++
 .../main/resources/OH-INF/thing/thing-types.xml    |  1 +
 8 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.binding.plugwiseha/README.md b/bundles/org.openhab.binding.plugwiseha/README.md
index 22e86da08b478..093da9c8184ba 100644
--- a/bundles/org.openhab.binding.plugwiseha/README.md
+++ b/bundles/org.openhab.binding.plugwiseha/README.md
@@ -153,17 +153,18 @@ Switch	main_boiler_chState "Heating active" { channel="plugwiseha:appliance_boil
 Switch	main_boiler_dhwState "Domestic hot water active" { channel="plugwiseha:appliance_boiler:home:main_boiler:dhwState"}
 
 Switch main_boiler_coolingState "Cooling state" { channel="plugwiseha:appliance_boiler:home:main_boiler:coolingState"}
-Number:Temperature main_boiler_intendedBoilerTemp "Intended boiler temperature" {channel="plugwiseha:appliance_boiler:home:living_room_thermostat:intendedBoilerTemp"}
+Number:Temperature main_boiler_intendedBoilerTemp "Intended boiler temperature" {channel="plugwiseha:appliance_boiler:home:main_boiler:intendedBoilerTemp"}
 Switch main_boiler_flameState "Flame state" { channel="plugwiseha:appliance_boiler:home:main_boiler:flameState"}
 Switch main_boiler_intendedHeatingState "Intended heating state" { channel="plugwiseha:appliance_boiler:home:main_boiler:intendedHeatingState"}
 Number main_boiler_modulationLevel "Modulation level" {channel="plugwiseha:appliance_boiler:home:living_room_radiator:modulationLevel"}
 Number main_boiler_otAppFaultCode "Opentherm app. faultcode" {channel="plugwiseha:appliance_boiler:home:living_room_radiator:otAppFaultCode"}
-Number:Temperature main_boiler_dhwTemperature "DHW temperature" {channel="plugwiseha:appliance_boiler:home:living_room_thermostat:dhwTemperature"}
-Number main_boiler_otOEMFaultCode "Opentherm OEM faultcode" {channel="plugwiseha:appliance_boiler:home:living_room_radiator:otOEMFaultCode"}
-Number:Temperature main_boiler_boilerTemperature "Boiler temperature" {channel="plugwiseha:appliance_boiler:home:living_room_thermostat:boilerTemperature"}
-Number:Temperature main_boiler_dhwSetpoint "DHW setpoint" {channel="plugwiseha:appliance_boiler:home:living_room_thermostat:dhwSetpoint"}
-Number:Temperature main_boiler_maxBoilerTemperature "Max. boiler temperature" {channel="plugwiseha:appliance_boiler:home:living_room_thermostat:maxBoilerTemperature"}
+Number:Temperature main_boiler_dhwTemperature "DHW temperature" {channel="plugwiseha:appliance_boiler:home:main_boiler:dhwTemperature"}
+Number main_boiler_otOEMFaultCode "Opentherm OEM faultcode" {channel="plugwiseha:appliance_boiler:home:main_boiler:otOEMFaultCode"}
+Number:Temperature main_boiler_boilerTemperature "Boiler temperature" {channel="plugwiseha:appliance_boiler:home:main_boiler:boilerTemperature"}
+Number:Temperature main_boiler_dhwSetpoint "DHW setpoint" {channel="plugwiseha:appliance_boiler:home:main_boiler:dhwSetpoint"}
+Number:Temperature main_boiler_maxBoilerTemperature "Max. boiler temperature" {channel="plugwiseha:appliance_boiler:home:main_boiler:maxBoilerTemperature"}
 Switch main_boiler_dhwComfortMode "DHW comfort mode" { channel="plugwiseha:appliance_boiler:home:main_boiler:dhwComfortMode"}
+Number:Temperature main_boiler_returnTemperature "Boiler return temperature" {channel="plugwiseha:appliance_boiler:home:main_boiler:returnWaterTemperature"}
 ```
 
 **transform/plugwiseha.map**
@@ -214,6 +215,7 @@ sitemap plugwiseha label="PlugwiseHA Binding"
 		Number item=main_boiler_dhwSetpoint
 		Number item=main_boiler_maxBoilerTemperature
 		Switch item=main_boiler_dhwComfortMode
+        Number item=main_boiler_returnTemperature
 	}
 }
 ```
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/PlugwiseHABindingConstants.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/PlugwiseHABindingConstants.java
index 49b77e4370557..043ecfafac35d 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/PlugwiseHABindingConstants.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/PlugwiseHABindingConstants.java
@@ -116,6 +116,7 @@ public class PlugwiseHABindingConstants {
     public static final String APPLIANCE_DHWSETPOINT_CHANNEL = "dhwSetpoint";
     public static final String APPLIANCE_MAXBOILERTEMPERATURE_CHANNEL = "maxBoilerTemperature";
     public static final String APPLIANCE_DHWCOMFORTMODE_CHANNEL = "dhwComfortMode";
+    public static final String APPLIANCE_RETURNWATERTEMPERATURE_CHANNEL = "returnWaterTemperature";
 
     // List of all Appliance Types
     public static final String APPLIANCE_TYPE_THERMOSTAT = "thermostat";
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Appliance.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Appliance.java
index 3c24e0547acd4..e71a329530bb9 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Appliance.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Appliance.java
@@ -156,6 +156,14 @@ public Optional<String> getIntendedBoilerTempUnit() {
         return this.pointLogs.getIntendedBoilerTempUnit();
     }
 
+    public Optional<Double> getReturnWaterTemp() {
+        return this.pointLogs.getReturnWaterTemp();
+    }
+
+    public Optional<String> getReturnWaterTempUnit() {
+        return this.pointLogs.getReturnWaterTempUnit();
+    }
+
     public Optional<Boolean> getFlameState() {
         return this.pointLogs.getFlameState();
     }
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Logs.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Logs.java
index 877cb67c613bb..f80b2ba081c53 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Logs.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Logs.java
@@ -47,6 +47,7 @@ public class Logs extends PlugwiseHACollection<Log> {
     private static final String CHSTATE = "central_heating_state";
     private static final String VALVE_POSITION = "valve_position";
     private static final String WATER_PRESSURE = "central_heater_water_pressure";
+    private static final String RETURNWATERTEMP = "return_water_temperature";
 
     public Optional<Boolean> getCoolingState() {
         return this.getLog(COOLINGSTATE).map(logEntry -> logEntry.getMeasurementAsBoolean()).orElse(Optional.empty());
@@ -99,6 +100,14 @@ public Optional<String> getBoilerTempUnit() {
         return this.getLog(BOILERTEMP).map(logEntry -> logEntry.getMeasurementUnit()).orElse(Optional.empty());
     }
 
+    public Optional<Double> getReturnWaterTemp() {
+        return this.getLog(RETURNWATERTEMP).map(logEntry -> logEntry.getMeasurementAsDouble()).orElse(Optional.empty());
+    }
+
+    public Optional<String> getReturnWaterTempUnit() {
+        return this.getLog(RETURNWATERTEMP).map(logEntry -> logEntry.getMeasurementUnit()).orElse(Optional.empty());
+    }
+
     public Optional<Double> getDHTSetpoint() {
         return this.getLog(DHWSETPOINT).map(logEntry -> logEntry.getMeasurementAsDouble()).orElse(Optional.empty());
     }
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAApplianceHandler.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAApplianceHandler.java
index 9a2df94374209..cc3dc4800b4d7 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAApplianceHandler.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAApplianceHandler.java
@@ -220,6 +220,7 @@ private State getDefaultState(String channelID) {
             case APPLIANCE_TEMPERATURE_CHANNEL:
             case APPLIANCE_VALVEPOSITION_CHANNEL:
             case APPLIANCE_WATERPRESSURE_CHANNEL:
+            case APPLIANCE_RETURNWATERTEMPERATURE_CHANNEL:
                 state = UnDefType.NULL;
                 break;
             case APPLIANCE_BATTERYLEVELLOW_CHANNEL:
@@ -359,6 +360,14 @@ protected void refreshChannel(Appliance entity, ChannelUID channelUID) {
                     state = new QuantityType<Dimensionless>(entity.getOTAppFaultCode().get().intValue(), Units.PERCENT);
                 }
                 break;
+            case APPLIANCE_RETURNWATERTEMPERATURE_CHANNEL:
+                if (entity.getBoilerTemp().isPresent()) {
+                    Unit<Temperature> unit = entity.getReturnWaterTempUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
+                            ? SIUnits.CELSIUS
+                            : ImperialUnits.FAHRENHEIT;
+                    state = new QuantityType<Temperature>(entity.getReturnWaterTemp().get(), unit);
+                }
+                break;
             case APPLIANCE_DHWTEMPERATURE_CHANNEL:
                 if (entity.getDHWTemp().isPresent()) {
                     Unit<Temperature> unit = entity.getDHWTempUnit().orElse(UNIT_CELSIUS).equals(UNIT_CELSIUS)
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties
index d45afdc7b3836..fdca9b09d97ff 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties
@@ -96,6 +96,8 @@ channel-type.plugwiseha.regulationControl.description = Switch the regulation co
 channel-type.plugwiseha.regulationControl.state.option.active = Active
 channel-type.plugwiseha.regulationControl.state.option.passive = Passive
 channel-type.plugwiseha.regulationControl.state.option.off = Off
+channel-type.plugwiseha.returnWaterTemperature.label = Return Water Temperature
+channel-type.plugwiseha.returnWaterTemperature.description = Gets the temperature of the boiler return water
 channel-type.plugwiseha.setpointTemperature.label = Setpoint Temperature
 channel-type.plugwiseha.setpointTemperature.description = Gets or sets the set point of this zone
 channel-type.plugwiseha.temperature.label = Zone Temperature
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/channels.xml
index 5c605deca4762..bf4472648a3ee 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/channels.xml
@@ -172,6 +172,14 @@
 		<state readOnly="true" pattern="%.1f %unit%"/>
 	</channel-type>
 
+	<channel-type id="returnWaterTemperature">
+		<item-type>Number:Temperature</item-type>
+		<label>Return Water Temperature</label>
+		<description>Gets the temperature of the return water</description>
+		<category>heating</category>
+		<state readOnly="true" pattern="%.1f %unit%"/>
+	</channel-type>
+
 	<channel-type id="dhwSetpoint">
 		<item-type>Number:Temperature</item-type>
 		<label>Domestic Hot Water Setpoint Temperature</label>
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/thing-types.xml
index 53d8754b25f36..3b7dd23b13a58 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/thing-types.xml
@@ -37,6 +37,7 @@
 			<channel id="boilerTemperature" typeId="boilerTemperature"/>
 			<channel id="dhwSetpoint" typeId="dhwSetpoint"/>
 			<channel id="maxBoilerTemperature" typeId="maxBoilerTemperature"/>
+			<channel id="returnWaterTemperature" typeId="returnWaterTemperature"/>
 		</channels>
 
 		<representation-property>id</representation-property>

From 61b5c26b58e998578711c05baa379321a94f3038 Mon Sep 17 00:00:00 2001
From: J-N-K <github@klug.nrw>
Date: Fri, 9 Dec 2022 21:23:53 +0100
Subject: [PATCH 14/48] Upgrade bnd to 6.4.0 (#13890)

* Upgrade bnd to 6.4.0

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 itests/org.openhab.binding.astro.tests/itest.bndrun         | 5 +++--
 itests/org.openhab.binding.avmfritz.tests/itest.bndrun      | 5 +++--
 itests/org.openhab.binding.feed.tests/itest.bndrun          | 4 ++--
 itests/org.openhab.binding.hue.tests/itest.bndrun           | 5 +++--
 itests/org.openhab.binding.max.tests/itest.bndrun           | 5 +++--
 itests/org.openhab.binding.mielecloud.tests/itest.bndrun    | 5 +++--
 itests/org.openhab.binding.modbus.tests/itest.bndrun        | 5 +++--
 .../itest.bndrun                                            | 6 ++++--
 itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun    | 6 ++++--
 itests/org.openhab.binding.nest.tests/itest.bndrun          | 6 ++++--
 itests/org.openhab.binding.ntp.tests/itest.bndrun           | 4 ++--
 itests/org.openhab.binding.systeminfo.tests/itest.bndrun    | 4 ++--
 itests/org.openhab.binding.tradfri.tests/itest.bndrun       | 4 ++--
 itests/org.openhab.binding.wemo.tests/itest.bndrun          | 5 +++--
 itests/org.openhab.persistence.mapdb.tests/itest.bndrun     | 4 ++--
 pom.xml                                                     | 2 +-
 16 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index b120539fdf424..4eeea1a18b199 100644
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.binding.astro
 	com.google.gson;version='[2.8.9,2.8.10)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.astro;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.astro.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -49,4 +48,6 @@ Fragment-Host: org.openhab.binding.astro
 	org.openhab.core.config.discovery;version='[3.4.0,3.4.1)',\
 	org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
 	org.openhab.core.storage.json;version='[3.4.0,3.4.1)',\
-	org.openhab.core.thing;version='[3.4.0,3.4.1)'
+	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 3b4ea885e6e79..a38f433bbc203 100644
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -66,7 +66,6 @@ Fragment-Host: org.openhab.binding.avmfritz
 	org.jupnp;version='[2.6.1,2.6.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.avmfritz;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.avmfritz.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -76,4 +75,6 @@ Fragment-Host: org.openhab.binding.avmfritz
 	org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
 	org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
-	org.openhab.core.thing;version='[3.4.0,3.4.1)'
+	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 2f90b0b1e27a8..4b8b8d380bf6c 100644
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -67,7 +67,6 @@ Fragment-Host: org.openhab.binding.feed
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.feed;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.feed.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -77,4 +76,5 @@ Fragment-Host: org.openhab.binding.feed
 	org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)'
diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 8ddabc812be49..4ab8a0f3b39a2 100644
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -78,6 +78,7 @@ Fragment-Host: org.openhab.binding.hue
 	org.objenesis;version='[3.2.0,3.2.1)',\
 	org.openhab.core.config.discovery.mdns;version='[3.4.0,3.4.1)',\
 	org.openhab.core.io.transport.mdns;version='[3.4.0,3.4.1)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
-	ch.qos.logback.core;version='[1.2.11,1.2.12)'
+	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 28c8444f85949..bfddf41cd5c34 100644
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -56,7 +56,6 @@ Fragment-Host: org.openhab.binding.max
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.max;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.max.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -67,4 +66,6 @@ Fragment-Host: org.openhab.binding.max
 	org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index e6f22b85c83e1..950dc22b1de9b 100644
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -73,7 +73,6 @@ Fragment-Host: org.openhab.binding.mielecloud
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.mielecloud;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.mielecloud.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -86,4 +85,6 @@ Fragment-Host: org.openhab.binding.mielecloud
 	org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 18d8ae971b1d4..c21a990e9c21a 100644
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -63,7 +63,6 @@ Fragment-Host: org.openhab.binding.modbus
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.modbus;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.modbus.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -76,4 +75,6 @@ Fragment-Host: org.openhab.binding.modbus
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
-	org.openhab.core.transform;version='[3.4.0,3.4.1)'
+	org.openhab.core.transform;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index a53b174a1123e..15406f640d965 100644
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -95,7 +95,6 @@ Import-Package: \
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.mqtt;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.mqtt.generic;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.mqtt.homeassistant;version='[3.4.0,3.4.1)',\
@@ -110,4 +109,7 @@ Import-Package: \
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
-	org.openhab.core.transform;version='[3.4.0,3.4.1)'
+	org.openhab.core.transform;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index fe878683b1d88..c2145286a0a2d 100644
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -95,7 +95,6 @@ Import-Package: \
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.mqtt;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.mqtt.generic;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.mqtt.homie;version='[3.4.0,3.4.1)',\
@@ -110,5 +109,8 @@ Import-Package: \
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
-	org.openhab.core.transform;version='[3.4.0,3.4.1)'
+	org.openhab.core.transform;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
 
diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index 45705c2640a8e..03588b51a675e 100644
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -92,7 +92,6 @@ Fragment-Host: org.openhab.binding.nest
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.nest;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.nest.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -105,4 +104,7 @@ Fragment-Host: org.openhab.binding.nest
 	org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.jsr-305;version='[3.0.2,3.0.3)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 5587c500453d1..03d2fe960b627 100644
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -59,7 +59,6 @@ Fragment-Host: org.openhab.binding.ntp
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.ntp;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.ntp.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -72,4 +71,5 @@ Fragment-Host: org.openhab.binding.ntp
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
 	org.apache.commons.commons-net;version='[3.9.0,3.9.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)'
diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 022b2e258e372..abc5e956436e3 100644
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -63,7 +63,6 @@ Fragment-Host: org.openhab.binding.systeminfo
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.systeminfo;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.systeminfo.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.systeminfo
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
-	com.github.oshi.oshi-core;version='[6.2.2,6.2.3)'
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 351ce3454c16e..c867eb024be7a 100644
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -61,7 +61,6 @@ Fragment-Host: org.openhab.binding.tradfri
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.tradfri;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.tradfri.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -79,4 +78,5 @@ Fragment-Host: org.openhab.binding.tradfri
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	org.eclipse.californium.core;version='[2.7.4,2.7.5)',\
 	org.eclipse.californium.element-connector;version='[2.7.4,2.7.5)',\
-	org.eclipse.californium.scandium;version='[2.7.4,2.7.5)'
+	org.eclipse.californium.scandium;version='[2.7.4,2.7.5)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)'
diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index e163b0ec36397..ca8777c87e9f8 100644
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -70,7 +70,6 @@ Fragment-Host: org.openhab.binding.wemo
 	org.jupnp;version='[2.6.1,2.6.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.binding.wemo;version='[3.4.0,3.4.1)',\
 	org.openhab.binding.wemo.tests;version='[3.4.0,3.4.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -84,4 +83,6 @@ Fragment-Host: org.openhab.binding.wemo
 	org.openhab.core.io.transport.upnp;version='[3.4.0,3.4.1)',\
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+	org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index bdaef3d0f1ef4..04b8c2e82f4a1 100644
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -53,10 +53,10 @@ Fragment-Host: org.openhab.persistence.mapdb
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
 	org.openhab.core;version='[3.4.0,3.4.1)',\
 	org.openhab.core.config.core;version='[3.4.0,3.4.1)',\
 	org.openhab.core.persistence;version='[3.4.0,3.4.1)',\
 	org.openhab.core.test;version='[3.4.0,3.4.1)',\
 	org.openhab.persistence.mapdb;version='[3.4.0,3.4.1)',\
-	org.openhab.persistence.mapdb.tests;version='[3.4.0,3.4.1)'
+	org.openhab.persistence.mapdb.tests;version='[3.4.0,3.4.1)',\
+	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)'
diff --git a/pom.xml b/pom.xml
index 0613ca02ebb88..5214b22386791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
     <ohc.version>3.4.0-SNAPSHOT</ohc.version>
-    <bnd.version>6.3.0</bnd.version>
+    <bnd.version>6.4.0</bnd.version>
     <commons.net.version>3.9.0</commons.net.version>
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.12.7</jackson.version>

From b9f092fdb25f06e1b377e629fd9541a5ca0db59c Mon Sep 17 00:00:00 2001
From: lsiepel <leosiepel@gmail.com>
Date: Sat, 10 Dec 2022 08:48:33 +0100
Subject: [PATCH 15/48] [TR064] Fix pattern excluding some valid ip-addresses
 (#13894)

* Improve logging and adjusted timeout
* Fix wanBlockIPs regex

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
---
 .../binding/tr064/internal/soap/SOAPValueConverter.java     | 6 ++++--
 .../src/main/resources/channels.xml                         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java
index f9ff295ea92be..143d4742686c9 100644
--- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java
+++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java
@@ -226,13 +226,15 @@ private State processDecaDecibel(State state, Tr064ChannelConfig channelConfig)
     @SuppressWarnings("unused")
     private State processTamListURL(State state, Tr064ChannelConfig channelConfig) throws PostProcessingException {
         try {
-            ContentResponse response = httpClient.newRequest(state.toString()).timeout(1000, TimeUnit.MILLISECONDS)
+            ContentResponse response = httpClient.newRequest(state.toString()).timeout(1500, TimeUnit.MILLISECONDS)
                     .send();
             String responseContent = response.getContentAsString();
             int messageCount = responseContent.split("<New>1</New>").length - 1;
 
             return new DecimalType(messageCount);
-        } catch (InterruptedException | TimeoutException | ExecutionException e) {
+        } catch (TimeoutException e) {
+            throw new PostProcessingException("Failed to get TAM list due to time out from URL " + state.toString(), e);
+        } catch (InterruptedException | ExecutionException e) {
             throw new PostProcessingException("Failed to get TAM list from URL " + state.toString(), e);
         }
     }
diff --git a/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml b/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
index 489391c7543d6..80e310c4096cf 100644
--- a/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
+++ b/bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
@@ -65,7 +65,7 @@
 			serviceId="urn:X_AVM-DE_HostFilter-com:serviceId:X_AVM-DE_HostFilter1"/>
 		<getAction name="GetWANAccessByIP" argument="NewDisallow">
 			<parameter name="NewIPv4Address" thingParameter="wanBlockIPs"
-				pattern="([1-9]\d{0,2}\.){3}[1-9]\d{0,2}(\s*#.*)*"/>
+				pattern="^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)(\.(?!$)|$)){4}$"/>
 		</getAction>
 		<setAction name="DisallowWANAccessByIP" argument="NewDisallow">
 			<parameter name="NewIPv4Address" thingParameter="wanBlockIPs"/>

From 8e31d8f0cab002aeff3dcef209ff0766319fab39 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Sat, 10 Dec 2022 08:02:11 +0000
Subject: [PATCH 16/48] [siemensrds] Binding no longer fails if thermostat does
 not use optional features (#13888)

* [siemensrds] fix charset; ansi => utf-8
* [siemensrds] refactor class so CI build runs tests w/o errors
* [siemensrds] add missing UoM; fix compiler error
* [siemensrds] fix issue #13887

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../siemensrds/internal/RdsDataPoints.java    | 13 ++--
 .../siemensrds/internal/RdsHandler.java       | 15 +++-
 .../binding/siemensrds/points/BasePoint.java  | 42 +++++++----
 .../{RdsTestData.java => TestRdsData.java}    | 69 +++++++++++--------
 .../test/resources/datapoints_full_set.json   | 16 ++---
 .../resources/datapoints_full_set_new.json    | 16 ++---
 6 files changed, 104 insertions(+), 67 deletions(-)
 rename bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/{RdsTestData.java => TestRdsData.java} (87%)

diff --git a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsDataPoints.java b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsDataPoints.java
index bde36cc5dedb1..652a3047c092a 100644
--- a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsDataPoints.java
+++ b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsDataPoints.java
@@ -83,8 +83,7 @@ public class RdsDataPoints {
      * execute an HTTP GET command on the remote cloud server to retrieve the JSON
      * response from the given urlString
      */
-    protected static String httpGenericGetJson(String apiKey, String token, String urlString)
-            throws RdsCloudException, IOException {
+    protected static String httpGenericGetJson(String apiKey, String token, String urlString) throws IOException {
         /*
          * NOTE: this class uses JAVAX HttpsURLConnection library instead of the
          * preferred JETTY library; the reason is that JETTY does not allow sending the
@@ -196,7 +195,7 @@ public String pointClassToId(String pointClass) throws RdsCloudException {
         }
         @Nullable
         String pointId = indexClassToId.get(pointClass);
-        if (pointId != null) {
+        if (pointId != null && !pointId.isEmpty()) {
             return pointId;
         }
         throw new RdsCloudException(String.format("no pointId to match pointClass \"%s\"", pointClass));
@@ -250,10 +249,12 @@ public boolean refresh(String apiKey, String token) {
                 Set<String> set = new HashSet<>();
                 String pointId;
 
-                for (ChannelMap chan : CHAN_MAP) {
-                    pointId = pointClassToId(chan.clazz);
-                    if (!pointId.isEmpty()) {
+                for (ChannelMap channel : CHAN_MAP) {
+                    try {
+                        pointId = pointClassToId(channel.clazz);
                         set.add(String.format("\"%s\"", pointId));
+                    } catch (RdsCloudException e) {
+                        logger.debug("{} \"{}\" not implemented; don't include in request", channel.id, channel.clazz);
                     }
                 }
 
diff --git a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsHandler.java b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsHandler.java
index 51756a38e736e..1c4ffdac0c6c9 100644
--- a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsHandler.java
+++ b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsHandler.java
@@ -38,6 +38,7 @@
 import org.openhab.core.types.Command;
 import org.openhab.core.types.RefreshType;
 import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,9 +47,9 @@
 /**
  * The {@link RdsHandler} is the OpenHab Handler for Siemens RDS smart
  * thermostats
- * 
+ *
  * @author Andrew Fiddian-Green - Initial contribution
- * 
+ *
  */
 @NonNullByDefault
 public class RdsHandler extends BaseThingHandler {
@@ -229,7 +230,15 @@ private void doPollNow() {
                     continue;
                 }
 
-                BasePoint point = points.getPointByClass(channel.clazz);
+                BasePoint point;
+                try {
+                    point = points.getPointByClass(channel.clazz);
+                } catch (RdsCloudException e) {
+                    logger.debug("{} \"{}\" not implemented; set state to UNDEF", channel.id, channel.clazz);
+                    updateState(channel.id, UnDefType.UNDEF);
+                    continue;
+                }
+
                 State state = null;
 
                 switch (channel.id) {
diff --git a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/points/BasePoint.java b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/points/BasePoint.java
index 476cb0afef157..98cde9a51b0c7 100644
--- a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/points/BasePoint.java
+++ b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/points/BasePoint.java
@@ -12,6 +12,7 @@
  */
 package org.openhab.binding.siemensrds.points;
 
+import javax.measure.MetricPrefix;
 import javax.measure.Unit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -43,6 +44,12 @@ public abstract class BasePoint {
     public static final String DEGREES_KELVIN = "K";
     public static final String PERCENT_RELATIVE_HUMIDITY = "%r.H.";
 
+    private static final String PARTS_PER_MILLION = "ppm";
+    private static final String MILLI_SECOND = "ms";
+    private static final String MINUTE = "min";
+    private static final String HOUR = "h";
+    private static final String AMPERE = "A";
+
     public static final int UNDEFINED_VALUE = -1;
 
     @SerializedName("rep")
@@ -68,7 +75,7 @@ public abstract class BasePoint {
     @SerializedName("presentPriority")
     protected int presentPriority;
 
-    private String @Nullable [] enumVals;
+    private String[] enumVals = {};
     private boolean enumParsed = false;
     protected boolean isEnum = false;
 
@@ -79,7 +86,8 @@ private boolean initEnum() {
         if (!enumParsed) {
             String descr = this.descr;
             if (descr != null && descr.contains("*")) {
-                enumVals = descr.split("\\*");
+                String[] values = descr.split("\\*");
+                enumVals = values;
                 isEnum = true;
             }
         }
@@ -107,8 +115,7 @@ protected boolean isEnum() {
     public State getEnum() {
         if (isEnum()) {
             int index = asInt();
-            String[] enumVals = this.enumVals;
-            if (index >= 0 && enumVals != null && index < enumVals.length) {
+            if (index >= 0 && index < enumVals.length) {
                 return new StringType(enumVals[index]);
             }
         }
@@ -127,8 +134,7 @@ public State getState() {
      */
     public Unit<?> getUnit() {
         /*
-         * determine the Units of Measure if available; note that other possible units
-         * (Ampere, hours, milliseconds, minutes) are currently not implemented
+         * determine the Units of Measure if available
          */
         String descr = this.descr;
         if (descr != null) {
@@ -145,6 +151,21 @@ public Unit<?> getUnit() {
                 case PERCENT_RELATIVE_HUMIDITY: {
                     return Units.PERCENT;
                 }
+                case AMPERE: {
+                    return Units.AMPERE;
+                }
+                case HOUR: {
+                    return Units.HOUR;
+                }
+                case MINUTE: {
+                    return Units.MINUTE;
+                }
+                case MILLI_SECOND: {
+                    return MetricPrefix.MILLI(Units.SECOND);
+                }
+                case PARTS_PER_MILLION: {
+                    return Units.PARTS_PER_MILLION;
+                }
             }
         }
         return Units.ONE;
@@ -155,12 +176,9 @@ public Unit<?> getUnit() {
      */
     public String commandJson(String newVal) {
         if (isEnum()) {
-            String[] enumVals = this.enumVals;
-            if (enumVals != null) {
-                for (int index = 0; index < enumVals.length; index++) {
-                    if (enumVals[index].equals(newVal)) {
-                        return String.format("{\"value\":%d}", index);
-                    }
+            for (int index = 0; index < enumVals.length; index++) {
+                if (enumVals[index].equals(newVal)) {
+                    return String.format("{\"value\":%d}", index);
                 }
             }
         }
diff --git a/bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/RdsTestData.java b/bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/TestRdsData.java
similarity index 87%
rename from bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/RdsTestData.java
rename to bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/TestRdsData.java
index 3acd5fe987cd5..023d6a3927856 100644
--- a/bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/RdsTestData.java
+++ b/bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/TestRdsData.java
@@ -18,10 +18,13 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.measure.quantity.ElectricCurrent;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.junit.jupiter.api.Test;
@@ -38,6 +41,7 @@
 import org.openhab.core.library.unit.SIUnits;
 import org.openhab.core.library.unit.Units;
 import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * test suite
@@ -46,11 +50,11 @@
  *
  */
 @NonNullByDefault
-public class RdsTestData {
+public class TestRdsData {
 
     private String load(String fileName) {
-        try (FileReader file = new FileReader(String.format("src/test/resources/%s.json", fileName));
-                BufferedReader reader = new BufferedReader(file)) {
+        try (FileReader file = new FileReader(String.format("src/test/resources/%s.json", fileName),
+                StandardCharsets.UTF_8); BufferedReader reader = new BufferedReader(file)) {
             StringBuilder builder = new StringBuilder();
             String line;
             while ((line = reader.readLine()) != null) {
@@ -259,14 +263,14 @@ public void testRdsDataPointsFull() {
 
             State state;
             QuantityType<?> celsius;
-
             state = dataPoints.getPointByClass("'TOa").getState();
             assertTrue(state instanceof QuantityType<?>);
             celsius = ((QuantityType<?>) state).toUnit(SIUnits.CELSIUS);
             assertNotNull(celsius);
             assertEquals(18.55, celsius.floatValue(), 0.01);
 
-            assertEquals("0.0", dataPoints.getPointByClass("'HDevElLd").getState().toString());
+            assertEquals(new QuantityType<ElectricCurrent>(0, Units.AMPERE),
+                    dataPoints.getPointByClass("'HDevElLd").getState());
 
             state = dataPoints.getPointByClass("'SpHPcf").getState();
             assertTrue(state instanceof QuantityType<?>);
@@ -316,7 +320,7 @@ public void testRdsDataPointsFull() {
             assertNotNull(celsius);
             assertEquals(35.00, celsius.floatValue(), 0.01);
 
-            assertEquals("30.0", dataPoints.getPointByClass("'WarmUpGrdnt").getState().toString());
+            assertEquals(new QuantityType<>(30, Units.ONE), dataPoints.getPointByClass("'WarmUpGrdnt").getState());
 
             state = dataPoints.getPointByClass("'TRBltnMsvAdj").getState();
             assertTrue(state instanceof QuantityType<?>);
@@ -324,30 +328,35 @@ public void testRdsDataPointsFull() {
             assertNotNull(kelvin);
             assertEquals(35.0, celsius.floatValue(), 0.01);
 
-            assertEquals("0.0", dataPoints.getPointByClass("'Q22Q24ElLd").getState().toString());
-            assertEquals("713.0", dataPoints.getPointByClass("'RAQual").getState().toString());
-            assertEquals("0.0", dataPoints.getPointByClass("'TmpCmfBtn").getState().toString());
-            assertEquals("0.0", dataPoints.getPointByClass("'CmfBtn").getState().toString());
-            assertEquals("0.0", dataPoints.getPointByClass("'RPscDet").getState().toString());
-            assertEquals("1.0", dataPoints.getPointByClass("'EnHCtl").getState().toString());
-            assertEquals("0.0", dataPoints.getPointByClass("'EnRPscDet").getState().toString());
-            assertEquals("2.0", dataPoints.getPointByClass("'OffPrtCnf").getState().toString());
-            assertEquals("3.0", dataPoints.getPointByClass("'OccMod").getState().toString());
-            assertEquals("5.0", dataPoints.getPointByClass("'REei").getState().toString());
-            assertEquals("2.0", dataPoints.getPointByClass("'DhwMod").getState().toString());
-            assertEquals("2.0", dataPoints.getPointByClass("'HCSta").getState().toString());
-            assertEquals("4.0", dataPoints.getPointByClass("'PrOpModRsn").getState().toString());
-            assertEquals("6.0", dataPoints.getPointByClass("'HCtrSet").getState().toString());
-            assertEquals("2.0", dataPoints.getPointByClass("'OsscSet").getState().toString());
-            assertEquals("4.0", dataPoints.getPointByClass("'RAQualInd").getState().toString());
-            assertEquals("500.0", dataPoints.getPointByClass("'KickCyc").getState().toString());
-            assertEquals("180000.0", dataPoints.getPointByClass("'BoDhwTiOnMin").getState().toString());
-            assertEquals("180000.0", dataPoints.getPointByClass("'BoDhwTiOffMin").getState().toString());
-            assertEquals("UNDEF", dataPoints.getPointByClass("'ROpModSched").getState().toString());
-            assertEquals("UNDEF", dataPoints.getPointByClass("'DhwSched").getState().toString());
-            assertEquals("UNDEF", dataPoints.getPointByClass("'ROpModSched").getState().toString());
-            assertEquals("UNDEF", dataPoints.getPointByClass("'DhwSched").getState().toString());
-            assertEquals("253140.0", dataPoints.getPointByClass("'OphH").getState().toString());
+            assertEquals(new QuantityType<>(0, Units.AMPERE), dataPoints.getPointByClass("'Q22Q24ElLd").getState());
+            assertEquals(new QuantityType<>(713, Units.PARTS_PER_MILLION),
+                    dataPoints.getPointByClass("'RAQual").getState());
+
+            assertEquals(new QuantityType<>(0, Units.ONE), dataPoints.getPointByClass("'TmpCmfBtn").getState());
+            assertEquals(new QuantityType<>(0, Units.ONE), dataPoints.getPointByClass("'CmfBtn").getState());
+            assertEquals(new QuantityType<>(0, Units.ONE), dataPoints.getPointByClass("'RPscDet").getState());
+            assertEquals(new QuantityType<>(1, Units.ONE), dataPoints.getPointByClass("'EnHCtl").getState());
+            assertEquals(new QuantityType<>(0, Units.ONE), dataPoints.getPointByClass("'EnRPscDet").getState());
+            assertEquals(new QuantityType<>(2, Units.ONE), dataPoints.getPointByClass("'OffPrtCnf").getState());
+            assertEquals(new QuantityType<>(3, Units.ONE), dataPoints.getPointByClass("'OccMod").getState());
+            assertEquals(new QuantityType<>(5, Units.ONE), dataPoints.getPointByClass("'REei").getState());
+            assertEquals(new QuantityType<>(2, Units.ONE), dataPoints.getPointByClass("'DhwMod").getState());
+            assertEquals(new QuantityType<>(2, Units.ONE), dataPoints.getPointByClass("'HCSta").getState());
+            assertEquals(new QuantityType<>(4, Units.ONE), dataPoints.getPointByClass("'PrOpModRsn").getState());
+            assertEquals(new QuantityType<>(6, Units.ONE), dataPoints.getPointByClass("'HCtrSet").getState());
+            assertEquals(new QuantityType<>(2, Units.ONE), dataPoints.getPointByClass("'OsscSet").getState());
+            assertEquals(new QuantityType<>(4, Units.ONE), dataPoints.getPointByClass("'RAQualInd").getState());
+
+            assertEquals(new QuantityType<>(500, Units.HOUR), dataPoints.getPointByClass("'KickCyc").getState());
+            assertEquals(new QuantityType<>(3, Units.MINUTE), dataPoints.getPointByClass("'BoDhwTiOnMin").getState());
+            assertEquals(new QuantityType<>(3, Units.MINUTE), dataPoints.getPointByClass("'BoDhwTiOffMin").getState());
+
+            assertEquals(UnDefType.UNDEF, dataPoints.getPointByClass("'ROpModSched").getState());
+            assertEquals(UnDefType.UNDEF, dataPoints.getPointByClass("'DhwSched").getState());
+            assertEquals(UnDefType.UNDEF, dataPoints.getPointByClass("'ROpModSched").getState());
+            assertEquals(UnDefType.UNDEF, dataPoints.getPointByClass("'DhwSched").getState());
+
+            assertEquals(new QuantityType<>(253140, Units.MINUTE), dataPoints.getPointByClass("'OphH").getState());
         } catch (RdsCloudException e) {
             fail(e.getMessage());
         }
diff --git a/bundles/org.openhab.binding.siemensrds/src/test/resources/datapoints_full_set.json b/bundles/org.openhab.binding.siemensrds/src/test/resources/datapoints_full_set.json
index 6df106ccff901..7071f6758ef6c 100644
--- a/bundles/org.openhab.binding.siemensrds/src/test/resources/datapoints_full_set.json
+++ b/bundles/org.openhab.binding.siemensrds/src/test/resources/datapoints_full_set.json
@@ -371,7 +371,7 @@
 				-50,
 				80
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Outside air temperature",
 			"objectName": "R(1)'TOa",
 			"memberName": "PresentValue",
@@ -420,7 +420,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Comfort heating setpoint",
 			"objectName": "R(1)'RHvacCoo'TCtlH'SpHCmf",
 			"memberName": "PresentValue",
@@ -444,7 +444,7 @@
 				0,
 				50
 			],
-			"descr": "�F",
+			"descr": "°F",
 			"descriptionName": "Pre-comfort heating setpoint",
 			"objectName": "R(1)'RHvacCoo'TCtlH'SpHPcf",
 			"memberName": "PresentValue",
@@ -468,7 +468,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Economy heating setpoint",
 			"objectName": "R(1)'RHvacCoo'TCtlH'SpHEco",
 			"memberName": "PresentValue",
@@ -492,7 +492,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Protection heating setpoint",
 			"objectName": "R(1)'RHvacCoo'TCtlH'SpHPrt",
 			"memberName": "PresentValue",
@@ -517,7 +517,7 @@
 				12,
 				35
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Room temperature setpoint",
 			"objectName": "R(1)'RHvacCoo'SpTRDtr'SpTR",
 			"memberName": "PresentValue",
@@ -590,7 +590,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Room temperature",
 			"objectName": "R(1)'RHvacCoo'RTemp",
 			"memberName": "PresentValue",
@@ -614,7 +614,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Max. heating setpoint",
 			"objectName": "R(1)'SpTRMaxHCmf",
 			"memberName": "PresentValue",
diff --git a/bundles/org.openhab.binding.siemensrds/src/test/resources/datapoints_full_set_new.json b/bundles/org.openhab.binding.siemensrds/src/test/resources/datapoints_full_set_new.json
index 89b4c92cbb725..f00ee65e57d39 100644
--- a/bundles/org.openhab.binding.siemensrds/src/test/resources/datapoints_full_set_new.json
+++ b/bundles/org.openhab.binding.siemensrds/src/test/resources/datapoints_full_set_new.json
@@ -470,7 +470,7 @@
 				-50,
 				80
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Outside air temperature",
 			"objectName": "R(1)'TOa",
 			"memberName": "PresentValue",
@@ -497,7 +497,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Comfort heating setpoint",
 			"objectName": "R(1)'RHvacCoo'TCtlH'SpHCmf",
 			"memberName": "PresentValue",
@@ -523,7 +523,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Economy heating setpoint",
 			"objectName": "R(1)'RHvacCoo'TCtlH'SpHPcf",
 			"memberName": "PresentValue",
@@ -549,7 +549,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Unoccupied heating setpoint",
 			"objectName": "R(1)'RHvacCoo'TCtlH'SpHEco",
 			"memberName": "PresentValue",
@@ -575,7 +575,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Protection heating setpoint",
 			"objectName": "R(1)'RHvacCoo'TCtlH'SpHPrt",
 			"memberName": "PresentValue",
@@ -602,7 +602,7 @@
 				6,
 				35
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Room temperature setpoint",
 			"objectName": "R(1)'RHvacCoo'SpTRDtr'SpTR",
 			"memberName": "PresentValue",
@@ -681,7 +681,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Room temperature",
 			"objectName": "R(1)'RHvacCoo'RTemp",
 			"memberName": "PresentValue",
@@ -707,7 +707,7 @@
 				0,
 				50
 			],
-			"descr": "�C",
+			"descr": "°C",
 			"descriptionName": "Max. heating setpoint",
 			"objectName": "R(1)'SpTRMaxHCmf",
 			"memberName": "PresentValue",

From 92310fab2ffa6bb807148d598aa1f0f74fe55aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lange?= <bjoern.lange@udo.edu>
Date: Sat, 10 Dec 2022 09:40:50 +0100
Subject: [PATCH 17/48] [mielecloud] Remove things after each integration test
 (#13875)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Björn Lange <bjoern.lange@itemis.de>
---
 .../internal/handler/AbstractMieleThingHandlerTest.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/handler/AbstractMieleThingHandlerTest.java b/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/handler/AbstractMieleThingHandlerTest.java
index 6e03ddcacee34..8d408b83ee6b7 100644
--- a/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/handler/AbstractMieleThingHandlerTest.java
+++ b/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/handler/AbstractMieleThingHandlerTest.java
@@ -27,6 +27,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openhab.binding.mielecloud.internal.MieleCloudBindingConstants;
@@ -366,6 +367,12 @@ protected State getChannelState(String channelUid) {
      */
     protected abstract AbstractMieleThingHandler setUpThingHandler();
 
+    @AfterEach
+    public void tearDownAbstractMieleThingHandlerTest() {
+        getThingRegistry().forceRemove(getThingHandler().getThing().getUID());
+        getThingRegistry().forceRemove(getBridge().getUID());
+    }
+
     @Test
     public void testCachedStateIsQueriedOnInitialize() throws Exception {
         // given:

From db86d291dab319bfd7449cf2b823690d38d56a74 Mon Sep 17 00:00:00 2001
From: lsiepel <leosiepel@gmail.com>
Date: Sat, 10 Dec 2022 09:42:09 +0100
Subject: [PATCH 18/48] [bosesoundtouch] Improve SAT errors and remove
 dependency (#13842)

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
---
 .../bosesoundtouch/internal/APIRequest.java   |   4 +
 .../internal/AvailableSources.java            |   4 +
 .../BoseSoundTouchBindingConstants.java       |   2 +
 .../internal/BoseSoundTouchConfiguration.java |  11 +-
 .../BoseSoundTouchHandlerFactory.java         |  26 +-
 .../BoseSoundTouchNotFoundException.java      |   3 +
 ...TouchNotificationChannelConfiguration.java |  14 +-
 .../internal/CommandExecutor.java             |  89 +++----
 .../bosesoundtouch/internal/ContentItem.java  | 128 +++++-----
 .../internal/ContentItemMaker.java            |   3 +
 .../ContentItemNotPresetableException.java    |   3 +
 .../NoInternetRadioPresetFoundException.java  |   3 +
 .../internal/NoPresetFoundException.java      |   3 +
 .../NoStoredMusicPresetFoundException.java    |   3 +
 .../OperationModeNotAvailableException.java   |   3 +
 .../internal/OperationModeType.java           |   3 +
 .../internal/PresetContainer.java             |  17 +-
 .../internal/RemoteKeyType.java               |   3 +
 .../internal/XMLHandlerState.java             |   3 +
 .../internal/XMLResponseHandler.java          | 232 ++++++++++--------
 .../internal/XMLResponseProcessor.java        |  18 +-
 .../internal/discovery/DiscoveryUtil.java     |   8 +-
 .../SoundTouchDiscoveryParticipant.java       |  55 +++--
 .../handler/BoseSoundTouchHandler.java        | 181 ++++++++------
 24 files changed, 473 insertions(+), 346 deletions(-)

diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/APIRequest.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/APIRequest.java
index 246ca994f5f2f..9913ed463c560 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/APIRequest.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/APIRequest.java
@@ -12,11 +12,15 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link APIRequest} class handles the API requests
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+
+@NonNullByDefault
 public enum APIRequest {
     KEY("key"),
     SELECT("select"),
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/AvailableSources.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/AvailableSources.java
index c90069c458aaf..8b4625fea4384 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/AvailableSources.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/AvailableSources.java
@@ -12,11 +12,15 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link AvailableSources} is used to find out, which sources and functions are available
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+
+@NonNullByDefault
 public interface AvailableSources {
 
     public boolean isBluetoothAvailable();
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchBindingConstants.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchBindingConstants.java
index b4fb6cbb6b240..0bb236eb6b373 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchBindingConstants.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchBindingConstants.java
@@ -19,6 +19,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.thing.ThingTypeUID;
 
 /**
@@ -28,6 +29,7 @@
  * @author Christian Niessner - Initial contribution
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class BoseSoundTouchBindingConstants {
 
     public static final String BINDING_ID = "bosesoundtouch";
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchConfiguration.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchConfiguration.java
index 169a96aa2519e..e7450fa6119c3 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchConfiguration.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchConfiguration.java
@@ -12,6 +12,8 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.core.thing.Thing;
 
 /**
@@ -19,6 +21,7 @@
  *
  * @author Ivaylo Ivanov - Initial contribution
  */
+@NonNullByDefault
 public class BoseSoundTouchConfiguration {
 
     // Device configuration parameters;
@@ -26,10 +29,10 @@ public class BoseSoundTouchConfiguration {
     public static final String MAC_ADDRESS = Thing.PROPERTY_MAC_ADDRESS;
     public static final String APP_KEY = "appKey";
 
-    public String host;
-    public String macAddress;
-    public String appKey;
+    public @Nullable String host;
+    public @Nullable String macAddress;
+    public @Nullable String appKey;
 
     // Not an actual configuration field, but it will contain the name of the group (in case of Stereo Pair)
-    public String groupName;
+    public String groupName = "";
 }
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchHandlerFactory.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchHandlerFactory.java
index 0ffd28c3a63c4..47544dc2f2169 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchHandlerFactory.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchHandlerFactory.java
@@ -14,6 +14,8 @@
 
 import static org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchBindingConstants.SUPPORTED_THING_TYPES_UIDS;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.bosesoundtouch.internal.handler.BoseSoundTouchHandler;
 import org.openhab.core.storage.Storage;
 import org.openhab.core.storage.StorageService;
@@ -31,11 +33,12 @@
  *
  * @author Christian Niessner - Initial contribution
  */
+@NonNullByDefault
 @Component(service = ThingHandlerFactory.class, configurationPid = "binding.bosesoundtouch")
 public class BoseSoundTouchHandlerFactory extends BaseThingHandlerFactory {
 
-    private StorageService storageService;
-    private BoseStateDescriptionOptionProvider stateOptionProvider;
+    private @Nullable StorageService storageService;
+    private @Nullable BoseStateDescriptionOptionProvider stateOptionProvider;
 
     @Override
     public boolean supportsThingType(ThingTypeUID thingTypeUID) {
@@ -43,12 +46,19 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
     }
 
     @Override
-    protected ThingHandler createHandler(Thing thing) {
-        Storage<ContentItem> storage = storageService.getStorage(thing.getUID().toString(),
-                ContentItem.class.getClassLoader());
-        BoseSoundTouchHandler handler = new BoseSoundTouchHandler(thing, new PresetContainer(storage),
-                stateOptionProvider);
-        return handler;
+    protected @Nullable ThingHandler createHandler(Thing thing) {
+        StorageService localStorageService = storageService;
+        if (localStorageService != null) {
+            Storage<ContentItem> storage = localStorageService.getStorage(thing.getUID().toString(),
+                    ContentItem.class.getClassLoader());
+            BoseStateDescriptionOptionProvider localDescriptionOptionProvider = stateOptionProvider;
+            if (localDescriptionOptionProvider != null) {
+                BoseSoundTouchHandler handler = new BoseSoundTouchHandler(thing, new PresetContainer(storage),
+                        localDescriptionOptionProvider);
+                return handler;
+            }
+        }
+        return null;
     }
 
     @Reference
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchNotFoundException.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchNotFoundException.java
index bbe3f3593ee67..40c580a4022b0 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchNotFoundException.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchNotFoundException.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link BoseSoundTouchNotFoundException} class is an exception
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class BoseSoundTouchNotFoundException extends Exception {
     private static final long serialVersionUID = 1L;
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchNotificationChannelConfiguration.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchNotificationChannelConfiguration.java
index bb12d39a7dde2..5fe3552b6db7f 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchNotificationChannelConfiguration.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchNotificationChannelConfiguration.java
@@ -12,11 +12,15 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
 /**
  * Configuration class for soundtouch notification channel
  *
  * @author Ivaylo Ivanov - Initial contribution
  */
+@NonNullByDefault
 public class BoseSoundTouchNotificationChannelConfiguration {
 
     public static final String MIN_FIRMWARE = "14";
@@ -27,13 +31,13 @@ public class BoseSoundTouchNotificationChannelConfiguration {
     public static final String NOTIFICATION_REASON = "notificationReason";
     public static final String NOTIFICATION_MESSAGE = "notificationMessage";
 
-    public Integer notificationVolume;
-    public String notificationService;
-    public String notificationReason;
-    public String notificationMessage;
+    public @Nullable Integer notificationVolume;
+    public @Nullable String notificationService;
+    public @Nullable String notificationReason;
+    public @Nullable String notificationMessage;
 
     public static boolean isSupportedFirmware(String firmware) {
-        return firmware != null && firmware.compareTo(MIN_FIRMWARE) > 0;
+        return firmware.compareTo(MIN_FIRMWARE) > 0;
     }
 
     public static boolean isSupportedHardware(String hardware) {
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/CommandExecutor.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/CommandExecutor.java
index d069090755112..7a01af6069857 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/CommandExecutor.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/CommandExecutor.java
@@ -18,6 +18,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.jetty.websocket.api.Session;
 import org.openhab.binding.bosesoundtouch.internal.handler.BoseSoundTouchHandler;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.NextPreviousType;
@@ -36,16 +39,17 @@
  * @author Thomas Traunbauer - Initial contribution
  * @author Kai Kreuzer - code clean up
  */
+@NonNullByDefault
 public class CommandExecutor implements AvailableSources {
     private final Logger logger = LoggerFactory.getLogger(CommandExecutor.class);
 
     private final BoseSoundTouchHandler handler;
 
     private boolean currentMuted;
-    private ContentItem currentContentItem;
-    private OperationModeType currentOperationMode;
+    private @Nullable ContentItem currentContentItem = null;
+    private @Nullable OperationModeType currentOperationMode;
 
-    private Map<String, Boolean> mapOfAvailableFunctions;
+    private final Map<String, Boolean> mapOfAvailableFunctions = new HashMap<>();
 
     /**
      * Creates a new instance of this class
@@ -54,7 +58,8 @@ public class CommandExecutor implements AvailableSources {
      */
     public CommandExecutor(BoseSoundTouchHandler handler) {
         this.handler = handler;
-        init();
+        getInformations(APIRequest.INFO);
+        currentOperationMode = OperationModeType.OFFLINE;
     }
 
     /**
@@ -66,11 +71,7 @@ public CommandExecutor(BoseSoundTouchHandler handler) {
     public void updatePresetContainerFromPlayer(Map<Integer, ContentItem> playerPresets) {
         playerPresets.forEach((k, v) -> {
             try {
-                if (v != null) {
-                    handler.getPresetContainer().put(k, v);
-                } else {
-                    handler.getPresetContainer().remove(k);
-                }
+                handler.getPresetContainer().put(k, v);
             } catch (ContentItemNotPresetableException e) {
                 logger.debug("{}: ContentItem is not presetable", handler.getDeviceName());
             }
@@ -104,7 +105,10 @@ public void addContentItemToPresetContainer(int id, ContentItem contentItem) {
      */
     public void addCurrentContentItemToPresetContainer(DecimalType command) {
         if (command.intValue() > 6) {
-            addContentItemToPresetContainer(command.intValue(), currentContentItem);
+            ContentItem localContentItem = currentContentItem;
+            if (localContentItem != null) {
+                addContentItemToPresetContainer(command.intValue(), localContentItem);
+            }
         } else {
             logger.warn("{}: Only PresetID >6 is allowed", handler.getDeviceName());
         }
@@ -118,8 +122,11 @@ public void addCurrentContentItemToPresetContainer(DecimalType command) {
     public void getInformations(APIRequest apiRequest) {
         String msg = "<msg><header " + "deviceID=\"" + handler.getMacAddress() + "\"" + " url=\"" + apiRequest
                 + "\" method=\"GET\"><request requestID=\"0\"><info type=\"new\"/></request></header></msg>";
-        handler.getSession().getRemote().sendStringByFuture(msg);
-        logger.debug("{}: sending request: {}", handler.getDeviceName(), msg);
+        Session localSession = handler.getSession();
+        if (localSession != null) {
+            localSession.getRemote().sendStringByFuture(msg);
+            logger.debug("{}: sending request: {}", handler.getDeviceName(), msg);
+        }
     }
 
     /**
@@ -128,25 +135,27 @@ public void getInformations(APIRequest apiRequest) {
      * @param contentItem
      */
     public void setCurrentContentItem(ContentItem contentItem) {
-        if ((contentItem != null) && (contentItem.isValid())) {
+        if (contentItem.isValid()) {
             ContentItem psFound = null;
-            if (handler.getPresetContainer() != null) {
-                Collection<ContentItem> listOfPresets = handler.getPresetContainer().getAllPresets();
-                for (ContentItem ps : listOfPresets) {
-                    if (ps.isPresetable()) {
-                        if (ps.getLocation().equals(contentItem.getLocation())) {
+            Collection<ContentItem> listOfPresets = handler.getPresetContainer().getAllPresets();
+            for (ContentItem ps : listOfPresets) {
+                if (ps.isPresetable()) {
+                    String localLocation = ps.getLocation();
+                    if (localLocation != null) {
+                        if (localLocation.equals(contentItem.getLocation())) {
                             psFound = ps;
                         }
                     }
                 }
-                int presetID = 0;
-                if (psFound != null) {
-                    presetID = psFound.getPresetID();
-                }
-                contentItem.setPresetID(presetID);
-
-                currentContentItem = contentItem;
             }
+            int presetID = 0;
+            if (psFound != null) {
+                presetID = psFound.getPresetID();
+            }
+            contentItem.setPresetID(presetID);
+
+            currentContentItem = contentItem;
+
         }
         updateOperatingValues();
     }
@@ -350,19 +359,9 @@ public void updatePresetGUIState(DecimalType state) {
         handler.updateState(CHANNEL_PRESET, state);
     }
 
-    private void init() {
-        getInformations(APIRequest.INFO);
-        currentOperationMode = OperationModeType.OFFLINE;
-        currentContentItem = null;
-
-        mapOfAvailableFunctions = new HashMap<>();
-    }
-
     private void postContentItem(ContentItem contentItem) {
-        if (contentItem != null) {
-            setCurrentContentItem(contentItem);
-            sendPostRequestInWebSocket("select", "", contentItem.generateXML());
-        }
+        setCurrentContentItem(contentItem);
+        sendPostRequestInWebSocket("select", "", contentItem.generateXML());
     }
 
     private void sendPostRequestInWebSocket(String url, String postData) {
@@ -374,19 +373,21 @@ private void sendPostRequestInWebSocket(String url, String infoAddon, String pos
         String msg = "<msg><header " + "deviceID=\"" + handler.getMacAddress() + "\"" + " url=\"" + url
                 + "\" method=\"POST\"><request requestID=\"" + id + "\"><info " + infoAddon
                 + " type=\"new\"/></request></header><body>" + postData + "</body></msg>";
-        try {
-            handler.getSession().getRemote().sendStringByFuture(msg);
+        Session localSession = handler.getSession();
+        if (localSession != null) {
+            localSession.getRemote().sendStringByFuture(msg);
             logger.debug("{}: sending request: {}", handler.getDeviceName(), msg);
-        } catch (NullPointerException e) {
-            handler.onWebSocketError(e);
+        } else {
+            handler.onWebSocketError(new NullPointerException("NPE: Session is unexpected null"));
         }
     }
 
     private void updateOperatingValues() {
         OperationModeType operationMode;
-        if (currentContentItem != null) {
-            updatePresetGUIState(new DecimalType(currentContentItem.getPresetID()));
-            operationMode = currentContentItem.getOperationMode();
+        ContentItem localContentItem = currentContentItem;
+        if (localContentItem != null) {
+            updatePresetGUIState(new DecimalType(localContentItem.getPresetID()));
+            operationMode = localContentItem.getOperationMode();
         } else {
             operationMode = OperationModeType.STANDBY;
         }
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItem.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItem.java
index 933c3b0513250..348eb7c676600 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItem.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItem.java
@@ -16,7 +16,8 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.core.types.StateOption;
 
 import com.google.gson.annotations.Expose;
@@ -27,31 +28,18 @@
  * @author Christian Niessner - Initial contribution
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class ContentItem {
 
-    private String source;
-    private String sourceAccount;
-    private String location;
-    private boolean presetable;
-    private String itemName;
-    private int presetID;
-    private String containerArt;
+    private String source = "";
+    private @Nullable String sourceAccount;
+    private @Nullable String location;
+    private boolean presetable = false;
+    private @Nullable String itemName;
+    private int presetID = 0;
+    private @Nullable String containerArt;
     @Expose
-    private final Map<String, String> additionalAttributes;
-
-    /**
-     * Creates a new instance of this class
-     */
-    public ContentItem() {
-        source = "";
-        sourceAccount = null;
-        location = null;
-        presetable = false;
-        itemName = null;
-        presetID = 0;
-        containerArt = null;
-        additionalAttributes = new HashMap<>();
-    }
+    private final Map<String, String> additionalAttributes = new HashMap<>();
 
     /**
      * Returns true if this ContentItem is defined as Preset
@@ -74,11 +62,13 @@ public boolean isPreset() {
     public boolean isValid() {
         if (getOperationMode() == OperationModeType.STANDBY) {
             return true;
-        }
-        if (itemName == null || source == null || itemName.isEmpty() || source.isEmpty()) {
-            return false;
         } else {
-            return true;
+            String localItemName = itemName;
+            if (localItemName != null) {
+                return !(localItemName.isEmpty() || source.isEmpty());
+            } else {
+                return false;
+            }
         }
     }
 
@@ -88,25 +78,12 @@ public boolean isValid() {
      * @return true if source, sourceAccount, location, itemName, and presetable are equal
      */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (obj instanceof ContentItem) {
             ContentItem other = (ContentItem) obj;
-            if (!Objects.equals(other.source, this.source)) {
-                return false;
-            }
-            if (!Objects.equals(other.sourceAccount, this.sourceAccount)) {
-                return false;
-            }
-            if (other.presetable != this.presetable) {
-                return false;
-            }
-            if (!Objects.equals(other.location, this.location)) {
-                return false;
-            }
-            if (!Objects.equals(other.itemName, this.itemName)) {
-                return false;
-            }
-            return true;
+            return Objects.equals(other.source, this.source) || Objects.equals(other.sourceAccount, this.sourceAccount)
+                    || other.presetable == this.presetable || Objects.equals(other.location, this.location)
+                    || Objects.equals(other.itemName, this.itemName);
         }
         return super.equals(obj);
     }
@@ -118,15 +95,18 @@ public boolean equals(Object obj) {
      */
     public OperationModeType getOperationMode() {
         OperationModeType operationMode = OperationModeType.OTHER;
-        if (source == null || source.equals("")) {
+        if ("".equals(source)) {
             return OperationModeType.OTHER;
         }
         if (source.contains("PRODUCT")) {
-            if (sourceAccount.contains("TV")) {
-                operationMode = OperationModeType.TV;
-            }
-            if (sourceAccount.contains("HDMI")) {
-                operationMode = OperationModeType.HDMI1;
+            String localSourceAccount = sourceAccount;
+            if (localSourceAccount != null) {
+                if (localSourceAccount.contains("TV")) {
+                    operationMode = OperationModeType.TV;
+                }
+                if (localSourceAccount.contains("HDMI")) {
+                    operationMode = OperationModeType.HDMI1;
+                }
             }
             return operationMode;
         }
@@ -174,15 +154,15 @@ public String getSource() {
         return source;
     }
 
-    public String getSourceAccount() {
+    public @Nullable String getSourceAccount() {
         return sourceAccount;
     }
 
-    public String getLocation() {
+    public @Nullable String getLocation() {
         return location;
     }
 
-    public String getItemName() {
+    public @Nullable String getItemName() {
         return itemName;
     }
 
@@ -194,10 +174,28 @@ public int getPresetID() {
         return presetID;
     }
 
-    public String getContainerArt() {
+    public @Nullable String getContainerArt() {
         return containerArt;
     }
 
+    /**
+     * Simple method to escape XML special characters in String.
+     * There are five XML Special characters which needs to be escaped :
+     * & - &amp;
+     * < - &lt;
+     * > - &gt;
+     * " - &quot;
+     * ' - &apos;
+     */
+    private String escapeXml(String xml) {
+        xml = xml.replaceAll("&", "&amp;");
+        xml = xml.replaceAll("<", "&lt;");
+        xml = xml.replaceAll(">", "&gt;");
+        xml = xml.replaceAll("\"", "&quot;");
+        xml = xml.replaceAll("'", "&apos;");
+        return xml;
+    }
+
     /**
      * Returns the XML Code that is needed to switch to this ContentItem
      *
@@ -223,19 +221,20 @@ public String generateXML() {
                 break;
             default:
                 StringBuilder sbXml = new StringBuilder("<ContentItem");
-                if (source != null) {
-                    sbXml.append(" source=\"").append(StringEscapeUtils.escapeXml(source)).append("\"");
-                }
-                if (location != null) {
-                    sbXml.append(" location=\"").append(StringEscapeUtils.escapeXml(location)).append("\"");
+
+                sbXml.append(" source=\"").append(escapeXml(source)).append("\"");
+
+                String localLocation = location;
+                if (localLocation != null) {
+                    sbXml.append(" location=\"").append(escapeXml(localLocation)).append("\"");
                 }
-                if (sourceAccount != null) {
-                    sbXml.append(" sourceAccount=\"").append(StringEscapeUtils.escapeXml(sourceAccount)).append("\"");
+                String localSourceAccount = sourceAccount;
+                if (localSourceAccount != null) {
+                    sbXml.append(" sourceAccount=\"").append(escapeXml(localSourceAccount)).append("\"");
                 }
                 sbXml.append(" isPresetable=\"").append(presetable).append("\"");
                 for (Map.Entry<String, String> aae : additionalAttributes.entrySet()) {
-                    sbXml.append(" ").append(aae.getKey()).append("=\"")
-                            .append(StringEscapeUtils.escapeXml(aae.getValue())).append("\"");
+                    sbXml.append(" ").append(aae.getKey()).append("=\"").append(escapeXml(aae.getValue())).append("\"");
                 }
                 sbXml.append(">");
                 if (itemName != null) {
@@ -264,6 +263,7 @@ public String toString() {
         // buffer.append(presetID);
         // return buffer.toString();
         // }
-        return itemName;
+        String localString = itemName;
+        return (localString != null) ? localString : "";
     }
 }
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItemMaker.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItemMaker.java
index 05fe9b5621920..8d341f15496c0 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItemMaker.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItemMaker.java
@@ -14,11 +14,14 @@
 
 import java.util.Collection;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link ContentItemMaker} class makes ContentItems for sources
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class ContentItemMaker {
 
     private final PresetContainer presetContainer;
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItemNotPresetableException.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItemNotPresetableException.java
index d7c9d78aca84d..2d33066b94bd1 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItemNotPresetableException.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/ContentItemNotPresetableException.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link ContentItemNotPresetableException} class is an exception
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class ContentItemNotPresetableException extends NoPresetFoundException {
     private static final long serialVersionUID = 1L;
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoInternetRadioPresetFoundException.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoInternetRadioPresetFoundException.java
index 6f3422aea7360..56f08c56509b6 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoInternetRadioPresetFoundException.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoInternetRadioPresetFoundException.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link NoInternetRadioPresetFoundException} class is an exception
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class NoInternetRadioPresetFoundException extends NoPresetFoundException {
     private static final long serialVersionUID = 1L;
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoPresetFoundException.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoPresetFoundException.java
index 2406a6633656b..f7b72a8d43fb4 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoPresetFoundException.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoPresetFoundException.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link NoPresetFoundException} class is an exception
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class NoPresetFoundException extends Exception {
     private static final long serialVersionUID = 1L;
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoStoredMusicPresetFoundException.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoStoredMusicPresetFoundException.java
index 83f85e726ba75..21e1f5dc5f408 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoStoredMusicPresetFoundException.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/NoStoredMusicPresetFoundException.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link NoStoredMusicPresetFoundException} class is an exception
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class NoStoredMusicPresetFoundException extends NoPresetFoundException {
     private static final long serialVersionUID = 1L;
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/OperationModeNotAvailableException.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/OperationModeNotAvailableException.java
index 8221973c4664d..976edd21f382c 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/OperationModeNotAvailableException.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/OperationModeNotAvailableException.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link OperationModeNotAvailableException} class is an exception
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class OperationModeNotAvailableException extends Exception {
     private static final long serialVersionUID = 1L;
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/OperationModeType.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/OperationModeType.java
index f59955a53965f..ba72f5ab51a5a 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/OperationModeType.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/OperationModeType.java
@@ -12,12 +12,15 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link OperationModeType} class is holding all OperationModes
  *
  * @author Christian Niessner - Initial contribution
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public enum OperationModeType {
     OFFLINE,
     STANDBY,
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/PresetContainer.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/PresetContainer.java
index 8d7946d9f286f..dfc033fe2ed39 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/PresetContainer.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/PresetContainer.java
@@ -17,8 +17,11 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.core.storage.DeletableStorage;
 import org.openhab.core.storage.Storage;
 import org.slf4j.Logger;
@@ -30,11 +33,12 @@
  * @author Thomas Traunbauer - Initial contribution
  * @author Kai Kreuzer - Refactored it to use storage instead of file
  */
+@NonNullByDefault
 public class PresetContainer {
 
     private final Logger logger = LoggerFactory.getLogger(PresetContainer.class);
 
-    private HashMap<Integer, ContentItem> mapOfPresets;
+    private final Map<Integer, ContentItem> mapOfPresets = new HashMap<>();
     private Storage<ContentItem> storage;
 
     /**
@@ -42,11 +46,6 @@ public class PresetContainer {
      */
     public PresetContainer(Storage<ContentItem> storage) {
         this.storage = storage;
-        init();
-    }
-
-    private void init() {
-        this.mapOfPresets = new HashMap<>();
         readFromStorage();
     }
 
@@ -133,10 +132,12 @@ private void writeToStorage() {
     }
 
     private void readFromStorage() {
-        Collection<ContentItem> items = storage.getValues();
+        Collection<@Nullable ContentItem> items = storage.getValues();
         for (ContentItem item : items) {
             try {
-                put(item.getPresetID(), item);
+                if (item != null) {
+                    put(item.getPresetID(), item);
+                }
             } catch (ContentItemNotPresetableException e) {
                 logger.debug("Item '{}' is not presetable - ignoring it.", item.getItemName());
             }
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/RemoteKeyType.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/RemoteKeyType.java
index 89994b5c0e678..cca679acd017a 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/RemoteKeyType.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/RemoteKeyType.java
@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link RemoteKeyType} class is holding the Keys on a remote. For simulating key presses
  *
  * @author Christian Niessner - Initial contribution
  */
+@NonNullByDefault
 public enum RemoteKeyType {
     PLAY,
     PAUSE,
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLHandlerState.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLHandlerState.java
index 30993d9e0bdbf..6c600d996e22b 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLHandlerState.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLHandlerState.java
@@ -12,12 +12,15 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link XMLHandlerState} class defines the XML States provided from Bose Soundtouch
  *
  * @author Christian Niessner - Initial contribution
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public enum XMLHandlerState {
     INIT,
     Msg,
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java
index 653ef3342bc95..502680e58beab 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java
@@ -22,6 +22,7 @@
 import java.util.Objects;
 import java.util.Stack;
 
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.bosesoundtouch.internal.handler.BoseSoundTouchHandler;
 import org.openhab.core.io.net.http.HttpUtil;
 import org.openhab.core.library.types.DecimalType;
@@ -54,8 +55,8 @@ public class XMLResponseHandler extends DefaultHandler {
 
     private Map<XMLHandlerState, Map<String, XMLHandlerState>> stateSwitchingMap;
 
-    private Stack<XMLHandlerState> states;
-    private XMLHandlerState state;
+    private final Stack<XMLHandlerState> states = new Stack<>();
+    private XMLHandlerState state = XMLHandlerState.INIT;
     private boolean msgHeaderWasValid;
 
     private ContentItem contentItem;
@@ -63,10 +64,10 @@ public class XMLResponseHandler extends DefaultHandler {
     private OnOffType rateEnabled;
     private OnOffType skipEnabled;
     private OnOffType skipPreviousEnabled;
-
     private State nowPlayingSource;
 
     private BoseSoundTouchConfiguration masterDeviceId;
+
     String deviceId;
 
     private Map<Integer, ContentItem> playerPresets;
@@ -82,11 +83,11 @@ public XMLResponseHandler(BoseSoundTouchHandler handler,
         this.handler = handler;
         this.commandExecutor = handler.getCommandExecutor();
         this.stateSwitchingMap = stateSwitchingMap;
-        init();
     }
 
     @Override
-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+    public void startElement(@Nullable String uri, @Nullable String localName, @Nullable String qName,
+            @Nullable Attributes attributes) throws SAXException {
         super.startElement(uri, localName, qName, attributes);
         logger.trace("{}: startElement('{}'; state: {})", handler.getDeviceName(), localName, state);
         states.push(state);
@@ -94,7 +95,13 @@ public void startElement(String uri, String localName, String qName, Attributes
         Map<String, XMLHandlerState> stateMap = stateSwitchingMap.get(state);
         state = XMLHandlerState.Unprocessed; // set default value; we avoid default in select to have the compiler
                                              // showing a
-        // warning for unhandled states
+                                             // warning for unhandled states
+
+        XMLHandlerState localState = null;
+        if (stateMap != null) {
+            localState = stateMap.get(localName);
+        }
+
         switch (curState) {
             case INIT:
                 if ("updates".equals(localName)) {
@@ -105,12 +112,9 @@ public void startElement(String uri, String localName, String qName, Attributes
                         state = XMLHandlerState.Unprocessed;
                     }
                 } else {
-                    state = stateMap.get(localName);
-                    if (state == null) {
-                        if (logger.isDebugEnabled()) {
-                            logger.warn("{}: Unhandled XML entity during {}: '{}", handler.getDeviceName(), curState,
-                                    localName);
-                        }
+                    if (localState == null) {
+                        logger.debug("{}: Unhandled XML entity during {}: '{}", handler.getDeviceName(), curState,
+                                localName);
                         state = XMLHandlerState.Unprocessed;
                     }
                 }
@@ -131,10 +135,9 @@ public void startElement(String uri, String localName, String qName, Attributes
                         state = XMLHandlerState.Unprocessed;
                     }
                 } else {
-                    if (logger.isDebugEnabled()) {
-                        logger.warn("{}: Unhandled XML entity during {}: '{}'", handler.getDeviceName(), curState,
-                                localName);
-                    }
+                    logger.debug("{}: Unhandled XML entity during {}: '{}'", handler.getDeviceName(), curState,
+                            localName);
+
                     state = XMLHandlerState.Unprocessed;
                 }
                 break;
@@ -142,10 +145,8 @@ public void startElement(String uri, String localName, String qName, Attributes
                 if ("request".equals(localName)) {
                     state = XMLHandlerState.Unprocessed; // TODO implement request id / response tracking...
                 } else {
-                    if (logger.isDebugEnabled()) {
-                        logger.warn("{}: Unhandled XML entity during {}: '{}'", handler.getDeviceName(), curState,
-                                localName);
-                    }
+                    logger.debug("{}: Unhandled XML entity during {}: '{}'", handler.getDeviceName(), curState,
+                            localName);
                     state = XMLHandlerState.Unprocessed;
                 }
                 break;
@@ -161,7 +162,10 @@ public void startElement(String uri, String localName, String qName, Attributes
                     skipEnabled = OnOffType.OFF;
                     skipPreviousEnabled = OnOffType.OFF;
                     state = XMLHandlerState.NowPlaying;
-                    String source = attributes.getValue("source");
+                    String source = "";
+                    if (attributes != null) {
+                        source = attributes.getValue("source");
+                    }
                     if (nowPlayingSource == null || !nowPlayingSource.toString().equals(source)) {
                         // source changed
                         nowPlayingSource = new StringType(source);
@@ -192,14 +196,11 @@ public void startElement(String uri, String localName, String qName, Attributes
                     state = XMLHandlerState.Presets;
                 } else if ("group".equals(localName)) {
                     this.masterDeviceId = new BoseSoundTouchConfiguration();
-                    state = stateMap.get(localName);
                 } else {
-                    state = stateMap.get(localName);
-                    if (state == null) {
-                        if (logger.isDebugEnabled()) {
-                            logger.warn("{}: Unhandled XML entity during {}: '{}", handler.getDeviceName(), curState,
-                                    localName);
-                        }
+                    if (localState == null) {
+                        logger.debug("{}: Unhandled XML entity during {}: '{}", handler.getDeviceName(), curState,
+                                localName);
+
                         state = XMLHandlerState.Unprocessed;
                     } else if (state != XMLHandlerState.Volume && state != XMLHandlerState.Presets
                             && state != XMLHandlerState.Group && state != XMLHandlerState.Unprocessed) {
@@ -213,63 +214,78 @@ public void startElement(String uri, String localName, String qName, Attributes
             case Presets:
                 if ("preset".equals(localName)) {
                     state = XMLHandlerState.Preset;
-                    String id = attributes.getValue("id");
+                    String id = "0";
+                    if (attributes != null) {
+                        id = attributes.getValue("id");
+                    }
                     if (contentItem == null) {
                         contentItem = new ContentItem();
                     }
                     contentItem.setPresetID(Integer.parseInt(id));
                 } else {
-                    if (logger.isDebugEnabled()) {
-                        logger.warn("{}: Unhandled XML entity during {}: '{}'", handler.getDeviceName(), curState,
-                                localName);
-                    }
+                    logger.debug("{}: Unhandled XML entity during {}: '{}'", handler.getDeviceName(), curState,
+                            localName);
+
                     state = XMLHandlerState.Unprocessed;
                 }
                 break;
             case Sources:
                 if ("sourceItem".equals(localName)) {
                     state = XMLHandlerState.Unprocessed;
-                    String source = attributes.getValue("source");
-                    String sourceAccount = attributes.getValue("sourceAccount");
-                    String status = attributes.getValue("status");
-                    if (status.equals("READY")) {
-                        if (source.equals("AUX")) {
-                            if (sourceAccount.equals("AUX")) {
-                                commandExecutor.setAUXAvailable(true);
-                            }
-                            if (sourceAccount.equals("AUX1")) {
-                                commandExecutor.setAUX1Available(true);
-                            }
-                            if (sourceAccount.equals("AUX2")) {
-                                commandExecutor.setAUX2Available(true);
-                            }
-                            if (sourceAccount.equals("AUX3")) {
-                                commandExecutor.setAUX3Available(true);
-                            }
-                        }
-                        if (source.equals("STORED_MUSIC")) {
-                            commandExecutor.setStoredMusicAvailable(true);
-                        }
-                        if (source.equals("INTERNET_RADIO")) {
-                            commandExecutor.setInternetRadioAvailable(true);
-                        }
-                        if (source.equals("BLUETOOTH")) {
-                            commandExecutor.setBluetoothAvailable(true);
-                        }
-                        if (source.equals("PRODUCT")) {
-                            if (sourceAccount.equals("TV")) {
-                                commandExecutor.setTVAvailable(true);
-                            }
-                            if (sourceAccount.equals("HDMI_1")) {
-                                commandExecutor.setHDMI1Available(true);
-                            }
+                    String source = "";
+                    String status = "";
+                    String sourceAccount = "";
+                    if (attributes != null) {
+                        source = attributes.getValue("source");
+                        sourceAccount = attributes.getValue("sourceAccount");
+                        status = attributes.getValue("status");
+                    }
+                    if ("READY".equals(status)) {
+                        switch (source) {
+                            case "AUX":
+                                if ("AUX".equals(sourceAccount)) {
+                                    commandExecutor.setAUXAvailable(true);
+                                }
+                                if ("AUX1".equals(sourceAccount)) {
+                                    commandExecutor.setAUX1Available(true);
+                                }
+                                if ("AUX2".equals(sourceAccount)) {
+                                    commandExecutor.setAUX2Available(true);
+                                }
+                                if ("AUX3".equals(sourceAccount)) {
+                                    commandExecutor.setAUX3Available(true);
+                                }
+                                break;
+                            case "STORED_MUSIC":
+                                commandExecutor.setStoredMusicAvailable(true);
+                                break;
+                            case "INTERNET_RADIO":
+                                commandExecutor.setInternetRadioAvailable(true);
+                                break;
+                            case "BLUETOOTH":
+                                commandExecutor.setBluetoothAvailable(true);
+                                break;
+                            case "PRODUCT":
+                                switch (sourceAccount) {
+                                    case "TV":
+                                        commandExecutor.setTVAvailable(true);
+                                        break;
+                                    case "HDMI_1":
+                                        commandExecutor.setHDMI1Available(true);
+                                        break;
+                                    default:
+                                        logger.debug("{}: has an unknown source account: '{}'", handler.getDeviceName(),
+                                                sourceAccount);
+                                        break;
+                                }
+                            default:
+                                logger.debug("{}: has an unknown source: '{}'", handler.getDeviceName(), source);
+                                break;
                         }
                     }
                 } else {
-                    if (logger.isDebugEnabled()) {
-                        logger.warn("{}: Unhandled XML entity during {}: '{}'", handler.getDeviceName(), curState,
-                                localName);
-                    }
+                    logger.debug("{}: Unhandled XML entity during {}: '{}'", handler.getDeviceName(), curState,
+                            localName);
                     state = XMLHandlerState.Unprocessed;
                 }
                 break;
@@ -350,25 +366,46 @@ public void startElement(String uri, String localName, String qName, Attributes
             if (contentItem == null) {
                 contentItem = new ContentItem();
             }
-            contentItem.setSource(attributes.getValue("source"));
-            contentItem.setSourceAccount(attributes.getValue("sourceAccount"));
-            contentItem.setLocation(attributes.getValue("location"));
-            contentItem.setPresetable(Boolean.parseBoolean(attributes.getValue("isPresetable")));
-            for (int attrId = 0; attrId < attributes.getLength(); attrId++) {
-                String attrName = attributes.getLocalName(attrId);
-                if ("source".equalsIgnoreCase(attrName)) {
-                    continue;
+            String source = "";
+            String location = "";
+            String sourceAccount = "";
+            Boolean isPresetable = false;
+
+            if (attributes != null) {
+                source = attributes.getValue("source");
+                sourceAccount = attributes.getValue("sourceAccount");
+                location = attributes.getValue("location");
+                isPresetable = Boolean.parseBoolean(attributes.getValue("isPresetable"));
+
+                if (source != null) {
+                    contentItem.setSource(source);
                 }
-                if ("location".equalsIgnoreCase(attrName)) {
-                    continue;
+                if (sourceAccount != null) {
+                    contentItem.setSourceAccount(sourceAccount);
                 }
-                if ("sourceAccount".equalsIgnoreCase(attrName)) {
-                    continue;
+                if (location != null) {
+                    contentItem.setLocation(location);
                 }
-                if ("isPresetable".equalsIgnoreCase(attrName)) {
-                    continue;
+                contentItem.setPresetable(isPresetable);
+
+                for (int attrId = 0; attrId < attributes.getLength(); attrId++) {
+                    String attrName = attributes.getLocalName(attrId);
+                    if ("source".equalsIgnoreCase(attrName)) {
+                        continue;
+                    }
+                    if ("location".equalsIgnoreCase(attrName)) {
+                        continue;
+                    }
+                    if ("sourceAccount".equalsIgnoreCase(attrName)) {
+                        continue;
+                    }
+                    if ("isPresetable".equalsIgnoreCase(attrName)) {
+                        continue;
+                    }
+                    if (attrName != null) {
+                        contentItem.setAdditionalAttribute(attrName, attributes.getValue(attrId));
+                    }
                 }
-                contentItem.setAdditionalAttribute(attrName, attributes.getValue(attrId));
             }
         }
     }
@@ -599,8 +636,9 @@ public void skippedEntity(String name) throws SAXException {
         super.skippedEntity(name);
     }
 
-    private boolean checkDeviceId(String localName, Attributes attributes, boolean allowFromMaster) {
-        String deviceID = attributes.getValue("deviceID");
+    private boolean checkDeviceId(@Nullable String localName, @Nullable Attributes attributes,
+            boolean allowFromMaster) {
+        String deviceID = (attributes != null) ? attributes.getValue("deviceID") : null;
         if (deviceID == null) {
             logger.warn("{}: No device-ID in entity {}", handler.getDeviceName(), localName);
             return false;
@@ -613,12 +651,6 @@ private boolean checkDeviceId(String localName, Attributes attributes, boolean a
         return false;
     }
 
-    private void init() {
-        states = new Stack<>();
-        state = XMLHandlerState.INIT;
-        nowPlayingSource = null;
-    }
-
     private XMLHandlerState nextState(Map<String, XMLHandlerState> stateMap, XMLHandlerState curState,
             String localName) {
         XMLHandlerState state = stateMap.get(localName);
@@ -632,11 +664,13 @@ private XMLHandlerState nextState(Map<String, XMLHandlerState> stateMap, XMLHand
     }
 
     private void setConfigOption(String option, String value) {
-        Map<String, String> prop = handler.getThing().getProperties();
-        String cur = prop.get(option);
-        if (cur == null || !cur.equals(value)) {
-            logger.debug("{}: Option '{}' updated: From '{}' to '{}'", handler.getDeviceName(), option, cur, value);
-            handler.getThing().setProperty(option, value);
+        if (option != null) {
+            Map<String, String> prop = handler.getThing().getProperties();
+            String cur = prop.get(option);
+            if (cur == null || !cur.equals(value)) {
+                logger.debug("{}: Option '{}' updated: From '{}' to '{}'", handler.getDeviceName(), option, cur, value);
+                handler.getThing().setProperty(option, value);
+            }
         }
     }
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseProcessor.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseProcessor.java
index cddcf2315766d..533e538210ff2 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseProcessor.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseProcessor.java
@@ -17,11 +17,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.bosesoundtouch.internal.handler.BoseSoundTouchHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
  * The {@link XMLResponseProcessor} class handles the XML mapping
@@ -29,18 +33,22 @@
  * @author Christian Niessner - Initial contribution
  * @author Thomas Traunbauer - Initial contribution
  */
+
+@NonNullByDefault
 public class XMLResponseProcessor {
     private BoseSoundTouchHandler handler;
 
-    private Map<XMLHandlerState, Map<String, XMLHandlerState>> stateSwitchingMap;
+    private final Map<XMLHandlerState, Map<String, XMLHandlerState>> stateSwitchingMap = new HashMap<>();
 
     public XMLResponseProcessor(BoseSoundTouchHandler handler) {
         this.handler = handler;
         init();
     }
 
-    public void handleMessage(String msg) throws SAXException, IOException {
-        XMLReader reader = XMLReaderFactory.createXMLReader();
+    public void handleMessage(String msg) throws SAXException, IOException, ParserConfigurationException {
+        SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+        SAXParser parser = parserFactory.newSAXParser();
+        XMLReader reader = parser.getXMLReader();
         reader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
         reader.setContentHandler(new XMLResponseHandler(handler, stateSwitchingMap));
         reader.parse(new InputSource(new StringReader(msg)));
@@ -48,8 +56,6 @@ public void handleMessage(String msg) throws SAXException, IOException {
 
     // initializes our XML parsing state machine
     private void init() {
-        stateSwitchingMap = new HashMap<>();
-
         Map<String, XMLHandlerState> msgInitMap = new HashMap<>();
         stateSwitchingMap.put(XMLHandlerState.INIT, msgInitMap);
         msgInitMap.put("msg", XMLHandlerState.Msg);
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/DiscoveryUtil.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/DiscoveryUtil.java
index 15c1ee3b11c3e..d85d90b9e10a6 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/DiscoveryUtil.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/DiscoveryUtil.java
@@ -14,6 +14,7 @@
 
 import java.io.IOException;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.io.net.http.HttpUtil;
 
 /**
@@ -21,6 +22,7 @@
  *
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 public class DiscoveryUtil {
 
     /**
@@ -29,9 +31,6 @@ public class DiscoveryUtil {
      * This is a quick and dirty method, it always delivers the first appearance of content in an element
      */
     public static String getContentOfFirstElement(String content, String element) {
-        if (content == null) {
-            return "";
-        }
         String beginTag = "<" + element + ">";
         String endTag = "</" + element + ">";
 
@@ -39,7 +38,8 @@ public static String getContentOfFirstElement(String content, String element) {
         int endIndex = content.indexOf(endTag);
 
         if (startIndex != -1 && endIndex != -1) {
-            return content.substring(startIndex, endIndex);
+            String result = content.substring(startIndex, endIndex);
+            return result != null ? result : "";
         } else {
             return "";
         }
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
index 6cd347ef6fd32..f8ab182584d84 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
@@ -26,6 +26,8 @@
 
 import javax.jmdns.ServiceInfo;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchConfiguration;
 import org.openhab.core.config.discovery.DiscoveryResult;
 import org.openhab.core.config.discovery.DiscoveryResultBuilder;
@@ -44,6 +46,7 @@
  * @author Christian Niessner - Initial contribution
  * @author Thomas Traunbauer - Initial contribution
  */
+@NonNullByDefault
 @Component(configurationPid = "discovery.bosesoundtouch")
 public class SoundTouchDiscoveryParticipant implements MDNSDiscoveryParticipant {
 
@@ -55,7 +58,7 @@ public Set<ThingTypeUID> getSupportedThingTypeUIDs() {
     }
 
     @Override
-    public DiscoveryResult createResult(ServiceInfo info) {
+    public @Nullable DiscoveryResult createResult(ServiceInfo info) {
         DiscoveryResult result = null;
         ThingUID uid = getThingUID(info);
         if (uid != null) {
@@ -89,9 +92,10 @@ public DiscoveryResult createResult(ServiceInfo info) {
             }
 
             properties.put(BoseSoundTouchConfiguration.HOST, addrs[0].getHostAddress());
-            if (getMacAddress(info) != null) {
+            byte[] localMacAddress = getMacAddress(info);
+            if (localMacAddress.length > 0) {
                 properties.put(BoseSoundTouchConfiguration.MAC_ADDRESS,
-                        new String(getMacAddress(info), StandardCharsets.UTF_8));
+                        new String(localMacAddress, StandardCharsets.UTF_8));
             }
 
             // Set manufacturer as thing property (if available)
@@ -105,7 +109,7 @@ public DiscoveryResult createResult(ServiceInfo info) {
     }
 
     @Override
-    public ThingUID getThingUID(ServiceInfo info) {
+    public @Nullable ThingUID getThingUID(ServiceInfo info) {
         logger.trace("ServiceInfo: {}", info);
         ThingTypeUID typeUID = getThingTypeUID(info);
         if (typeUID != null) {
@@ -113,10 +117,8 @@ public ThingUID getThingUID(ServiceInfo info) {
                 if (info.getType().equals(getServiceType())) {
                     logger.trace("Discovered a Bose SoundTouch thing with name '{}'", info.getName());
                     byte[] mac = getMacAddress(info);
-                    if (mac != null) {
+                    if (mac.length > 0) {
                         return new ThingUID(typeUID, new String(mac, StandardCharsets.UTF_8));
-                    } else {
-                        return null;
                     }
                 }
             }
@@ -129,13 +131,13 @@ public String getServiceType() {
         return "_soundtouch._tcp.local.";
     }
 
-    private ThingTypeUID getThingTypeUID(ServiceInfo info) {
+    private @Nullable ThingTypeUID getThingTypeUID(ServiceInfo info) {
         InetAddress[] addrs = info.getInetAddresses();
         if (addrs.length > 0) {
             String ip = addrs[0].getHostAddress();
             String deviceId = null;
             byte[] mac = getMacAddress(info);
-            if (mac != null) {
+            if (mac.length > 0) {
                 deviceId = new String(mac, StandardCharsets.UTF_8);
             }
             String deviceType;
@@ -143,6 +145,7 @@ private ThingTypeUID getThingTypeUID(ServiceInfo info) {
                 String content = DiscoveryUtil.executeUrl("http://" + ip + ":8090/info");
                 deviceType = DiscoveryUtil.getContentOfFirstElement(content, "type");
             } catch (IOException e) {
+                logger.debug("Ignoring IOException during Discovery: {}", e.getMessage());
                 return null;
             }
 
@@ -163,6 +166,7 @@ private ThingTypeUID getThingTypeUID(ServiceInfo info) {
                         return BST_10_THING_TYPE_UID;
                     }
                 } catch (IOException e) {
+                    logger.debug("Ignoring IOException during Discovery: {}", e.getMessage());
                     return null;
                 }
             }
@@ -190,24 +194,21 @@ private ThingTypeUID getThingTypeUID(ServiceInfo info) {
     }
 
     private byte[] getMacAddress(ServiceInfo info) {
-        if (info != null) {
-            // sometimes we see empty messages - ignore them
-            if (!info.hasData()) {
-                return null;
-            }
-            byte[] mac = info.getPropertyBytes("MAC");
-            if (mac == null) {
-                logger.warn("SoundTouch Device {} delivered no MAC address!", info.getName());
-                return null;
-            }
-            if (mac.length != 12) {
-                BigInteger bi = new BigInteger(1, mac);
-                logger.warn("SoundTouch Device {} delivered an invalid MAC address: 0x{}", info.getName(),
-                        String.format("%0" + (mac.length << 1) + "X", bi));
-                return null;
-            }
-            return mac;
+        // sometimes we see empty messages - ignore them
+        if (!info.hasData()) {
+            return new byte[0];
         }
-        return null;
+        byte[] mac = info.getPropertyBytes("MAC");
+        if (mac == null) {
+            logger.warn("SoundTouch Device {} delivered no MAC address!", info.getName());
+            return new byte[0];
+        }
+        if (mac.length != 12) {
+            BigInteger bi = new BigInteger(1, mac);
+            logger.warn("SoundTouch Device {} delivered an invalid MAC address: 0x{}", info.getName(),
+                    String.format("%0" + (mac.length << 1) + "X", bi));
+            return new byte[0];
+        }
+        return mac;
     }
 }
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java
index 63093e1dae589..c5a1e83601088 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java
@@ -27,6 +27,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.api.WebSocketFrameListener;
@@ -75,6 +77,7 @@
  * @author Kai Kreuzer - code clean up
  * @author Alexander Kostadinov - Handling of websocket ping-pong mechanism for thing status check
  */
+@NonNullByDefault
 public class BoseSoundTouchHandler extends BaseThingHandler implements WebSocketListener, WebSocketFrameListener {
 
     private static final int MAX_MISSED_PONGS_COUNT = 2;
@@ -83,10 +86,10 @@ public class BoseSoundTouchHandler extends BaseThingHandler implements WebSocket
 
     private final Logger logger = LoggerFactory.getLogger(BoseSoundTouchHandler.class);
 
-    private ScheduledFuture<?> connectionChecker;
-    private WebSocketClient client;
-    private volatile Session session;
-    private volatile CommandExecutor commandExecutor;
+    private @Nullable ScheduledFuture<?> connectionChecker;
+    private @Nullable WebSocketClient client;
+    private @Nullable volatile Session session;
+    private @Nullable volatile CommandExecutor commandExecutor;
     private volatile int missedPongsCount = 0;
 
     private XMLResponseProcessor xmlResponseProcessor;
@@ -94,7 +97,7 @@ public class BoseSoundTouchHandler extends BaseThingHandler implements WebSocket
     private PresetContainer presetContainer;
     private BoseStateDescriptionOptionProvider stateOptionProvider;
 
-    private Future<?> sessionFuture;
+    private @Nullable Future<?> sessionFuture;
 
     /**
      * Creates a new instance of this class for the {@link Thing}.
@@ -120,9 +123,12 @@ public void initialize() {
 
     @Override
     public void dispose() {
-        if (connectionChecker != null && !connectionChecker.isCancelled()) {
-            connectionChecker.cancel(true);
-            connectionChecker = null;
+        ScheduledFuture<?> localConnectionChecker = connectionChecker;
+        if (localConnectionChecker != null) {
+            if (!localConnectionChecker.isCancelled()) {
+                localConnectionChecker.cancel(true);
+                connectionChecker = null;
+            }
         }
         closeConnection();
         super.dispose();
@@ -146,7 +152,8 @@ public void updateState(String channelID, State state) {
 
     @Override
     public void handleCommand(ChannelUID channelUID, Command command) {
-        if (commandExecutor == null) {
+        CommandExecutor localCommandExecutor = commandExecutor;
+        if (localCommandExecutor == null) {
             logger.debug("{}: Can't handle command '{}' for channel '{}' because of not initialized connection.",
                     getDeviceName(), command, channelUID);
             return;
@@ -157,7 +164,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         if (command.equals(RefreshType.REFRESH)) {
             switch (channelUID.getIdWithoutGroup()) {
                 case CHANNEL_BASS:
-                    commandExecutor.getInformations(APIRequest.BASS);
+                    localCommandExecutor.getInformations(APIRequest.BASS);
                     break;
                 case CHANNEL_KEY_CODE:
                     // refresh makes no sense... ?
@@ -174,10 +181,10 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                 case CHANNEL_RATEENABLED:
                 case CHANNEL_SKIPENABLED:
                 case CHANNEL_SKIPPREVIOUSENABLED:
-                    commandExecutor.getInformations(APIRequest.NOW_PLAYING);
+                    localCommandExecutor.getInformations(APIRequest.NOW_PLAYING);
                     break;
                 case CHANNEL_VOLUME:
-                    commandExecutor.getInformations(APIRequest.VOLUME);
+                    localCommandExecutor.getInformations(APIRequest.VOLUME);
                     break;
                 default:
                     logger.debug("{} : Got command '{}' for channel '{}' which is unhandled!", getDeviceName(), command,
@@ -188,21 +195,21 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         switch (channelUID.getIdWithoutGroup()) {
             case CHANNEL_POWER:
                 if (command instanceof OnOffType) {
-                    commandExecutor.postPower((OnOffType) command);
+                    localCommandExecutor.postPower((OnOffType) command);
                 } else {
                     logger.debug("{}: Unhandled command type: {}: {}", getDeviceName(), command.getClass(), command);
                 }
                 break;
             case CHANNEL_VOLUME:
                 if (command instanceof PercentType) {
-                    commandExecutor.postVolume((PercentType) command);
+                    localCommandExecutor.postVolume((PercentType) command);
                 } else {
                     logger.debug("{}: Unhandled command type: {}: {}", getDeviceName(), command.getClass(), command);
                 }
                 break;
             case CHANNEL_MUTE:
                 if (command instanceof OnOffType) {
-                    commandExecutor.postVolumeMuted((OnOffType) command);
+                    localCommandExecutor.postVolumeMuted((OnOffType) command);
                 } else {
                     logger.debug("{}: Unhandled command type: {}: {}", getDeviceName(), command.getClass(), command);
                 }
@@ -212,7 +219,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                     String cmd = command.toString().toUpperCase().trim();
                     try {
                         OperationModeType mode = OperationModeType.valueOf(cmd);
-                        commandExecutor.postOperationMode(mode);
+                        localCommandExecutor.postOperationMode(mode);
                     } catch (IllegalArgumentException iae) {
                         logger.warn("{}: OperationMode \"{}\" is not valid!", getDeviceName(), cmd);
                     }
@@ -220,28 +227,28 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                 break;
             case CHANNEL_PLAYER_CONTROL:
                 if ((command instanceof PlayPauseType) || (command instanceof NextPreviousType)) {
-                    commandExecutor.postPlayerControl(command);
+                    localCommandExecutor.postPlayerControl(command);
                 } else {
                     logger.debug("{}: Unhandled command type: {}: {}", getDeviceName(), command.getClass(), command);
                 }
                 break;
             case CHANNEL_PRESET:
                 if (command instanceof DecimalType) {
-                    commandExecutor.postPreset((DecimalType) command);
+                    localCommandExecutor.postPreset((DecimalType) command);
                 } else {
                     logger.debug("{}: Unhandled command type: {}: {}", getDeviceName(), command.getClass(), command);
                 }
                 break;
             case CHANNEL_BASS:
                 if (command instanceof DecimalType) {
-                    commandExecutor.postBass((DecimalType) command);
+                    localCommandExecutor.postBass((DecimalType) command);
                 } else {
                     logger.debug("{}: Unhandled command type: {}: {}", getDeviceName(), command.getClass(), command);
                 }
                 break;
             case CHANNEL_SAVE_AS_PRESET:
                 if (command instanceof DecimalType) {
-                    commandExecutor.addCurrentContentItemToPresetContainer((DecimalType) command);
+                    localCommandExecutor.addCurrentContentItemToPresetContainer((DecimalType) command);
                 } else {
                     logger.debug("{}: Unhandled command type: {}: {}", getDeviceName(), command.getClass(), command);
                 }
@@ -251,7 +258,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                     String cmd = command.toString().toUpperCase().trim();
                     try {
                         RemoteKeyType keyCommand = RemoteKeyType.valueOf(cmd);
-                        commandExecutor.postRemoteKey(keyCommand);
+                        localCommandExecutor.postRemoteKey(keyCommand);
                     } catch (IllegalArgumentException e) {
                         logger.debug("{}: Unhandled remote key: {}", getDeviceName(), cmd);
                     }
@@ -262,7 +269,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                 if (channel != null) {
                     ChannelTypeUID chTypeUid = channel.getChannelTypeUID();
                     if (chTypeUid != null) {
-                        switch (channel.getChannelTypeUID().getId()) {
+                        switch (chTypeUid.getId()) {
                             case CHANNEL_NOTIFICATION_SOUND:
                                 String appKey = Objects.toString(getConfig().get(BoseSoundTouchConfiguration.APP_KEY),
                                         null);
@@ -273,8 +280,8 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                                                 .getConfiguration()
                                                 .as(BoseSoundTouchNotificationChannelConfiguration.class);
                                         if (!url.isEmpty()) {
-                                            commandExecutor.playNotificationSound(appKey, notificationConfiguration,
-                                                    url);
+                                            localCommandExecutor.playNotificationSound(appKey,
+                                                    notificationConfiguration, url);
                                         }
                                     }
                                 } else {
@@ -295,7 +302,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
      *
      * @return the CommandExecutor of this handler
      */
-    public CommandExecutor getCommandExecutor() {
+    public @Nullable CommandExecutor getCommandExecutor() {
         return commandExecutor;
     }
 
@@ -304,7 +311,7 @@ public CommandExecutor getCommandExecutor() {
      *
      * @return the Session this handler has opened
      */
-    public Session getSession() {
+    public @Nullable Session getSession() {
         return session;
     }
 
@@ -313,7 +320,7 @@ public Session getSession() {
      *
      * @return the name of the device delivered from itself
      */
-    public String getDeviceName() {
+    public @Nullable String getDeviceName() {
         return getThing().getProperties().get(DEVICE_INFO_NAME);
     }
 
@@ -322,7 +329,7 @@ public String getDeviceName() {
      *
      * @return the type of the device delivered from itself
      */
-    public String getDeviceType() {
+    public @Nullable String getDeviceType() {
         return getThing().getProperties().get(DEVICE_INFO_TYPE);
     }
 
@@ -331,7 +338,7 @@ public String getDeviceType() {
      *
      * @return the MAC Address of this device (in format "123456789ABC")
      */
-    public String getMacAddress() {
+    public @Nullable String getMacAddress() {
         return ((String) getThing().getConfiguration().get(BoseSoundTouchConfiguration.MAC_ADDRESS)).replaceAll(":",
                 "");
     }
@@ -341,7 +348,7 @@ public String getMacAddress() {
      *
      * @return the IP Address of this device
      */
-    public String getIPAddress() {
+    public @Nullable String getIPAddress() {
         return (String) getThing().getConfiguration().getProperties().get(BoseSoundTouchConfiguration.HOST);
     }
 
@@ -359,7 +366,7 @@ public PresetContainer getPresetContainer() {
     }
 
     @Override
-    public void onWebSocketConnect(Session session) {
+    public void onWebSocketConnect(@Nullable Session session) {
         logger.debug("{}: onWebSocketConnect('{}')", getDeviceName(), session);
         this.session = session;
         commandExecutor = new CommandExecutor(this);
@@ -367,88 +374,106 @@ public void onWebSocketConnect(Session session) {
     }
 
     @Override
-    public void onWebSocketError(Throwable e) {
-        logger.debug("{}: Error during websocket communication: {}", getDeviceName(), e.getMessage(), e);
-        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
-        if (commandExecutor != null) {
-            commandExecutor.postOperationMode(OperationModeType.OFFLINE);
+    public void onWebSocketError(@Nullable Throwable e) {
+        Throwable localThrowable = (e != null) ? e
+                : new IllegalStateException("Null Exception passed to onWebSocketError");
+        logger.debug("{}: Error during websocket communication: {}", getDeviceName(), localThrowable.getMessage(),
+                localThrowable);
+        updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, localThrowable.getMessage());
+        CommandExecutor localCommandExecutor = commandExecutor;
+        if (localCommandExecutor != null) {
+            localCommandExecutor.postOperationMode(OperationModeType.OFFLINE);
             commandExecutor = null;
         }
-        if (session != null) {
-            session.close(StatusCode.SERVER_ERROR, getDeviceName() + ": Failure: " + e.getMessage());
+        Session localSession = session;
+        if (localSession != null) {
+            localSession.close(StatusCode.SERVER_ERROR, getDeviceName() + ": Failure: " + localThrowable.getMessage());
             session = null;
         }
     }
 
     @Override
-    public void onWebSocketText(String msg) {
+    public void onWebSocketText(@Nullable String msg) {
         logger.debug("{}: onWebSocketText('{}')", getDeviceName(), msg);
         try {
-            xmlResponseProcessor.handleMessage(msg);
+            String localMessage = msg;
+            if (localMessage != null) {
+                xmlResponseProcessor.handleMessage(localMessage);
+            }
         } catch (Exception e) {
             logger.warn("{}: Could not parse XML from string '{}'.", getDeviceName(), msg, e);
         }
     }
 
     @Override
-    public void onWebSocketBinary(byte[] arr, int pos, int len) {
+    public void onWebSocketBinary(byte @Nullable [] payload, int offset, int len) {
         // we don't expect binary data so just dump if we get some...
-        logger.debug("{}: onWebSocketBinary({}, {}, '{}')", getDeviceName(), pos, len, Arrays.toString(arr));
+        logger.debug("{}: onWebSocketBinary({}, {}, '{}')", getDeviceName(), offset, len, Arrays.toString(payload));
     }
 
     @Override
-    public void onWebSocketClose(int code, String reason) {
+    public void onWebSocketClose(int code, @Nullable String reason) {
         logger.debug("{}: onClose({}, '{}')", getDeviceName(), code, reason);
         missedPongsCount = 0;
         updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, reason);
-        if (commandExecutor != null) {
-            commandExecutor.postOperationMode(OperationModeType.OFFLINE);
+        CommandExecutor localCommandExecutor = commandExecutor;
+        if (localCommandExecutor != null) {
+            localCommandExecutor.postOperationMode(OperationModeType.OFFLINE);
         }
     }
 
     @Override
-    public void onWebSocketFrame(Frame frame) {
-        if (frame.getType() == Type.PONG) {
-            missedPongsCount = 0;
+    public void onWebSocketFrame(@Nullable Frame frame) {
+        Frame localFrame = frame;
+        if (localFrame != null) {
+            if (localFrame.getType() == Type.PONG) {
+                missedPongsCount = 0;
+            }
         }
     }
 
     private synchronized void openConnection() {
         closeConnection();
         try {
-            client = new WebSocketClient();
+            WebSocketClient localClient = new WebSocketClient();
             // we need longer timeouts for web socket.
-            client.setMaxIdleTimeout(360 * 1000);
+            localClient.setMaxIdleTimeout(360 * 1000);
             // Port seems to be hard coded, therefore no user input or discovery is necessary
             String wsUrl = "ws://" + getIPAddress() + ":8080/";
             logger.debug("{}: Connecting to: {}", getDeviceName(), wsUrl);
             ClientUpgradeRequest request = new ClientUpgradeRequest();
             request.setSubProtocols("gabbo");
-            client.setStopTimeout(1000);
-            client.start();
-            sessionFuture = client.connect(this, new URI(wsUrl), request);
+            localClient.setStopTimeout(1000);
+            localClient.start();
+            sessionFuture = localClient.connect(this, new URI(wsUrl), request);
+            client = localClient;
         } catch (Exception e) {
             onWebSocketError(e);
         }
     }
 
     private synchronized void closeConnection() {
-        if (session != null) {
+        Session localSession = this.session;
+        if (localSession != null) {
             try {
-                session.close(StatusCode.NORMAL, "Binding shutdown");
+                localSession.close(StatusCode.NORMAL, "Binding shutdown");
             } catch (Exception e) {
                 logger.debug("{}: Error while closing websocket communication: {} ({})", getDeviceName(),
                         e.getClass().getName(), e.getMessage());
             }
             session = null;
         }
-        if (sessionFuture != null && !sessionFuture.isDone()) {
-            sessionFuture.cancel(true);
+        Future<?> localSessionFuture = sessionFuture;
+        if (localSessionFuture != null) {
+            if (!localSessionFuture.isDone()) {
+                localSessionFuture.cancel(true);
+            }
         }
-        if (client != null) {
+        WebSocketClient localClient = client;
+        if (localClient != null) {
             try {
-                client.stop();
-                client.destroy();
+                localClient.stop();
+                localClient.destroy();
             } catch (Exception e) {
                 logger.debug("{}: Error while closing websocket communication: {} ({})", getDeviceName(),
                         e.getClass().getName(), e.getMessage());
@@ -464,23 +489,25 @@ private void checkConnection() {
                 || commandExecutor == null) {
             openConnection(); // try to reconnect....
         }
+        Session localSession = this.session;
+        if (localSession != null) {
+            if (getThing().getStatus() == ThingStatus.ONLINE && localSession.isOpen()) {
+                try {
+                    localSession.getRemote().sendPing(null);
+                    missedPongsCount++;
+                } catch (IOException e) {
+                    onWebSocketError(e);
+                    closeConnection();
+                    openConnection();
+                }
 
-        if (getThing().getStatus() == ThingStatus.ONLINE && this.session != null && this.session.isOpen()) {
-            try {
-                this.session.getRemote().sendPing(null);
-                missedPongsCount++;
-            } catch (IOException | NullPointerException e) {
-                onWebSocketError(e);
-                closeConnection();
-                openConnection();
-            }
-
-            if (missedPongsCount >= MAX_MISSED_PONGS_COUNT) {
-                logger.debug("{}: Closing connection because of too many missed PONGs: {} (max allowed {}) ",
-                        getDeviceName(), missedPongsCount, MAX_MISSED_PONGS_COUNT);
-                missedPongsCount = 0;
-                closeConnection();
-                openConnection();
+                if (missedPongsCount >= MAX_MISSED_PONGS_COUNT) {
+                    logger.debug("{}: Closing connection because of too many missed PONGs: {} (max allowed {}) ",
+                            getDeviceName(), missedPongsCount, MAX_MISSED_PONGS_COUNT);
+                    missedPongsCount = 0;
+                    closeConnection();
+                    openConnection();
+                }
             }
         }
     }
@@ -494,7 +521,7 @@ public void refreshPresetChannel() {
     public void handleGroupUpdated(BoseSoundTouchConfiguration masterPlayerConfiguration) {
         String deviceId = getMacAddress();
 
-        if (masterPlayerConfiguration != null && masterPlayerConfiguration.macAddress != null) {
+        if (masterPlayerConfiguration.macAddress != null) {
             // Stereo pair
             if (Objects.equals(masterPlayerConfiguration.macAddress, deviceId)) {
                 if (getThing().getThingTypeUID().equals(BST_10_THING_TYPE_UID)) {

From 584f6371260afa0d643a8c497e10089674c1624c Mon Sep 17 00:00:00 2001
From: Gerd Zanker <gerd.zanker@web.de>
Date: Sat, 10 Dec 2022 11:18:13 +0100
Subject: [PATCH 19/48] [boschshc] Support smoke detector (#13760)

* Add smoke detector service and add it to twinguard handler
* Add handler for smoke detector
* Support for smoke detector

added smoke detector device with SmokeDetectorCheckService
added SmokeDetectorCheckService to TwinguardHandler

added tests for smoke detector code
updated smoke detector code to latest boschshc version after cherry-picks of initial code from Christian Oeing

* re-generate i18n file, refactoring of smoke detector code to use abstract base classes
* Fix typos
* Add unit test for PlayPauseType commands
* Add unit test for SmokeDetectorCheckState
* Re-add null annotation
* Fix warning

Signed-off-by: Christian Oeing <christian.oeing@slashgames.org>
Signed-off-by: Gerd Zanker <gerd.zanker@web.de>
Signed-off-by: David Pace <dev@davidpace.de>
---
 .../org.openhab.binding.boschshc/README.md    |  13 ++
 .../AbstractBatteryPoweredDeviceHandler.java  |   2 +-
 .../devices/AbstractSmokeDetectorHandler.java |  65 ++++++++++
 .../devices/BoschSHCBindingConstants.java     |   3 +
 .../devices/BoschSHCHandlerFactory.java       |   5 +-
 .../smokedetector/SmokeDetectorHandler.java   |  31 +++++
 .../devices/twinguard/TwinguardHandler.java   |   6 +-
 .../SmokeDetectorCheckService.java            |  55 +++++++++
 .../SmokeDetectorCheckState.java              |  37 ++++++
 .../dto/SmokeDetectorCheckServiceState.java   |  34 ++++++
 .../resources/OH-INF/i18n/boschshc.properties |   8 ++
 .../resources/OH-INF/thing/thing-types.xml    |  36 ++++++
 .../AbstractSmokeDetectorHandlerTest.java     | 115 ++++++++++++++++++
 .../SmokeDetectorHandlerTest.java             |  43 +++++++
 .../twinguard/TwinguardHandlerTest.java       |   4 +-
 .../SmokeDetectorCheckStateTest.java          |  37 ++++++
 16 files changed, 488 insertions(+), 6 deletions(-)
 create mode 100644 bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractSmokeDetectorHandler.java
 create mode 100644 bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/smokedetector/SmokeDetectorHandler.java
 create mode 100644 bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckService.java
 create mode 100644 bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckState.java
 create mode 100644 bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/dto/SmokeDetectorCheckServiceState.java
 create mode 100644 bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/AbstractSmokeDetectorHandlerTest.java
 create mode 100644 bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/smokedetector/SmokeDetectorHandlerTest.java
 create mode 100644 bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckStateTest.java

diff --git a/bundles/org.openhab.binding.boschshc/README.md b/bundles/org.openhab.binding.boschshc/README.md
index f93813689cf43..cd2fe0b83844e 100644
--- a/bundles/org.openhab.binding.boschshc/README.md
+++ b/bundles/org.openhab.binding.boschshc/README.md
@@ -17,6 +17,7 @@ Binding for the Bosch Smart Home.
     - [Security Camera Eyes](#security-camera-eyes)
     - [Intrusion Detection System](#intrusion-detection-system)
     - [Smart Bulb](#smart-bulb)
+    - [Smoke Detector](#smoke-detector)
   - [Limitations](#limitations)
   - [Discovery](#discovery)
   - [Bridge Configuration](#bridge-configuration)
@@ -68,6 +69,7 @@ The Twinguard smoke detector warns you in case of fire and constantly monitors t
 | combined-rating    | String               | &#9744;  | Combined rating of the air quality.                                                               |
 | battery-level      | Number               | &#9744;  | Current battery level percentage as integer number. Bosch-specific battery levels are mapped to numbers as follows: `OK`: 100, `LOW_BATTERY`: 10, `CRITICAL_LOW`: 1, `CRITICALLY_LOW_BATTERY`: 1, `NOT_AVAILABLE`: `UNDEF`. |
 | low-battery        | Switch               | &#9744;  | Indicates whether the battery is low (`ON`) or OK (`OFF`). |
+| smoke-check        | String               | &#9745;  | State of the smoke check. Also used to request a new smoke check.                                 |
 
 ### Door/Window Contact
 
@@ -191,6 +193,17 @@ A smart bulb connected to the bridge via Zigbee such as a Ledvance Smart+ bulb.
 | brightness      | Dimmer    | &#9745;  | Regulates the brightness on a percentage scale from 0 to 100%. |
 | color           | Color     | &#9745;  | The color of the emitted light.                                |
 
+### Smoke detector
+
+The smoke detector warns you in case of fire.
+
+**Thing Type ID**: `smoke-detector`
+
+| Channel Type ID    | Item Type            | Writable | Description                                                                                       |
+| ------------------ | -------------------- | :------: | ------------------------------------------------------------------------------------------------- |
+| smoke-check        | String               | &#9745;  | State of the smoke check. Also used to request a new smoke check.                                 |
+
+
 ## Limitations
 
 - Discovery of Things
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractBatteryPoweredDeviceHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractBatteryPoweredDeviceHandler.java
index 4e87b10844f93..56729066ca4f0 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractBatteryPoweredDeviceHandler.java
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractBatteryPoweredDeviceHandler.java
@@ -30,7 +30,7 @@
  *
  */
 @NonNullByDefault
-public class AbstractBatteryPoweredDeviceHandler extends BoschSHCDeviceHandler {
+public abstract class AbstractBatteryPoweredDeviceHandler extends BoschSHCDeviceHandler {
 
     /**
      * Service to monitor the battery level of the device
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractSmokeDetectorHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractSmokeDetectorHandler.java
new file mode 100644
index 0000000000000..e51067c5db72b
--- /dev/null
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/AbstractSmokeDetectorHandler.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.boschshc.internal.devices;
+
+import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.CHANNEL_SMOKE_CHECK;
+
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.boschshc.internal.exceptions.BoschSHCException;
+import org.openhab.binding.boschshc.internal.services.smokedetectorcheck.SmokeDetectorCheckService;
+import org.openhab.binding.boschshc.internal.services.smokedetectorcheck.dto.SmokeDetectorCheckServiceState;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.types.Command;
+
+/**
+ * Abstract handler implementation for devices with a smoke detector.
+ *
+ * @author Christian Oeing - Initial contribution
+ * @author Gerd Zanker - AbstractSmokeDetectorHandler refactoring for reuse
+ */
+@NonNullByDefault
+public abstract class AbstractSmokeDetectorHandler extends AbstractBatteryPoweredDeviceHandler {
+
+    private SmokeDetectorCheckService smokeDetectorCheckService;
+
+    public AbstractSmokeDetectorHandler(Thing thing) {
+        super(thing);
+        this.smokeDetectorCheckService = new SmokeDetectorCheckService();
+    }
+
+    @Override
+    protected void initializeServices() throws BoschSHCException {
+        super.initializeServices();
+
+        this.registerService(smokeDetectorCheckService, this::updateChannels, List.of(CHANNEL_SMOKE_CHECK));
+    }
+
+    @Override
+    public void handleCommand(ChannelUID channelUID, Command command) {
+        super.handleCommand(channelUID, command);
+
+        switch (channelUID.getId()) {
+            case CHANNEL_SMOKE_CHECK:
+                this.handleServiceCommand(this.smokeDetectorCheckService, command);
+                break;
+        }
+    }
+
+    private void updateChannels(SmokeDetectorCheckServiceState state) {
+        updateState(CHANNEL_SMOKE_CHECK, new StringType(state.value.toString()));
+    }
+}
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCBindingConstants.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCBindingConstants.java
index 4425b76909b76..9f62e8ccec6c4 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCBindingConstants.java
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCBindingConstants.java
@@ -23,6 +23,7 @@
  * @author Christian Oeing - added Shutter Control, ThermostatHandler
  * @author Christian Oeing - Added WallThermostatHandler
  * @author David Pace - Added cameras, intrusion detection system, smart plugs, battery state support and smart bulbs
+ * @author Christian Oeing - Added smoke detector
  */
 @NonNullByDefault
 public class BoschSHCBindingConstants {
@@ -46,6 +47,7 @@ public class BoschSHCBindingConstants {
             "intrusion-detection-system");
     public static final ThingTypeUID THING_TYPE_SMART_PLUG_COMPACT = new ThingTypeUID(BINDING_ID, "smart-plug-compact");
     public static final ThingTypeUID THING_TYPE_SMART_BULB = new ThingTypeUID(BINDING_ID, "smart-bulb");
+    public static final ThingTypeUID THING_TYPE_SMOKE_DETECTOR = new ThingTypeUID(BINDING_ID, "smoke-detector");
 
     // List of all Channel IDs
     // Auto-generated from thing-types.xml via script, don't modify
@@ -79,6 +81,7 @@ public class BoschSHCBindingConstants {
     public static final String CHANNEL_LOW_BATTERY = "low-battery";
     public static final String CHANNEL_COLOR = "color";
     public static final String CHANNEL_BRIGHTNESS = "brightness";
+    public static final String CHANNEL_SMOKE_CHECK = "smoke-check";
 
     // static device/service names
     public static final String SERVICE_INTRUSION_DETECTION = "intrusionDetectionSystem";
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandlerFactory.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandlerFactory.java
index 1de7728829eb6..01b75eab74fe1 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandlerFactory.java
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCHandlerFactory.java
@@ -29,6 +29,7 @@
 import org.openhab.binding.boschshc.internal.devices.plug.PlugHandler;
 import org.openhab.binding.boschshc.internal.devices.shuttercontrol.ShutterControlHandler;
 import org.openhab.binding.boschshc.internal.devices.smartbulb.SmartBulbHandler;
+import org.openhab.binding.boschshc.internal.devices.smokedetector.SmokeDetectorHandler;
 import org.openhab.binding.boschshc.internal.devices.thermostat.ThermostatHandler;
 import org.openhab.binding.boschshc.internal.devices.twinguard.TwinguardHandler;
 import org.openhab.binding.boschshc.internal.devices.wallthermostat.WallThermostatHandler;
@@ -50,6 +51,7 @@
  * @author Christian Oeing - Added Shutter Control and ThermostatHandler; refactored handler mapping
  * @author Christian Oeing - Added WallThermostatHandler
  * @author David Pace - Added cameras, intrusion detection system and smart plugs
+ * @author Christian Oeing - Added smoke detector
  */
 @NonNullByDefault
 @Component(configurationPid = "binding.boschshc", service = ThingHandlerFactory.class)
@@ -79,7 +81,8 @@ public ThingTypeHandlerMapping(ThingTypeUID thingTypeUID, Function<Thing, BaseTh
             new ThingTypeHandlerMapping(THING_TYPE_CAMERA_EYES, CameraHandler::new),
             new ThingTypeHandlerMapping(THING_TYPE_INTRUSION_DETECTION_SYSTEM, IntrusionDetectionHandler::new),
             new ThingTypeHandlerMapping(THING_TYPE_SMART_PLUG_COMPACT, PlugHandler::new),
-            new ThingTypeHandlerMapping(THING_TYPE_SMART_BULB, SmartBulbHandler::new));
+            new ThingTypeHandlerMapping(THING_TYPE_SMART_BULB, SmartBulbHandler::new),
+            new ThingTypeHandlerMapping(THING_TYPE_SMOKE_DETECTOR, SmokeDetectorHandler::new));
 
     @Override
     public boolean supportsThingType(ThingTypeUID thingTypeUID) {
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/smokedetector/SmokeDetectorHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/smokedetector/SmokeDetectorHandler.java
new file mode 100644
index 0000000000000..fc38527ad1759
--- /dev/null
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/smokedetector/SmokeDetectorHandler.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.boschshc.internal.devices.smokedetector;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.boschshc.internal.devices.AbstractSmokeDetectorHandler;
+import org.openhab.core.thing.Thing;
+
+/**
+ * The smoke detector warns you in case of fire.
+ *
+ * @author Christian Oeing - Initial contribution
+ * @author Gerd Zanker - AbstractSmokeDetectorHandler refactoring for reuse
+ */
+@NonNullByDefault
+public class SmokeDetectorHandler extends AbstractSmokeDetectorHandler {
+
+    public SmokeDetectorHandler(Thing thing) {
+        super(thing);
+    }
+}
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandler.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandler.java
index a4b0f3ac8244d..bcb01292a6997 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandler.java
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandler.java
@@ -20,7 +20,7 @@
 import javax.measure.quantity.Temperature;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.binding.boschshc.internal.devices.AbstractBatteryPoweredDeviceHandler;
+import org.openhab.binding.boschshc.internal.devices.AbstractSmokeDetectorHandler;
 import org.openhab.binding.boschshc.internal.exceptions.BoschSHCException;
 import org.openhab.binding.boschshc.internal.services.airqualitylevel.AirQualityLevelService;
 import org.openhab.binding.boschshc.internal.services.airqualitylevel.dto.AirQualityLevelServiceState;
@@ -35,9 +35,11 @@
  *
  * @author Stefan Kästle - Initial contribution
  * @author Christian Oeing - Use service instead of custom logic
+ * @author Christian Oeing - Add smoke detector service
+ * @author Gerd Zanker - AbstractSmokeDetectorHandler refactoring for reuse
  */
 @NonNullByDefault
-public class TwinguardHandler extends AbstractBatteryPoweredDeviceHandler {
+public class TwinguardHandler extends AbstractSmokeDetectorHandler {
 
     public TwinguardHandler(Thing thing) {
         super(thing);
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckService.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckService.java
new file mode 100644
index 0000000000000..8fa26d90b328a
--- /dev/null
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckService.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.boschshc.internal.services.smokedetectorcheck;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.boschshc.internal.exceptions.BoschSHCException;
+import org.openhab.binding.boschshc.internal.services.BoschSHCService;
+import org.openhab.binding.boschshc.internal.services.smokedetectorcheck.dto.SmokeDetectorCheckServiceState;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.types.Command;
+
+/**
+ * Returns the result of the last smoke test and is used to request a new smoke test.
+ * 
+ * @author Christian Oeing - Initial contribution
+ */
+@NonNullByDefault
+public class SmokeDetectorCheckService extends BoschSHCService<SmokeDetectorCheckServiceState> {
+
+    public SmokeDetectorCheckService() {
+        super("SmokeDetectorCheck", SmokeDetectorCheckServiceState.class);
+    }
+
+    @Override
+    public SmokeDetectorCheckServiceState handleCommand(Command command) throws BoschSHCException {
+        if (command instanceof StringType) {
+            var stringCommand = (StringType) command;
+            var state = new SmokeDetectorCheckServiceState();
+            state.value = SmokeDetectorCheckState.from(stringCommand.toString());
+            return state;
+        }
+
+        if (command instanceof PlayPauseType) {
+            var playPauseCommand = (PlayPauseType) command;
+            if (playPauseCommand.equals(PlayPauseType.PLAY)) {
+                var state = new SmokeDetectorCheckServiceState();
+                state.value = SmokeDetectorCheckState.SMOKE_TEST_REQUESTED;
+                return state;
+            }
+        }
+
+        return super.handleCommand(command);
+    }
+}
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckState.java
new file mode 100644
index 0000000000000..4b6fab5cd7dcc
--- /dev/null
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckState.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.boschshc.internal.services.smokedetectorcheck;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * Possible states for a smoke detector.
+ * 
+ * @author Christian Oeing - Initial contribution
+ */
+@NonNullByDefault
+public enum SmokeDetectorCheckState {
+    NONE,
+    SMOKE_TEST_REQUESTED,
+    SMOKE_TEST_OK,
+    SMOKE_TEST_FAILED;
+
+    public static SmokeDetectorCheckState from(String stateString) {
+
+        try {
+            return SmokeDetectorCheckState.valueOf(stateString);
+        } catch (Exception a) {
+            return NONE;
+        }
+    }
+}
diff --git a/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/dto/SmokeDetectorCheckServiceState.java b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/dto/SmokeDetectorCheckServiceState.java
new file mode 100644
index 0000000000000..6ae80cb7aad41
--- /dev/null
+++ b/bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/dto/SmokeDetectorCheckServiceState.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.boschshc.internal.services.smokedetectorcheck.dto;
+
+import org.openhab.binding.boschshc.internal.services.dto.BoschSHCServiceState;
+import org.openhab.binding.boschshc.internal.services.smokedetectorcheck.SmokeDetectorCheckState;
+
+/**
+ * State for {@link org.openhab.binding.boschshc.internal.services.smokedetectorcheck.SmokeDetectorCheckService}
+ * to get the current smoke test state and request a new smoke test.
+ *
+ * @author Christian Oeing - Initial contribution
+ */
+public class SmokeDetectorCheckServiceState extends BoschSHCServiceState {
+
+    public SmokeDetectorCheckServiceState() {
+        super("smokeDetectorCheckState");
+    }
+
+    /**
+     * Current state.
+     */
+    public SmokeDetectorCheckState value;
+}
diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
index a634c7e3e0020..b6d037df3f090 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
@@ -25,6 +25,8 @@ thing-type.boschshc.smart-bulb.label = Smart Bulb
 thing-type.boschshc.smart-bulb.description = A smart bulb connected via Zigbee.
 thing-type.boschshc.smart-plug-compact.label = Compact Smart Plug
 thing-type.boschshc.smart-plug-compact.description = A compact smart plug with energy monitoring capabilities.
+thing-type.boschshc.smoke-detector.label = Smoke Detector
+thing-type.boschshc.smoke-detector.description = The smoke detector warns you in case of fire.
 thing-type.boschshc.thermostat.label = Thermostat
 thing-type.boschshc.thermostat.description = Radiator thermostat
 thing-type.boschshc.twinguard.label = Twinguard
@@ -105,6 +107,12 @@ channel-type.boschshc.purity.label = Purity
 channel-type.boschshc.purity.description = Purity of the air. A higher value indicates a higher pollution.
 channel-type.boschshc.setpoint-temperature.label = Setpoint Temperature
 channel-type.boschshc.setpoint-temperature.description = Desired temperature.
+channel-type.boschshc.smoke-check.label = Smoke Check State
+channel-type.boschshc.smoke-check.description = State of last smoke detector check.
+channel-type.boschshc.smoke-check.state.option.NONE = None
+channel-type.boschshc.smoke-check.state.option.SMOKE_TEST_REQUESTED = Test requested
+channel-type.boschshc.smoke-check.state.option.SMOKE_TEST_OK = Test successful
+channel-type.boschshc.smoke-check.state.option.SMOKE_TEST_FAILED = Test failed
 channel-type.boschshc.system-availability.label = System Availability
 channel-type.boschshc.system-availability.description = Indicates whether the intrusion detection system is available.
 channel-type.boschshc.temperature-rating.label = Temperature Rating
diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
index ab84a6fea0c32..17cd2baaffb4e 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
@@ -12,6 +12,8 @@
 		<config-description-ref uri="thing-type:boschshc:bridge"/>
 	</bridge-type>
 
+	<!-- Things -->
+
 	<thing-type id="in-wall-switch">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="shc"/>
@@ -67,6 +69,7 @@
 			<channel id="combined-rating" typeId="combined-rating"/>
 			<channel id="battery-level" typeId="system.battery-level"/>
 			<channel id="low-battery" typeId="system.low-battery"/>
+			<channel id="smoke-check" typeId="smoke-check"/>
 		</channels>
 
 		<config-description-ref uri="thing-type:boschshc:device"/>
@@ -255,6 +258,25 @@
 
 	</thing-type>
 
+	<thing-type id="smoke-detector">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="shc"/>
+		</supported-bridge-type-refs>
+
+		<label>Smoke Detector</label>
+		<description>The smoke detector warns you in case of fire.</description>
+
+		<channels>
+			<channel id="smoke-check" typeId="smoke-check"/>
+			<channel id="battery-level" typeId="system.battery-level"/>
+			<channel id="low-battery" typeId="system.low-battery"/>
+		</channels>
+
+		<config-description-ref uri="thing-type:boschshc:device"/>
+	</thing-type>
+
+	<!-- Channels -->
+
 	<channel-type id="system-availability">
 		<item-type>Switch</item-type>
 		<label>System Availability</label>
@@ -430,6 +452,20 @@
 		</state>
 	</channel-type>
 
+	<channel-type id="smoke-check">
+		<item-type>String</item-type>
+		<label>Smoke Check State</label>
+		<description>State of last smoke detector check.</description>
+		<state readOnly="false">
+			<options>
+				<option value="NONE">None</option>
+				<option value="SMOKE_TEST_REQUESTED">Test requested</option>
+				<option value="SMOKE_TEST_OK">Test successful</option>
+				<option value="SMOKE_TEST_FAILED">Test failed</option>
+			</options>
+		</state>
+	</channel-type>
+
 	<channel-type id="contact">
 		<item-type>Contact</item-type>
 		<label>Window/Door contact</label>
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/AbstractSmokeDetectorHandlerTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/AbstractSmokeDetectorHandlerTest.java
new file mode 100644
index 0000000000000..9a6514a5a587a
--- /dev/null
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/AbstractSmokeDetectorHandlerTest.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.boschshc.internal.devices;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.openhab.binding.boschshc.internal.devices.smokedetector.SmokeDetectorHandler;
+import org.openhab.binding.boschshc.internal.exceptions.BoschSHCException;
+import org.openhab.binding.boschshc.internal.services.smokedetectorcheck.SmokeDetectorCheckState;
+import org.openhab.binding.boschshc.internal.services.smokedetectorcheck.dto.SmokeDetectorCheckServiceState;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.thing.ChannelUID;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+
+/**
+ * Unit Tests for {@link SmokeDetectorHandler}.
+ *
+ * @author Gerd Zanker - Initial contribution
+ *
+ */
+@NonNullByDefault
+public abstract class AbstractSmokeDetectorHandlerTest<T extends AbstractSmokeDetectorHandler>
+        extends AbstractBatteryPoweredDeviceHandlerTest<T> {
+
+    @Captor
+    private @NonNullByDefault({}) ArgumentCaptor<SmokeDetectorCheckServiceState> smokeDetectorCheckStateCaptor;
+
+    @Test
+    public void testHandleCommand()
+            throws InterruptedException, TimeoutException, ExecutionException, BoschSHCException {
+
+        // valid commands with valid thing & channel
+        getFixture().handleCommand(new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_SMOKE_CHECK),
+                new StringType(SmokeDetectorCheckState.SMOKE_TEST_REQUESTED.toString()));
+        verify(getBridgeHandler()).putState(eq(getDeviceID()), eq("SmokeDetectorCheck"),
+                smokeDetectorCheckStateCaptor.capture());
+        SmokeDetectorCheckServiceState state = smokeDetectorCheckStateCaptor.getValue();
+        assertSame(SmokeDetectorCheckState.SMOKE_TEST_REQUESTED, state.value);
+
+        getFixture().handleCommand(new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_SMOKE_CHECK),
+                new StringType(SmokeDetectorCheckState.NONE.toString()));
+        verify(getBridgeHandler(), times(2)).putState(eq(getDeviceID()), eq("SmokeDetectorCheck"),
+                smokeDetectorCheckStateCaptor.capture());
+        state = smokeDetectorCheckStateCaptor.getValue();
+        assertSame(SmokeDetectorCheckState.NONE, state.value);
+
+        getFixture().handleCommand(new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_SMOKE_CHECK),
+                new StringType(SmokeDetectorCheckState.SMOKE_TEST_OK.toString()));
+        verify(getBridgeHandler(), times(3)).putState(eq(getDeviceID()), eq("SmokeDetectorCheck"),
+                smokeDetectorCheckStateCaptor.capture());
+        state = smokeDetectorCheckStateCaptor.getValue();
+        assertSame(SmokeDetectorCheckState.SMOKE_TEST_OK, state.value);
+
+        getFixture().handleCommand(new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_SMOKE_CHECK),
+                new StringType(SmokeDetectorCheckState.SMOKE_TEST_FAILED.toString()));
+        verify(getBridgeHandler(), times(4)).putState(eq(getDeviceID()), eq("SmokeDetectorCheck"),
+                smokeDetectorCheckStateCaptor.capture());
+        state = smokeDetectorCheckStateCaptor.getValue();
+        assertSame(SmokeDetectorCheckState.SMOKE_TEST_FAILED, state.value);
+    }
+
+    @Test
+    public void testHandleCommand_PlayPauseType()
+            throws InterruptedException, TimeoutException, ExecutionException, BoschSHCException {
+
+        getFixture().handleCommand(new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_SMOKE_CHECK),
+                PlayPauseType.PLAY);
+        verify(getBridgeHandler()).putState(eq(getDeviceID()), eq("SmokeDetectorCheck"),
+                smokeDetectorCheckStateCaptor.capture());
+        SmokeDetectorCheckServiceState state = smokeDetectorCheckStateCaptor.getValue();
+        assertSame(SmokeDetectorCheckState.SMOKE_TEST_REQUESTED, state.value);
+    }
+
+    @Test
+    public void testUpdateChannel_SmokeDetectorCheckServiceState_none() {
+        JsonElement jsonObject = JsonParser.parseString("{\"@type\":\"smokeDetectorCheckState\",\"value\":NONE}");
+        getFixture().processUpdate("SmokeDetectorCheck", jsonObject);
+        verify(getCallback()).stateUpdated(
+                new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_SMOKE_CHECK),
+                new StringType("NONE"));
+    }
+
+    @Test
+    public void testUpdateChannel_SmokeDetectorCheckServiceState_Requests() {
+        JsonElement jsonObject = JsonParser
+                .parseString("{\"@type\":\"smokeDetectorCheckState\",\"value\":SMOKE_TEST_REQUESTED}");
+        getFixture().processUpdate("SmokeDetectorCheck", jsonObject);
+        verify(getCallback()).stateUpdated(
+                new ChannelUID(getThing().getUID(), BoschSHCBindingConstants.CHANNEL_SMOKE_CHECK),
+                new StringType("SMOKE_TEST_REQUESTED"));
+    }
+}
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/smokedetector/SmokeDetectorHandlerTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/smokedetector/SmokeDetectorHandlerTest.java
new file mode 100644
index 0000000000000..314a77ff22cb4
--- /dev/null
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/smokedetector/SmokeDetectorHandlerTest.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.boschshc.internal.devices.smokedetector;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.boschshc.internal.devices.AbstractSmokeDetectorHandlerTest;
+import org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants;
+import org.openhab.core.thing.ThingTypeUID;
+
+/**
+ * Unit Tests for {@link SmokeDetectorHandler}.
+ *
+ * @author Gerd Zanker - Initial contribution
+ *
+ */
+@NonNullByDefault
+public class SmokeDetectorHandlerTest extends AbstractSmokeDetectorHandlerTest<SmokeDetectorHandler> {
+
+    @Override
+    protected SmokeDetectorHandler createFixture() {
+        return new SmokeDetectorHandler(getThing());
+    }
+
+    @Override
+    protected String getDeviceID() {
+        return "hdm:HomeMaticIP:3014F711A00004DBB85C1234";
+    }
+
+    @Override
+    protected ThingTypeUID getThingTypeUID() {
+        return BoschSHCBindingConstants.THING_TYPE_SMOKE_DETECTOR;
+    }
+}
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandlerTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandlerTest.java
index 0b22f87c0b1d6..49272f84f2f5b 100644
--- a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandlerTest.java
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/devices/twinguard/TwinguardHandlerTest.java
@@ -13,7 +13,7 @@
 package org.openhab.binding.boschshc.internal.devices.twinguard;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.binding.boschshc.internal.devices.AbstractBatteryPoweredDeviceHandlerTest;
+import org.openhab.binding.boschshc.internal.devices.AbstractSmokeDetectorHandlerTest;
 import org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants;
 import org.openhab.core.thing.ThingTypeUID;
 
@@ -24,7 +24,7 @@
  *
  */
 @NonNullByDefault
-public class TwinguardHandlerTest extends AbstractBatteryPoweredDeviceHandlerTest<TwinguardHandler> {
+public class TwinguardHandlerTest extends AbstractSmokeDetectorHandlerTest<TwinguardHandler> {
 
     @Override
     protected TwinguardHandler createFixture() {
diff --git a/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckStateTest.java b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckStateTest.java
new file mode 100644
index 0000000000000..42a3a73c3bc71
--- /dev/null
+++ b/bundles/org.openhab.binding.boschshc/src/test/java/org/openhab/binding/boschshc/internal/services/smokedetectorcheck/SmokeDetectorCheckStateTest.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.boschshc.internal.services.smokedetectorcheck;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link SmokeDetectorCheckState}.
+ * 
+ * @author David Pace - Initial contribution
+ *
+ */
+@NonNullByDefault
+public class SmokeDetectorCheckStateTest {
+
+    @Test
+    void testFrom() {
+        assertSame(SmokeDetectorCheckState.SMOKE_TEST_OK, SmokeDetectorCheckState.from("SMOKE_TEST_OK"));
+        assertSame(SmokeDetectorCheckState.SMOKE_TEST_REQUESTED, SmokeDetectorCheckState.from("SMOKE_TEST_REQUESTED"));
+        assertSame(SmokeDetectorCheckState.SMOKE_TEST_FAILED, SmokeDetectorCheckState.from("SMOKE_TEST_FAILED"));
+        assertSame(SmokeDetectorCheckState.NONE, SmokeDetectorCheckState.from("NONE"));
+        assertSame(SmokeDetectorCheckState.NONE, SmokeDetectorCheckState.from("invalid string"));
+    }
+}

From 00d99e1c3fce059ab1d91a47e8537187fa90877e Mon Sep 17 00:00:00 2001
From: Fejitatete <Fejitatete@users.noreply.github.com>
Date: Sat, 10 Dec 2022 13:08:41 +0100
Subject: [PATCH 20/48] [vitotronic] Add channel "currentmode" to thing
 "circuit" (#13739)

* [vitotronic] Add channel "currentmode" to thing "circuit"

Signed-off-by: Fejitatete <fejitatete@msn.com>
---
 bundles/org.openhab.binding.vitotronic/README.md  |  1 +
 .../resources/OH-INF/i18n/vitotronic.properties   |  2 ++
 .../main/resources/OH-INF/thing/thing-types.xml   | 15 +++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/bundles/org.openhab.binding.vitotronic/README.md b/bundles/org.openhab.binding.vitotronic/README.md
index 9bdf23dbce050..25b23261fb1d5 100644
--- a/bundles/org.openhab.binding.vitotronic/README.md
+++ b/bundles/org.openhab.binding.vitotronic/README.md
@@ -100,6 +100,7 @@ The follow channels are implemented:
 | flowtemperature        | Number    | Temperature sensor of the ciruit flow                 |
 | pump                   | Switch    | Pump state                                            |
 | operationmode          | Number    | Operationmode                                         |
+| currentmode            | Number    | Current Mode
 | savemode               | Switch    | Savemode on/off                                       |
 | partymode              | Switch    | Partymode on/off                                      |
 | party_temp_setpoint    | Number    | Party mode temperature setpoint (target)              |
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
index c433aa667cb46..adf47071a084c 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
@@ -92,6 +92,8 @@ channel-type.vitotronic.consumedoil.label = Consumed Oil
 channel-type.vitotronic.consumedoil.description = Consumed Oil since start of heating in Liter
 channel-type.vitotronic.consumedpellets.label = Consumed Pellets
 channel-type.vitotronic.consumedpellets.description = Consumed Pellets since start of heating in tons
+channel-type.vitotronic.currentmode.label = Current Mode
+channel-type.vitotronic.currentmode.description = Current functionnal mode
 channel-type.vitotronic.error.label = Errors
 channel-type.vitotronic.error.description = True, if errors for the burner exists
 channel-type.vitotronic.exhaust_temp.label = Exhaust Temperature
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
index 65383fea31e7e..97a9a5e7fe166 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
@@ -114,6 +114,7 @@
 			<channel id="flowtemperature" typeId="flow_temp"/>
 			<channel id="pump" typeId="pump"/>
 			<channel id="operationmode" typeId="operationmode"/>
+			<channel id="currentmode" typeId="currentmode"/>
 			<channel id="savemode" typeId="savemode"/>
 			<channel id="partymode" typeId="partymode"/>
 			<channel id="party_temp_setpoint" typeId="party_temp_setpoint"/>
@@ -528,6 +529,20 @@
 		<state pattern="%d" readOnly="false" max="4" min="0" step="1"/>
 	</channel-type>
 
+	<channel-type id="currentmode">
+		<item-type>Number</item-type>
+		<label>Currentmode</label>
+		<description>Current Mode</description>
+		<state pattern="%d" readOnly="true">
+			<options>
+				<option value="0">Standby Operation</option>
+				<option value="1">Reduced Operation</option>
+				<option value="2">Normal Operation</option>
+				<option value="3">Continuous Normal Operation</option>
+			</options>
+		</state>
+	</channel-type>
+
 	<channel-type id="partymode">
 		<item-type>Switch</item-type>
 		<label>Partymode</label>

From 2a7b6bf1c98f394939cd67a16033b4a14675387e Mon Sep 17 00:00:00 2001
From: Matthew Skinner <matt@pcmus.com>
Date: Sat, 10 Dec 2022 23:54:22 +1100
Subject: [PATCH 21/48] [ipcamera] Add a check to see if FFmpeg is frozen for
 mjpeg creation (#13896)

* check if ffmpegMjpeg is frozen

Signed-off-by: Matthew Skinner <matt@pcmus.com>
---
 .../org/openhab/binding/ipcamera/internal/Ffmpeg.java  |  5 +++--
 .../binding/ipcamera/internal/InstarHandler.java       | 10 ++++++++++
 .../ipcamera/internal/handler/IpCameraHandler.java     | 10 ++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/Ffmpeg.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/Ffmpeg.java
index 3b3cbacdc0bb6..d8fbaf070b0e4 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/Ffmpeg.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/Ffmpeg.java
@@ -131,7 +131,7 @@ public void run() {
                     BufferedReader bufferedReader = new BufferedReader(errorStreamReader);
                     String line = null;
                     while ((line = bufferedReader.readLine()) != null) {
-                        logger.debug("{}", line);
+                        logger.trace("{}", line);
                         switch (format) {
                             case RTSP_ALARMS:
                                 if (line.contains("lavfi.")) {
@@ -172,8 +172,9 @@ public void run() {
                                 } else if (line.contains("silence_end")) {
                                     ipCameraHandler.audioDetected();
                                 }
+                            case MJPEG:
                             case SNAPSHOT:
-                                notFrozen = true;// RTSP_ALARMS and SNAPSHOT both set this to true as there is no break.
+                                notFrozen = true;// RTSP_ALARMS, MJPEG and SNAPSHOT all set this to true, no break.
                                 break;
                         }
                     }
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/InstarHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/InstarHandler.java
index bdacdc168bfdf..e2de2ff546212 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/InstarHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/InstarHandler.java
@@ -137,6 +137,16 @@ public void channelRead(@Nullable ChannelHandlerContext ctx, @Nullable Object ms
                             && content.contains("response=\"200\";")) {// new
                         ipCameraHandler.newInstarApi = true;
                         ipCameraHandler.logger.debug("Alarm server sucessfully setup for a 2k+ Instar camera");
+                        if (ipCameraHandler.cameraConfig.getFfmpegInput().isEmpty()) {
+                            ipCameraHandler.rtspUri = "rtsp://" + ipCameraHandler.cameraConfig.getIp()
+                                    + "/livestream/12";
+                        }
+                        if (ipCameraHandler.cameraConfig.getMjpegUrl().isEmpty()) {
+                            ipCameraHandler.mjpegUri = "/livestream/12?action=play&media=mjpeg";
+                        }
+                        if (ipCameraHandler.cameraConfig.getSnapshotUrl().isEmpty()) {
+                            ipCameraHandler.snapshotUri = "/snap.cgi?chn=12";
+                        }
                     } else if (requestUrl.startsWith("/param.cgi?cmd=setmdalarm&-aname=server2&-switch=on&-interval=1")
                             && content.startsWith("[Succeed]set ok")) {
                         ipCameraHandler.newInstarApi = false;
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
index c424388da03c3..d12b6a8cfd537 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
+++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/handler/IpCameraHandler.java
@@ -906,9 +906,9 @@ public void setupFfmpegFormat(FFmpegFormat format) {
             case MJPEG:
                 if (ffmpegMjpeg == null) {
                     if (inputOptions.isEmpty()) {
-                        inputOptions = "-hide_banner -loglevel warning";
+                        inputOptions = "-hide_banner";
                     } else {
-                        inputOptions += " -hide_banner -loglevel warning";
+                        inputOptions += " -hide_banner";
                     }
                     ffmpegMjpeg = new Ffmpeg(this, format, cameraConfig.getFfmpegLocation(), inputOptions, rtspUri,
                             cameraConfig.getMjpegOptions(), "http://127.0.0.1:" + SERVLET_PORT + "/ipcamera/"
@@ -1575,6 +1575,12 @@ void pollCameraRunnable() {
                 setupFfmpegFormat(FFmpegFormat.RTSP_ALARMS);
             }
         }
+        // check if the thread has frozen due to camera doing a soft reboot
+        localFfmpeg = ffmpegMjpeg;
+        if (localFfmpeg != null && !localFfmpeg.getIsAlive()) {
+            logger.debug("MJPEG was not being produced by FFmpeg when it should have been, restarting FFmpeg.");
+            setupFfmpegFormat(FFmpegFormat.MJPEG);
+        }
         if (openChannels.size() > 10) {
             logger.debug("There are {} open Channels being tracked.", openChannels.size());
             cleanChannels();

From 4c962191b1e858ea7c222fe9cb6eb36fcbf85e0a Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Sat, 10 Dec 2022 14:29:53 +0100
Subject: [PATCH 22/48] [vitotronic] Fix few thing/channel labels/descriptions
 (#13898)

Follow-up #13739

Signed-off-by: Laurent Garnier <lg.hc@free.fr>

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../OH-INF/i18n/vitotronic.properties         | 60 ++++++++++---------
 .../main/resources/OH-INF/thing/bridge.xml    |  2 +-
 .../resources/OH-INF/thing/thing-types.xml    | 56 ++++++++---------
 3 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
index adf47071a084c..e923947212543 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
@@ -52,7 +52,7 @@ thing-type.vitotronic.pump.label = Pump
 thing-type.vitotronic.pump.description = Single pump
 thing-type.vitotronic.solar.label = Solar Heating
 thing-type.vitotronic.solar.description = Solar water heating (SWH): Convert sunlight into energy for water heating
-thing-type.vitotronic.storagetank.label = Hotwater Storagetank
+thing-type.vitotronic.storagetank.label = Hot Water Storage Tank
 thing-type.vitotronic.storagetank.description = Storage Tank, stores heat in a water tank on 3 levels: bottom, middle, top=hot water
 thing-type.vitotronic.temperaturesensor.label = Temperature Sensor
 thing-type.vitotronic.temperaturesensor.description = Single temperature sensor
@@ -68,15 +68,15 @@ thing-type.config.vitotronic.bridge.ipAddress.description = The IP address of th
 thing-type.config.vitotronic.bridge.port.label = Adapter Port
 thing-type.config.vitotronic.bridge.port.description = Port of the LAN gateway
 thing-type.config.vitotronic.bridge.refreshInterval.label = Refresh Interval
-thing-type.config.vitotronic.bridge.refreshInterval.description = Refreshtime in seconds.
+thing-type.config.vitotronic.bridge.refreshInterval.description = Refresh interval in seconds.
 
 # channel types
 
 channel-type.vitotronic.actualpower.label = Actual Power Level
 channel-type.vitotronic.actualpower.description = Actual power of the burner
-channel-type.vitotronic.airshutter_prim.label = Primary Airshutter
+channel-type.vitotronic.airshutter_prim.label = Primary Air Shutter
 channel-type.vitotronic.airshutter_prim.description = Position of the primary air shutter
-channel-type.vitotronic.airshutter_sec.label = Secondary Airshutter
+channel-type.vitotronic.airshutter_sec.label = Secondary Air Shutter
 channel-type.vitotronic.airshutter_sec.description = Position of the secondary air shutter
 channel-type.vitotronic.boiler_temp.label = Boiler
 channel-type.vitotronic.boiler_temp.description = Temperature sensor of boiler (fireplace)
@@ -93,15 +93,19 @@ channel-type.vitotronic.consumedoil.description = Consumed Oil since start of he
 channel-type.vitotronic.consumedpellets.label = Consumed Pellets
 channel-type.vitotronic.consumedpellets.description = Consumed Pellets since start of heating in tons
 channel-type.vitotronic.currentmode.label = Current Mode
-channel-type.vitotronic.currentmode.description = Current functionnal mode
+channel-type.vitotronic.currentmode.description = Current functional mode
+channel-type.vitotronic.currentmode.state.option.0 = Standby Operation
+channel-type.vitotronic.currentmode.state.option.1 = Reduced Operation
+channel-type.vitotronic.currentmode.state.option.2 = Normal Operation
+channel-type.vitotronic.currentmode.state.option.3 = Continuous Normal Operation
 channel-type.vitotronic.error.label = Errors
 channel-type.vitotronic.error.description = True, if errors for the burner exists
 channel-type.vitotronic.exhaust_temp.label = Exhaust Temperature
 channel-type.vitotronic.exhaust_temp.description = Actual temperature of the exhaust
 channel-type.vitotronic.fanspeed.label = Fan Speed
-channel-type.vitotronic.fanspeed.description = Fan Speed in rpm
+channel-type.vitotronic.fanspeed.description = Fan speed in rpm
 channel-type.vitotronic.fanspeed_target.label = Target Fan Speed
-channel-type.vitotronic.fanspeed_target.description = Fan Speed in rpm
+channel-type.vitotronic.fanspeed_target.description = Target fan speed in rpm
 channel-type.vitotronic.flame_temp.label = Flame
 channel-type.vitotronic.flame_temp.description = Temperature of flame
 channel-type.vitotronic.flow_temp.label = Flow
@@ -112,8 +116,8 @@ channel-type.vitotronic.gradient.label = Gradient
 channel-type.vitotronic.gradient.description = The gradient relative to outside temperature
 channel-type.vitotronic.hotwater_temp.label = Hot Water
 channel-type.vitotronic.hotwater_temp.description = Temperature sensor of the hot water
-channel-type.vitotronic.hotwater_temp_setpoint.label = Hotwater TempSet
-channel-type.vitotronic.hotwater_temp_setpoint.description = Set the hot water temperature
+channel-type.vitotronic.hotwater_temp_setpoint.label = Hot Water Set Point
+channel-type.vitotronic.hotwater_temp_setpoint.description = Set the hot water temperature set point
 channel-type.vitotronic.lambdasensor.label = Lambdasensor (O2)
 channel-type.vitotronic.lambdasensor.description = Oxygen content of the exhaust air
 channel-type.vitotronic.loadsuppression.label = Load Suppression
@@ -122,42 +126,44 @@ channel-type.vitotronic.malfunction.label = Heating Malfunction
 channel-type.vitotronic.malfunction.description = General Malfunction state of the heating
 channel-type.vitotronic.middle_temp.label = Middle
 channel-type.vitotronic.middle_temp.description = Temperature sensor in the middle of the storage tank
-channel-type.vitotronic.niveau.label = Niveau
-channel-type.vitotronic.niveau.description = The niveau relative to outside temperature
+channel-type.vitotronic.niveau.label = Level
+channel-type.vitotronic.niveau.description = The level relative to outside temperature
 channel-type.vitotronic.ontime.label = On Time
-channel-type.vitotronic.ontime.description = Ontime in hours
+channel-type.vitotronic.ontime.description = On time in hours
 channel-type.vitotronic.ontimelevel1.label = On Time Level 1
-channel-type.vitotronic.ontimelevel1.description = Ontime in hours
+channel-type.vitotronic.ontimelevel1.description = On time in hours
 channel-type.vitotronic.ontimelevel2.label = On Time Level 2
-channel-type.vitotronic.ontimelevel2.description = Ontime in hours
-channel-type.vitotronic.operationmode.label = Operationmode
-channel-type.vitotronic.operationmode.description = Operationmode
+channel-type.vitotronic.ontimelevel2.description = On time in hours
+channel-type.vitotronic.operationmode.label = Operation Mode
+channel-type.vitotronic.operationmode.description = Operation mode
 channel-type.vitotronic.outside_temp.label = Outside Temperature
 channel-type.vitotronic.outside_temp.description = Outside temperature sensor
-channel-type.vitotronic.party_temp_setpoint.label = Partymode TempSet
+channel-type.vitotronic.party_temp_setpoint.label = Party Mode Temperature Set Point
 channel-type.vitotronic.party_temp_setpoint.description = Target temperature of party mode
-channel-type.vitotronic.partymode.label = Partymode
-channel-type.vitotronic.partymode.description = Partymode on/off
+channel-type.vitotronic.partymode.label = Party Mode
+channel-type.vitotronic.partymode.description = Party mode on/off
 channel-type.vitotronic.powerlevel.label = Power Level
 channel-type.vitotronic.producedheat.label = Produced Heat
 channel-type.vitotronic.producedheat.description = Produced heat since starting solar system
 channel-type.vitotronic.pump.label = Pump
 channel-type.vitotronic.pump.description = Pump state
-channel-type.vitotronic.room_temp.label = Room Temp
+channel-type.vitotronic.room_temp.label = Room Temperature
 channel-type.vitotronic.room_temp.description = Temperature of rooms
-channel-type.vitotronic.room_temp_setpoint.label = Room TempSet
+channel-type.vitotronic.room_temp_setpoint.label = Room Temperature Set Point
 channel-type.vitotronic.room_temp_setpoint.description = Target temperature of rooms
-channel-type.vitotronic.save_temp_setpoint.label = Savemode TempSet
+channel-type.vitotronic.save_temp_setpoint.label = Save Mode Temperature Set Point
 channel-type.vitotronic.save_temp_setpoint.description = Target temperature of save mode
-channel-type.vitotronic.savemode.label = Savemode
-channel-type.vitotronic.savemode.description = Savemode on/off
+channel-type.vitotronic.savemode.label = Save Mode
+channel-type.vitotronic.savemode.description = Save mode on/off
 channel-type.vitotronic.starts.label = Starts
 channel-type.vitotronic.starts.description = Count of starts
-channel-type.vitotronic.storagetank_temp.label = Storagetank
+channel-type.vitotronic.storagetank_temp.label = Storage Tank
 channel-type.vitotronic.storagetank_temp.description = Actual temperature of the storage tank (solar sensor)
-channel-type.vitotronic.systemtime.label = DateTime of the Heating System
+channel-type.vitotronic.systemtime.label = DateTime Heating System
+channel-type.vitotronic.systemtime.description = Date and time of the Heating System
 channel-type.vitotronic.temperature.label = Temperature
 channel-type.vitotronic.temperature.description = Generic temperature sensor
-channel-type.vitotronic.timer.label = Timer for Heating or Warm Water
+channel-type.vitotronic.timer.label = Timer
+channel-type.vitotronic.timer.description = Timer for Heating or Warm Water
 channel-type.vitotronic.valve.label = Valve
 channel-type.vitotronic.valve.description = Value of a generic valve
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/bridge.xml
index 32a243eaaaf3b..188483328c8bf 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/bridge.xml
@@ -28,7 +28,7 @@
 			<parameter name="refreshInterval" type="integer" required="false" min="60" max="600">
 				<context>refresh</context>
 				<label>Refresh Interval</label>
-				<description>Refreshtime in seconds.</description>
+				<description>Refresh interval in seconds.</description>
 				<default>300</default>
 			</parameter>
 		</config-description>
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
index 97a9a5e7fe166..379258e8f6d65 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
@@ -89,7 +89,7 @@
 			<bridge-type-ref id="bridge"/>
 		</supported-bridge-type-refs>
 
-		<label>Hotwater Storagetank</label>
+		<label>Hot Water Storage Tank</label>
 		<description>Storage Tank, stores heat in a water tank on 3 levels: bottom, middle, top=hot water</description>
 
 		<channels>
@@ -311,7 +311,8 @@
 
 	<channel-type id="systemtime">
 		<item-type>DateTime</item-type>
-		<label>DateTime of the Heating System</label>
+		<label>DateTime Heating System</label>
+		<description>Date and time of the Heating System</description>
 		<state readOnly="true"/>
 	</channel-type>
 
@@ -373,14 +374,14 @@
 
 	<channel-type id="airshutter_prim" advanced="true">
 		<item-type>Number</item-type>
-		<label>Primary Airshutter</label>
+		<label>Primary Air Shutter</label>
 		<description>Position of the primary air shutter</description>
 		<state pattern="%d %%" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="airshutter_sec" advanced="true">
 		<item-type>Number</item-type>
-		<label>Secondary Airshutter</label>
+		<label>Secondary Air Shutter</label>
 		<description>Position of the secondary air shutter</description>
 		<state pattern="%d %%" readOnly="true"/>
 	</channel-type>
@@ -395,21 +396,21 @@
 	<channel-type id="fanspeed">
 		<item-type>Number</item-type>
 		<label>Fan Speed</label>
-		<description>Fan Speed in rpm</description>
+		<description>Fan speed in rpm</description>
 		<state pattern="%d rpm" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="fanspeed_target" advanced="true">
 		<item-type>Number</item-type>
 		<label>Target Fan Speed</label>
-		<description>Fan Speed in rpm</description>
+		<description>Target fan speed in rpm</description>
 		<state pattern="%d rpm" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="ontime" advanced="true">
 		<item-type>Number</item-type>
 		<label>On Time</label>
-		<description>Ontime in hours</description>
+		<description>On time in hours</description>
 		<state pattern="%.2f h" readOnly="true"/>
 	</channel-type>
 
@@ -446,14 +447,14 @@
 	<channel-type id="ontimelevel1" advanced="true">
 		<item-type>Number</item-type>
 		<label>On Time Level 1</label>
-		<description>Ontime in hours</description>
+		<description>On time in hours</description>
 		<state pattern="%.2f h" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="ontimelevel2" advanced="true">
 		<item-type>Number</item-type>
 		<label>On Time Level 2</label>
-		<description>Ontime in hours</description>
+		<description>On time in hours</description>
 		<state pattern="%.2f h" readOnly="true"/>
 	</channel-type>
 
@@ -499,8 +500,8 @@
 
 	<channel-type id="hotwater_temp_setpoint">
 		<item-type>Number</item-type>
-		<label>Hotwater TempSet</label>
-		<description>Set the hot water temperature</description>
+		<label>Hot Water Set Point</label>
+		<description>Set the hot water temperature set point</description>
 		<category>Temperature</category>
 		<state pattern="%d °C" readOnly="false" max="60" min="30" step="1"/>
 	</channel-type>
@@ -524,15 +525,15 @@
 
 	<channel-type id="operationmode">
 		<item-type>Number</item-type>
-		<label>Operationmode</label>
-		<description>Operationmode</description>
+		<label>Operation Mode</label>
+		<description>Operation mode</description>
 		<state pattern="%d" readOnly="false" max="4" min="0" step="1"/>
 	</channel-type>
 
 	<channel-type id="currentmode">
 		<item-type>Number</item-type>
-		<label>Currentmode</label>
-		<description>Current Mode</description>
+		<label>Current Mode</label>
+		<description>Current functional mode</description>
 		<state pattern="%d" readOnly="true">
 			<options>
 				<option value="0">Standby Operation</option>
@@ -545,21 +546,21 @@
 
 	<channel-type id="partymode">
 		<item-type>Switch</item-type>
-		<label>Partymode</label>
-		<description>Partymode on/off</description>
+		<label>Party Mode</label>
+		<description>Party mode on/off</description>
 		<state readOnly="false"/>
 	</channel-type>
 
 	<channel-type id="savemode">
 		<item-type>Switch</item-type>
-		<label>Savemode</label>
-		<description>Savemode on/off</description>
+		<label>Save Mode</label>
+		<description>Save mode on/off</description>
 		<state readOnly="false"/>
 	</channel-type>
 
 	<channel-type id="party_temp_setpoint" advanced="true">
 		<item-type>Number</item-type>
-		<label>Partymode TempSet</label>
+		<label>Party Mode Temperature Set Point</label>
 		<description>Target temperature of party mode</description>
 		<category>Temperature</category>
 		<state min="6" step="1" pattern="%.1f °C" readOnly="false"/>
@@ -567,7 +568,7 @@
 
 	<channel-type id="save_temp_setpoint" advanced="true">
 		<item-type>Number</item-type>
-		<label>Savemode TempSet</label>
+		<label>Save Mode Temperature Set Point</label>
 		<description>Target temperature of save mode</description>
 		<category>Temperature</category>
 		<state min="6" step="1" pattern="%.1f °C" readOnly="false"/>
@@ -575,7 +576,7 @@
 
 	<channel-type id="room_temp" advanced="true">
 		<item-type>Number</item-type>
-		<label>Room Temp</label>
+		<label>Room Temperature</label>
 		<description>Temperature of rooms</description>
 		<category>Temperature</category>
 		<state pattern="%.1f °C" readOnly="true"/>
@@ -583,7 +584,7 @@
 
 	<channel-type id="room_temp_setpoint">
 		<item-type>Number</item-type>
-		<label>Room TempSet</label>
+		<label>Room Temperature Set Point</label>
 		<description>Target temperature of rooms</description>
 		<category>Temperature</category>
 		<state min="6" step="1" pattern="%.1f °C" readOnly="false"/>
@@ -598,14 +599,15 @@
 
 	<channel-type id="niveau" advanced="true">
 		<item-type>Number</item-type>
-		<label>Niveau</label>
-		<description>The niveau relative to outside temperature</description>
+		<label>Level</label>
+		<description>The level relative to outside temperature</description>
 		<state pattern="%.1f" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="timer" advanced="true">
 		<item-type>String</item-type>
-		<label>Timer for Heating or Warm Water</label>
+		<label>Timer</label>
+		<description>Timer for Heating or Warm Water</description>
 		<state pattern="%s" readOnly="true"/>
 	</channel-type>
 
@@ -621,7 +623,7 @@
 
 	<channel-type id="storagetank_temp">
 		<item-type>Number</item-type>
-		<label>Storagetank</label>
+		<label>Storage Tank</label>
 		<description>Actual temperature of the storage tank (solar sensor)</description>
 		<category>Temperature</category>
 		<state pattern="%.1f °C" readOnly="true"/>

From ad5facc2e5bdf1804d9c34fdaa0c1b8177653b21 Mon Sep 17 00:00:00 2001
From: openhab-bot <bot@openhab.org>
Date: Sat, 10 Dec 2022 14:51:09 +0100
Subject: [PATCH 23/48] New translations boschshc.properties (Italian) (#13899)

---
 .../src/main/resources/OH-INF/i18n/boschshc_it.properties | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_it.properties b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_it.properties
index 4c939030b2b7a..1187a738e0ac3 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_it.properties
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_it.properties
@@ -25,6 +25,8 @@ thing-type.boschshc.smart-bulb.label = Lampadina intelligente
 thing-type.boschshc.smart-bulb.description = Una lampadina intelligente collegata tramite Zigbee.
 thing-type.boschshc.smart-plug-compact.label = Presa intelligente compatta
 thing-type.boschshc.smart-plug-compact.description = Una presa intelligente compatta con capacità di monitoraggio dell'energia.
+thing-type.boschshc.smoke-detector.label = Rilevatore di Fumo
+thing-type.boschshc.smoke-detector.description = Il rivelatore di fumo ti avverte in caso di incendio.
 thing-type.boschshc.thermostat.label = Termostato
 thing-type.boschshc.thermostat.description = Termostato Calorifero
 thing-type.boschshc.twinguard.label = TwinGuard
@@ -105,6 +107,12 @@ channel-type.boschshc.purity.label = Purezza
 channel-type.boschshc.purity.description = Purezza dell’aria. Un valore più elevato indica un inquinamento più elevato.
 channel-type.boschshc.setpoint-temperature.label = Temperatura Impostata
 channel-type.boschshc.setpoint-temperature.description = Temperatura desiderata.
+channel-type.boschshc.smoke-check.label = Test Rilevatore fumo
+channel-type.boschshc.smoke-check.description = Stato dell’ultimo test per il rivelatore di fumo.
+channel-type.boschshc.smoke-check.state.option.NONE = Nessuno
+channel-type.boschshc.smoke-check.state.option.SMOKE_TEST_REQUESTED = Test richiesto
+channel-type.boschshc.smoke-check.state.option.SMOKE_TEST_OK = Test riuscito
+channel-type.boschshc.smoke-check.state.option.SMOKE_TEST_FAILED = Test fallito
 channel-type.boschshc.system-availability.label = Disponibilità del sistema
 channel-type.boschshc.system-availability.description = Indica se è disponibile il sistema di rilevamento delle intrusioni.
 channel-type.boschshc.temperature-rating.label = Valutazione della Temperatura

From 8d28085226ac74dc8182d412faa6cb5b61badd96 Mon Sep 17 00:00:00 2001
From: Christian Wild <40909464+wildcs@users.noreply.github.com>
Date: Sat, 10 Dec 2022 16:53:30 +0100
Subject: [PATCH 24/48] [tapocontrol] add L610, L630 Spot and L930 LightStrip
 (#13814)

* fix color change bug*

Signed-off-by: Christian Wild <christian@wildclan.de>
---
 .../org.openhab.binding.tapocontrol/README.md |  80 +++++--------
 .../internal/TapoDiscoveryService.java        |   4 +-
 .../constants/TapoThingConstants.java         |  13 ++-
 .../internal/device/TapoBridgeHandler.java    |   2 +
 .../internal/device/TapoSmartBulb.java        |   6 +-
 .../OH-INF/i18n/tapocontrol.properties        |   8 ++
 .../src/main/resources/OH-INF/thing/L610.xml  |  23 ++++
 .../src/main/resources/OH-INF/thing/L630.xml  |  23 ++++
 .../src/main/resources/OH-INF/thing/L930.xml  |  23 ++++
 .../main/resources/OH-INF/thing/channels.xml  |  12 +-
 .../internal}/TapoDiscoveryService.java       |   2 +-
 .../internal/discovery/TapoMDNS.java          | 107 ++++++++++++++++++
 .../internal/{api => discovery}/TapoUDP.java  |   0
 13 files changed, 239 insertions(+), 64 deletions(-)
 create mode 100644 bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L610.xml
 create mode 100644 bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L630.xml
 create mode 100644 bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L930.xml
 rename bundles/org.openhab.binding.tapocontrol/src/test/{ => java/org/openhab/binding/tapocontrol/internal}/TapoDiscoveryService.java (99%)
 create mode 100644 bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/discovery/TapoMDNS.java
 rename bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/{api => discovery}/TapoUDP.java (100%)

diff --git a/bundles/org.openhab.binding.tapocontrol/README.md b/bundles/org.openhab.binding.tapocontrol/README.md
index 562c0f66a1c65..4df37cd0989d1 100644
--- a/bundles/org.openhab.binding.tapocontrol/README.md
+++ b/bundles/org.openhab.binding.tapocontrol/README.md
@@ -4,49 +4,21 @@ This binding adds support to control Tapo (Copyright © TP-Link Corporation Limi
 
 ## Supported Things
 
-The following Tapo-Devices are supported
-
-### P100/P105 SmartPlug (Wi-Fi)
-
-* Power On/Off
-* Wi-Fi signal (SignalStrength)
-* On-Time (Time in seconds device is switched on)
-
-### P110/P115 EnergyMonitoring SmartPlug (Wi-Fi)
-
-* Power On/Off
-* Wi-Fi signal (SignalStrength)
-* On-Time (Time in seconds device is switched on)
-* actual PowerUsage (Watt)
-* today EnergyUsage (Wh)
-* today Runtime (Time in seconds device was on today)
-
-### L510(Series) dimmable SmartBulb (Wi-Fi)
-
-* Light On/Off
-* Brightnes (Dimmer)  0-100 %
-* ColorTemperature (Number) 2500-6500 K
-* Wi-Fi signal (SignalStrength)
-* On-Time (Time in seconds device is switched on)
-
-### L530(Series) MultiColor SmartBulb (Wi-Fi)
-
-* Light On/Off
-* Brightnes (Dimmer)  0-100 %
-* ColorTemperature (Number) 2500-6500 K
-* Color (Color)
-* Wi-Fi signal (SignalStrength)
-* On-Time (Time in seconds device is switched on)
-
-### L900/L920 LED-LightStrip (Wi-Fi)
-
-* Light On/Off
-* Brightnes (Dimmer)  0-100 %
-* ColorTemperature (Number) 2500-6500 K
-* Color (Color)
-* Wi-Fi signal (SignalStrength)
-* On-Time (Time in seconds device is switched on)
-
+The following Tapo-Devices are supported. For precise channel-description look at `channels-table` below
+
+| DeviceType                         | ThingType   | Description                                 |
+|------------------------------------|-------------|---------------------------------------------|
+| SmartPlug (Wi-Fi)                  | P100        | Smart Socket                                |
+|                                    | P105        | Smart Mini Socket                           |
+| EnergyMonitoring SmartPlug (Wi-Fi) | P110        | Energy Monitoring Smart Socket              |
+|                                    | P115        | Energy Monitoring Mini Smart Socket         |
+| Dimmable SmartBulb (Wi-Fi)         | L510        | Dimmable White-Light Smart-Bulb (E27)       |
+|                                    | L610        | Dimmable White-Light Smart-Spot (GU10)      |
+| MultiColor SmartBulb (Wi-Fi)       | L530        | Multicolor Smart-Bulb (E27)                 |
+|                                    | L630        | Multicolor Smart-Spot (GU10)                |
+| MultiColor LightStrip (Wi-Fi)      | L900        | Multicolor RGB Dimmable LightStrip (5m)     |
+|                                    | L920        | Multicolor RGB-IC ColorZone LightStrip (5m) |
+|                                    | L930        | Multicolor RGBW-IC 50-Zone LightStrip (5m)  |
 
 ## Prerequisites
 
@@ -91,17 +63,17 @@ The thing has the following configuration parameters:
 
 All devices support some of the following channels:
 
-| group     | channel          |type                    | description                  | things supporting this channel                 |
-|-----------|----------------- |------------------------|------------------------------|------------------------------------------------|
-| actuator  | output           | Switch                 | Power device on or off       | P100, P105, P110, P115, L510, L530, L900, L920 |
-|           | brightness       | Dimmer                 | Brightness 0-100%            | L510, L530, L900                               |
-|           | colorTemperature | Number                 | White-Color-Temp 2500-6500K  | L510, L530, L900                               |
-|           | color            | Color                  | Color                        | L530, L900                                     |
-| device    | wifiSignal       | system.signal-strength | WiFi-quality-level           | P100, P105, P110, P115, L510, L530, L900, L920 |
-|           | onTime           | Number:Time            | seconds output is on         | P100, P105, P110, P115, L510, L530, L900, L920 |
-| energy    | actualPower      | Number:Power           | actual Power (Watt)          | P110, P115                                     |
-|           | todayEnergyUsage | Number:Energy          | used energy today (Wh)       | P110, P115                                     |
-|           | todayRuntime     | Number:Time            | seconds output was on today  | P110, P115                                     |
+| group     | channel          | type                   | description                  | things supporting this channel                                   |
+|-----------|----------------- |------------------------|------------------------------|------------------------------------------------------------------|
+| actuator  | output           | Switch                 | Power device on or off       | P100, P105, P110, P115, L510, L530, L610, L630, L900, L920, L930 |
+|           | brightness       | Dimmer                 | Brightness 0-100%            | L510, L530, L610, L630, L900                                     |
+|           | colorTemperature | Number                 | White-Color-Temp 2500-6500K  | L510, L530, L610, L630, L900                                     |
+|           | color            | Color                  | Color                        | L530, L630, L900                                                 |
+| device    | wifiSignal       | Number                 | WiFi-quality-level           | P100, P105, P110, P115, L510, L530, L610, L630, L900, L920, L930 |
+|           | onTime           | Number:Time            | seconds output is on         | P100, P105, P110, P115, L510, L530, L900, L920, L930             |
+| energy    | actualPower      | Number:Power           | actual Power (Watt)          | P110, P115                                                       |
+|           | todayEnergyUsage | Number:Energy          | used energy today (Wh)       | P110, P115                                                       |
+|           | todayRuntime     | Number:Time            | seconds output was on today  | P110, P115                                                       |
 
 
 ## Channel Refresh
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/TapoDiscoveryService.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/TapoDiscoveryService.java
index f13bfc7f705c1..0e465af8c0d2f 100644
--- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/TapoDiscoveryService.java
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/TapoDiscoveryService.java
@@ -64,7 +64,7 @@ public TapoDiscoveryService() {
     }
 
     /**
-     * deactivate
+     * activate
      */
     @Override
     public void activate() {
@@ -178,7 +178,7 @@ protected void handleCloudDevices(JsonArray deviceList) {
                 }
             }
         } catch (Exception e) {
-            logger.debug("error handlling CloudDevices", e);
+            logger.debug("error handling CloudDevices", e);
         }
     }
 
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/constants/TapoThingConstants.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/constants/TapoThingConstants.java
index b2422668ea60a..60f2ec9009369 100644
--- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/constants/TapoThingConstants.java
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/constants/TapoThingConstants.java
@@ -40,8 +40,11 @@ public class TapoThingConstants {
     public static final String DEVICE_P115 = "P115";
     public static final String DEVICE_L510 = "L510";
     public static final String DEVICE_L530 = "L530";
+    public static final String DEVICE_L610 = "L610";
+    public static final String DEVICE_L630 = "L630";
     public static final String DEVICE_L900 = "L900";
     public static final String DEVICE_L920 = "L920";
+    public static final String DEVICE_L930 = "L930";
     public static final String DEVICE_UNIVERSAL = "Test_Device";
 
     /*** LIST OF SUPPORTED DEVICE DESCRIPTIONS ***/
@@ -59,17 +62,21 @@ public class TapoThingConstants {
     public static final ThingTypeUID P115_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_P115);
     public static final ThingTypeUID L510_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_L510);
     public static final ThingTypeUID L530_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_L530);
+    public static final ThingTypeUID L610_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_L610);
+    public static final ThingTypeUID L630_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_L630);
     public static final ThingTypeUID L900_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_L900);
     public static final ThingTypeUID L920_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_L920);
+    public static final ThingTypeUID L930_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_L930);
     public static final ThingTypeUID UNIVERSAL_THING_TYPE = new ThingTypeUID(BINDING_ID, DEVICE_UNIVERSAL);
 
     /*** SET OF SUPPORTED UIDS ***/
     public static final Set<ThingTypeUID> SUPPORTED_BRIDGE_UIDS = Set.of(BRIDGE_THING_TYPE);
     public static final Set<ThingTypeUID> SUPPORTED_SMART_PLUG_UIDS = Set.of(P100_THING_TYPE, P105_THING_TYPE,
             P110_THING_TYPE, P115_THING_TYPE);
-    public static final Set<ThingTypeUID> SUPPORTED_WHITE_BULB_UIDS = Set.of(L510_THING_TYPE);
-    public static final Set<ThingTypeUID> SUPPORTED_COLOR_BULB_UIDS = Set.of(L530_THING_TYPE);
-    public static final Set<ThingTypeUID> SUPPORTED_LIGHT_STRIP_UIDS = Set.of(L900_THING_TYPE, L920_THING_TYPE);
+    public static final Set<ThingTypeUID> SUPPORTED_WHITE_BULB_UIDS = Set.of(L510_THING_TYPE, L610_THING_TYPE);
+    public static final Set<ThingTypeUID> SUPPORTED_COLOR_BULB_UIDS = Set.of(L530_THING_TYPE, L630_THING_TYPE);
+    public static final Set<ThingTypeUID> SUPPORTED_LIGHT_STRIP_UIDS = Set.of(L900_THING_TYPE, L920_THING_TYPE,
+            L930_THING_TYPE);
     public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Collections
             .unmodifiableSet(Stream
                     .of(SUPPORTED_BRIDGE_UIDS, SUPPORTED_SMART_PLUG_UIDS, SUPPORTED_WHITE_BULB_UIDS,
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/device/TapoBridgeHandler.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/device/TapoBridgeHandler.java
index 832f1dfdf1d04..2f7296b07467d 100644
--- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/device/TapoBridgeHandler.java
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/device/TapoBridgeHandler.java
@@ -259,6 +259,8 @@ public JsonArray getDeviceList() {
         if (config.cloudDiscovery) {
             logger.trace("{} discover devicelist from cloud", this.uid);
             deviceList = getDeviceListCloud();
+        } else {
+            logger.info("{} Discovery disabled in bridge settings ", this.uid);
         }
         return deviceList;
     }
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/device/TapoSmartBulb.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/device/TapoSmartBulb.java
index 985c005144b51..dd73822472253 100644
--- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/device/TapoSmartBulb.java
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/device/TapoSmartBulb.java
@@ -127,9 +127,9 @@ protected void setBrightness(Integer newBrightness) {
     protected void setColor(HSBType command) {
         HashMap<String, Object> newState = new HashMap<>();
         newState.put(DEVICE_PROPERTY_ON, true);
-        newState.put(DEVICE_PROPERTY_HUE, command.getHue());
-        newState.put(DEVICE_PROPERTY_SATURATION, command.getSaturation());
-        newState.put(DEVICE_PROPERTY_BRIGHTNES, command.getBrightness());
+        newState.put(DEVICE_PROPERTY_HUE, command.getHue().intValue());
+        newState.put(DEVICE_PROPERTY_SATURATION, command.getSaturation().intValue());
+        newState.put(DEVICE_PROPERTY_BRIGHTNES, command.getBrightness().intValue());
         connector.sendDeviceCommands(newState);
     }
 
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties
index 2dc9379b14ef4..1fc39a16f3321 100644
--- a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties
@@ -9,10 +9,16 @@ thing-type.tapocontrol.L510.label = L510 Series White-Bulb
 thing-type.tapocontrol.L510.description = Tapo Smart dimmable White-Light-Bulb
 thing-type.tapocontrol.L530.label = L530 Series Color-Bulb
 thing-type.tapocontrol.L530.description = Tapo Smart Multicolor Light-Bulb
+thing-type.tapocontrol.L610.label = L610 Series White-Spot
+thing-type.tapocontrol.L610.description = Tapo Smart dimmable White-Light-Spot
+thing-type.tapocontrol.L630.label = L630 Series Color-Spot
+thing-type.tapocontrol.L630.description = Tapo Smart Multicolor Light-Spot
 thing-type.tapocontrol.L900.label = L900 LightStrip
 thing-type.tapocontrol.L900.description = Tapo Smart LED-Lightstrip
 thing-type.tapocontrol.L920.label = L920 LightStrip
 thing-type.tapocontrol.L920.description = Tapo Smart Multicolor LED-Lightstrip
+thing-type.tapocontrol.L930.label = L930 LightStrip
+thing-type.tapocontrol.L930.description = Tapo Smart Multicolor LED-Lightstrip with ZoneControl
 thing-type.tapocontrol.P100.label = P100 SmartPlug
 thing-type.tapocontrol.P100.description = Tapo Smart Wifi Plug
 thing-type.tapocontrol.P105.label = P105 SmartPlug
@@ -44,6 +50,8 @@ channel-group-type.tapocontrol.colorBulb.label = Color Light Bulb
 channel-group-type.tapocontrol.colorBulb.description = Tapo Multicolor Smart Light Bulb
 channel-group-type.tapocontrol.deviceState.label = Device State
 channel-group-type.tapocontrol.deviceState.description = Information about the device
+channel-group-type.tapocontrol.deviceStateS.label = Device State
+channel-group-type.tapocontrol.deviceStateS.description = Information about the device
 channel-group-type.tapocontrol.energyMonitor.label = Energy Usage
 channel-group-type.tapocontrol.energyMonitor.description = Energy and Power usage
 channel-group-type.tapocontrol.lightBulb.label = Light Bulb
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L610.xml b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L610.xml
new file mode 100644
index 0000000000000..cc573946792e7
--- /dev/null
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L610.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="tapocontrol"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<!-- L610 THING-TYPE (WHITE-LIGHT-BULB) -->
+	<thing-type id="L610">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="bridge"/>
+		</supported-bridge-type-refs>
+
+		<label>L610 Series White-Spot</label>
+		<description>Tapo Smart dimmable White-Light-Spot</description>
+		<channel-groups>
+			<channel-group id="actuator" typeId="lightBulb"/>
+			<channel-group id="device" typeId="deviceStateS"/>
+		</channel-groups>
+		<representation-property>macAddress</representation-property>
+
+		<config-description-ref uri="thing-type:tapo:device"/>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L630.xml b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L630.xml
new file mode 100644
index 0000000000000..1108af0dd36bf
--- /dev/null
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L630.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="tapocontrol"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<!-- L630 THING-TYPE (COLOR-LIGHT-BULB) -->
+	<thing-type id="L630">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="bridge"/>
+		</supported-bridge-type-refs>
+
+		<label>L630 Series Color-Spot</label>
+		<description>Tapo Smart Multicolor Light-Spot</description>
+		<channel-groups>
+			<channel-group id="actuator" typeId="colorBulb"/>
+			<channel-group id="device" typeId="deviceStateS"/>
+		</channel-groups>
+		<representation-property>macAddress</representation-property>
+
+		<config-description-ref uri="thing-type:tapo:device"/>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L930.xml b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L930.xml
new file mode 100644
index 0000000000000..2fe67041b7a2a
--- /dev/null
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/L930.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="tapocontrol"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<!-- L930 THING-TYPE (Multicolor LED-Lightstrip) -->
+	<thing-type id="L930">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="bridge"/>
+		</supported-bridge-type-refs>
+
+		<label>L930 LightStrip</label>
+		<description>Tapo Smart Multicolor LED-Lightstrip with ZoneControl</description>
+		<channel-groups>
+			<channel-group id="actuator" typeId="lightStrip"/>
+			<channel-group id="device" typeId="deviceState"/>
+		</channel-groups>
+		<representation-property>macAddress</representation-property>
+
+		<config-description-ref uri="thing-type:tapo:device"/>
+	</thing-type>
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/channels.xml
index 04e6226ddadb7..009179a5f4810 100644
--- a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/channels.xml
@@ -7,7 +7,7 @@
 	<!-- ############################### CHANNEL-GROUPS ############################### -->
 
 	<!-- CHANNEL GROUP TYPES -->
-	<!--Device-Statuss Channel Type -->
+	<!--Device-Status Channel Type -->
 	<channel-group-type id="deviceState">
 		<label>Device State</label>
 		<description>Information about the device</description>
@@ -18,6 +18,16 @@
 		</channels>
 	</channel-group-type>
 
+	<!--Device-Status Channel Type (Small) -->
+	<channel-group-type id="deviceStateS">
+		<label>Device State</label>
+		<description>Information about the device</description>
+		<channels>
+			<channel id="wifiSignal" typeId="system.signal-strength"/>
+			<channel id="overheated" typeId="overheated"/>
+		</channels>
+	</channel-group-type>
+
 	<!--Actor Channel Type -->
 	<channel-group-type id="smartPlug">
 		<label>SmartPlug</label>
diff --git a/bundles/org.openhab.binding.tapocontrol/src/test/TapoDiscoveryService.java b/bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/TapoDiscoveryService.java
similarity index 99%
rename from bundles/org.openhab.binding.tapocontrol/src/test/TapoDiscoveryService.java
rename to bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/TapoDiscoveryService.java
index 3c02a7c0d5da7..c2e9994711bbb 100644
--- a/bundles/org.openhab.binding.tapocontrol/src/test/TapoDiscoveryService.java
+++ b/bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/TapoDiscoveryService.java
@@ -64,7 +64,7 @@ public TapoDiscoveryService() {
     }
 
     /**
-     * deactivate
+     * activate
      */
     @Override
     public void activate() {
diff --git a/bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/discovery/TapoMDNS.java b/bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/discovery/TapoMDNS.java
new file mode 100644
index 0000000000000..83fabceb0fad5
--- /dev/null
+++ b/bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/discovery/TapoMDNS.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.tapocontrol.internal.api;
+
+import static org.openhab.binding.tapocontrol.internal.constants.TapoThingConstants.*;
+
+import java.util.Dictionary;
+import java.util.Set;
+
+import javax.jmdns.ServiceInfo;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.config.discovery.mdns.MDNSDiscoveryParticipant;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+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.Modified;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Handler class for TAPO Smart Home thing discovery over mDNS
+ *
+ * @author Christian Wild - Initial contribution
+ */
+@Component(configurationPid = "discovery.tapocontrol")
+@NonNullByDefault
+public class TapoMDNS implements MDNSDiscoveryParticipant {
+    private final Logger logger = LoggerFactory.getLogger(TapoMDNS.class);
+    private boolean isAutoDiscoveryEnabled = true;
+
+    @Activate
+    protected void activate(ComponentContext componentContext) {
+        activateOrModifyService(componentContext);
+    }
+
+    @Modified
+    protected void modified(ComponentContext componentContext) {
+        activateOrModifyService(componentContext);
+    }
+
+    private void activateOrModifyService(ComponentContext componentContext) {
+        Dictionary<String, @Nullable Object> properties = componentContext.getProperties();
+        String autoDiscoveryPropertyValue = (String) properties
+                .get(DiscoveryService.CONFIG_PROPERTY_BACKGROUND_DISCOVERY);
+        if (autoDiscoveryPropertyValue != null && !autoDiscoveryPropertyValue.isBlank()) {
+            isAutoDiscoveryEnabled = Boolean.valueOf(autoDiscoveryPropertyValue);
+        }
+    }
+
+    @Override
+    public Set<ThingTypeUID> getSupportedThingTypeUIDs() {
+        return SUPPORTED_THING_TYPES_UIDS;
+    }
+
+    @Override
+    public String getServiceType() {
+        return "NULL";
+    }
+
+    @Override
+    public @Nullable ThingUID getThingUID(ServiceInfo service) {
+        ThingTypeUID thingTypeUID = getThingType(service);
+        if (thingTypeUID != null) {
+            String id = service.getPropertyString(PROPERTY_FAMILY); // device id
+            return new ThingUID(thingTypeUID, id);
+        }
+        return null;
+    }
+
+    private @Nullable ThingTypeUID getThingType(final ServiceInfo service) {
+        String model = service.getPropertyString(PROPERTY_FAMILY); // model
+        logger.debug("found Type: {}", model);
+        if (model == null) {
+            return null;
+        }
+        return L510_THING_TYPE;
+    }
+
+    @Override
+    public @Nullable DiscoveryResult createResult(ServiceInfo service) {
+        if (isAutoDiscoveryEnabled) {
+            ThingUID uid = getThingUID(service);
+            if (uid != null) {
+                String host = service.getHostAddresses()[0];
+                int port = service.getPort();
+                logger.debug("device Found: {} {}", host, port);
+            }
+        }
+        return null;
+    }
+}
diff --git a/bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/api/TapoUDP.java b/bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/discovery/TapoUDP.java
similarity index 100%
rename from bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/api/TapoUDP.java
rename to bundles/org.openhab.binding.tapocontrol/src/test/java/org/openhab/binding/tapocontrol/internal/discovery/TapoUDP.java

From 5e73936aa890cee05d3c40fc33296a0232aa9f23 Mon Sep 17 00:00:00 2001
From: openhab-bot <bot@openhab.org>
Date: Sat, 10 Dec 2022 16:54:00 +0100
Subject: [PATCH 25/48] New Crowdin updates (#13901)

* New translations boschshc.properties (Italian)

* New translations ecowatt.properties (French)
---
 .../src/main/resources/OH-INF/i18n/ecowatt_fr.properties      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_fr.properties b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_fr.properties
index b15683476059c..d0a454c95bb2f 100644
--- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_fr.properties
+++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_fr.properties
@@ -9,6 +9,10 @@ thing-type.ecowatt.signals.label = Prévision Électricité
 thing-type.ecowatt.signals.description = Les prévisions de consommation d'électricité en France
 thing-type.ecowatt.signals.channel.currentHourSignal.label = Signal Pour Heure Actuelle
 thing-type.ecowatt.signals.channel.currentHourSignal.description = Le signal correspondant au niveau de consommation prévu pour l'heure actuelle. Les valeurs possibles sont 1 pour une consommation normale (vert), 2 pour un système électrique tendu (orange) et 3 pour un système électrique très tendu (rouge).
+thing-type.ecowatt.signals.channel.inThreeDaysSignal.label = Signal Dans Trois Jours
+thing-type.ecowatt.signals.channel.inThreeDaysSignal.description = Le signal correspondant au niveau de consommation prévu pour dans trois jours. Les valeurs possibles sont 1 pour une consommation normale (vert), 2 pour un système électrique tendu (orange) et 3 pour un système électrique très tendu (rouge).
+thing-type.ecowatt.signals.channel.inTwoDaysSignal.label = Signal Dans Deux Jours
+thing-type.ecowatt.signals.channel.inTwoDaysSignal.description = Le signal correspondant au niveau de consommation prévu pour après-demain. Les valeurs possibles sont 1 pour une consommation normale (vert), 2 pour un système électrique tendu (orange) et 3 pour un système électrique très tendu (rouge).
 thing-type.ecowatt.signals.channel.todaySignal.label = Signal Pour Aujourd'hui
 thing-type.ecowatt.signals.channel.todaySignal.description = Le signal correspondant au niveau de consommation prévu pour aujourd'hui. Les valeurs possibles sont 1 pour une consommation normale (vert), 2 pour un système électrique tendu (orange) et 3 pour un système électrique très tendu (rouge).
 thing-type.ecowatt.signals.channel.tomorrowSignal.label = Signal Pour Demain

From c09be1bfbedf09b59b96264d8e4ca279cec0a35d Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 10 Dec 2022 23:05:59 +0100
Subject: [PATCH 26/48] Migrate time channels from DateTime to Number:Time
 (#13841)

Fixes #13840

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 bundles/org.openhab.binding.miele/README.md   | 24 +++++++-------
 .../handler/DishwasherChannelSelector.java    | 30 ++++++------------
 .../handler/MieleApplianceHandler.java        |  7 ++---
 .../internal/handler/OvenChannelSelector.java | 30 ++++++------------
 .../handler/TumbleDryerChannelSelector.java   | 31 +++++++------------
 .../WashingMachineChannelSelector.java        | 30 ++++++------------
 .../resources/OH-INF/thing/channeltypes.xml   | 12 +++----
 7 files changed, 62 insertions(+), 102 deletions(-)

diff --git a/bundles/org.openhab.binding.miele/README.md b/bundles/org.openhab.binding.miele/README.md
index d87b25ccabdbb..767fbaa7d5a05 100644
--- a/bundles/org.openhab.binding.miele/README.md
+++ b/bundles/org.openhab.binding.miele/README.md
@@ -126,9 +126,9 @@ Channels available for each appliance type are listed below.
 | rawPhase            | Number               | Read       | Current phase of the program running on the appliance as raw number |
 | start               | DateTime             | Read       | Programmed start time of the program                                |
 | end                 | DateTime             | Read       | End time of the program (programmed or running)                     |
-| duration            | DateTime             | Read       | Duration of the program running on the appliance                    |
-| elapsed             | DateTime             | Read       | Time elapsed in the program running on the appliance                |
-| finish              | DateTime             | Read       | Time to finish the program running on the appliance                 |
+| duration            | Number:Time          | Read       | Duration of the program running on the appliance                    |
+| elapsed             | Number:Time          | Read       | Time elapsed in the program running on the appliance                |
+| finish              | Number:Time          | Read       | Time to finish the program running on the appliance                 |
 | door                | Contact              | Read       | Current state of the door of the appliance                          |
 | switch              | Switch               | Write      | Switch the appliance on or off                                      |
 | powerConsumption    | Number:Power         | Read       | Power consumption by the currently running program on the appliance |
@@ -239,9 +239,9 @@ Channels available for each appliance type are listed below.
 | rawPhase            | Number               | Read       | Current phase of the program running on the appliance as raw number |
 | start               | DateTime             | Read       | Programmed start time of the program                                |
 | end                 | DateTime             | Read       | End time of the program (programmed or running)                     |
-| duration            | DateTime             | Read       | Duration of the program running on the appliance                    |
-| elapsed             | DateTime             | Read       | Time elapsed in the program running on the appliance                |
-| finish              | DateTime             | Read       | Time to finish the program running on the appliance                 |
+| duration            | Number:Time          | Read       | Duration of the program running on the appliance                    |
+| elapsed             | Number:Time          | Read       | Time elapsed in the program running on the appliance                |
+| finish              | Number:Time          | Read       | Time to finish the program running on the appliance                 |
 | target              | Number:Temperature   | Read       | Target temperature to be reached by the oven                        |
 | measured            | Number:Temperature   | Read       | Actual measured temperature in the oven                             |
 | temp1               | Number:Temperature   | Read       | Program temperature in the oven 1                                   |
@@ -282,9 +282,9 @@ See oven.
 | rawPhase            | Number               | Read       | Current phase of the program running on the appliance as raw number |
 | start               | DateTime             | Read       | Programmed start time of the program                                |
 | end                 | DateTime             | Read       | End time of the program (programmed or running)                     |
-| duration            | DateTime             | Read       | Duration of the program running on the appliance                    |
-| elapsed             | DateTime             | Read       | Time elapsed in the program running on the appliance                |
-| finish              | DateTime             | Read       | Time to finish the program running on the appliance                 |
+| duration            | Number:Time          | Read       | Duration of the program running on the appliance                    |
+| elapsed             | Number:Time          | Read       | Time elapsed in the program running on the appliance                |
+| finish              | Number:Time          | Read       | Time to finish the program running on the appliance                 |
 | door                | Contact              | Read       | Current state of the door of the appliance                          |
 | switch              | Switch               | Write      | Switch the appliance on or off                                      |
 | step                | Number               | Read       | Current step in the program running on the appliance                |
@@ -347,9 +347,9 @@ See oven.
 | rawPhase            | Number               | Read       | Current phase of the program running on the appliance as raw number |
 | start               | DateTime             | Read       | Programmed start time of the program                                |
 | end                 | DateTime             | Read       | End time of the program (programmed or running)                     |
-| duration            | DateTime             | Read       | Duration of the program running on the appliance                    |
-| elapsed             | DateTime             | Read       | Time elapsed in the program running on the appliance                |
-| finish              | DateTime             | Read       | Time to finish the program running on the appliance                 |
+| duration            | Number:Time          | Read       | Duration of the program running on the appliance                    |
+| elapsed             | Number:Time          | Read       | Time elapsed in the program running on the appliance                |
+| finish              | Number:Time          | Read       | Time to finish the program running on the appliance                 |
 | door                | Contact              | Read       | Current state of the door of the appliance                          |
 | switch              | Switch               | Write      | Switch the appliance on or off                                      |
 | target              | Number:Temperature   | Read       | Temperature of the selected program (10 °C = cold)                  |
diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java
index 78e132ecbb8eb..20c19a5782604 100644
--- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java
+++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java
@@ -16,10 +16,7 @@
 import static org.openhab.binding.miele.internal.MieleBindingConstants.*;
 
 import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Map;
-import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -32,6 +29,7 @@
 import org.openhab.core.library.types.OpenClosedType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.types.State;
 import org.openhab.core.types.Type;
 import org.openhab.core.types.UnDefType;
@@ -75,35 +73,27 @@ public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationPr
     PROGRAM_PHASE(RAW_PHASE_PROPERTY_NAME, PHASE_CHANNEL_ID, DecimalType.class, false, false),
     START_TIME("", START_CHANNEL_ID, DateTimeType.class, false, false),
     END_TIME("", END_CHANNEL_ID, DateTimeType.class, false, false),
-    DURATION("duration", "duration", DateTimeType.class, false, false) {
+    DURATION("duration", "duration", QuantityType.class, false, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
-            Date date = new Date();
-            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT+0"));
             try {
-                date.setTime(Long.valueOf(s) * 60000);
-            } catch (Exception e) {
-                date.setTime(0);
+                return new QuantityType<>(Long.valueOf(s), Units.MINUTE);
+            } catch (NumberFormatException e) {
+                return UnDefType.UNDEF;
             }
-            return getState(dateFormatter.format(date));
         }
     },
-    ELAPSED_TIME("elapsedTime", "elapsed", DateTimeType.class, false, false) {
+    ELAPSED_TIME("elapsedTime", "elapsed", QuantityType.class, false, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
-            Date date = new Date();
-            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT+0"));
             try {
-                date.setTime(Long.valueOf(s) * 60000);
-            } catch (Exception e) {
-                date.setTime(0);
+                return new QuantityType<>(Long.valueOf(s), Units.MINUTE);
+            } catch (NumberFormatException e) {
+                return UnDefType.UNDEF;
             }
-            return getState(dateFormatter.format(date));
         }
     },
-    FINISH_TIME("", FINISH_CHANNEL_ID, DateTimeType.class, false, false),
+    FINISH_TIME("", FINISH_CHANNEL_ID, QuantityType.class, false, false),
     DOOR("signalDoor", "door", OpenClosedType.class, false, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleApplianceHandler.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleApplianceHandler.java
index daaba7146744e..9979231b746d3 100644
--- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleApplianceHandler.java
+++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleApplianceHandler.java
@@ -15,7 +15,6 @@
 import static org.openhab.binding.miele.internal.MieleBindingConstants.*;
 
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
@@ -38,6 +37,8 @@
 import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.Thing;
@@ -335,9 +336,7 @@ private void updateDurationState(ChannelUID channelUid, String value) {
         try {
             long minutesFromNow = Long.valueOf(value);
             if (minutesFromNow > 0) {
-                ZonedDateTime remaining = ZonedDateTime.ofInstant(Instant.ofEpochSecond(minutesFromNow * 60),
-                        ZoneId.of("UTC"));
-                updateState(channelUid, new DateTimeType(remaining.withZoneSameLocal(timeZoneProvider.getTimeZone())));
+                updateState(channelUid, new QuantityType<>(minutesFromNow, Units.MINUTE));
                 return;
             }
         } catch (NumberFormatException e) {
diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java
index 998df2e9a8f30..ca4506e630671 100644
--- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java
+++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java
@@ -16,10 +16,7 @@
 import static org.openhab.binding.miele.internal.MieleBindingConstants.*;
 
 import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Map;
-import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -32,6 +29,7 @@
 import org.openhab.core.library.types.OpenClosedType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.types.State;
 import org.openhab.core.types.Type;
 import org.openhab.core.types.UnDefType;
@@ -70,35 +68,27 @@ public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationPr
     PROGRAM_PHASE(RAW_PHASE_PROPERTY_NAME, PHASE_CHANNEL_ID, DecimalType.class, false),
     START_TIME("", START_CHANNEL_ID, DateTimeType.class, false),
     END_TIME("", END_CHANNEL_ID, DateTimeType.class, false),
-    DURATION("duration", "duration", DateTimeType.class, false) {
+    DURATION("duration", "duration", QuantityType.class, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
-            Date date = new Date();
-            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT+0"));
             try {
-                date.setTime(Long.valueOf(s) * 60000);
-            } catch (Exception e) {
-                date.setTime(0);
+                return new QuantityType<>(Long.valueOf(s), Units.MINUTE);
+            } catch (NumberFormatException e) {
+                return UnDefType.UNDEF;
             }
-            return getState(dateFormatter.format(date));
         }
     },
-    ELAPSED_TIME("elapsedTime", "elapsed", DateTimeType.class, false) {
+    ELAPSED_TIME("elapsedTime", "elapsed", QuantityType.class, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
-            Date date = new Date();
-            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT+0"));
             try {
-                date.setTime(Long.valueOf(s) * 60000);
-            } catch (Exception e) {
-                date.setTime(0);
+                return new QuantityType<>(Long.valueOf(s), Units.MINUTE);
+            } catch (NumberFormatException e) {
+                return UnDefType.UNDEF;
             }
-            return getState(dateFormatter.format(date));
         }
     },
-    FINISH_TIME("", FINISH_CHANNEL_ID, DateTimeType.class, false),
+    FINISH_TIME("", FINISH_CHANNEL_ID, QuantityType.class, false),
     TARGET_TEMP("targetTemperature", "target", QuantityType.class, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java
index e762fd181eb18..7e924c4df5ada 100644
--- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java
+++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java
@@ -16,10 +16,7 @@
 import static org.openhab.binding.miele.internal.MieleBindingConstants.*;
 
 import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Map;
-import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -30,7 +27,9 @@
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.types.State;
 import org.openhab.core.types.Type;
 import org.openhab.core.types.UnDefType;
@@ -75,35 +74,27 @@ public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationPr
     PROGRAM_PHASE(RAW_PHASE_PROPERTY_NAME, PHASE_CHANNEL_ID, DecimalType.class, false),
     START_TIME("", START_CHANNEL_ID, DateTimeType.class, false),
     END_TIME("", END_CHANNEL_ID, DateTimeType.class, false),
-    DURATION("duration", "duration", DateTimeType.class, false) {
+    DURATION("duration", "duration", QuantityType.class, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
-            Date date = new Date();
-            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT+0"));
             try {
-                date.setTime(Long.valueOf(s) * 60000);
-            } catch (Exception e) {
-                date.setTime(0);
+                return new QuantityType<>(Long.valueOf(s), Units.MINUTE);
+            } catch (NumberFormatException e) {
+                return UnDefType.UNDEF;
             }
-            return getState(dateFormatter.format(date));
         }
     },
-    ELAPSED_TIME("elapsedTime", "elapsed", DateTimeType.class, false) {
+    ELAPSED_TIME("elapsedTime", "elapsed", QuantityType.class, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
-            Date date = new Date();
-            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT+0"));
             try {
-                date.setTime(Long.valueOf(s) * 60000);
-            } catch (Exception e) {
-                date.setTime(0);
+                return new QuantityType<>(Long.valueOf(s), Units.MINUTE);
+            } catch (NumberFormatException e) {
+                return UnDefType.UNDEF;
             }
-            return getState(dateFormatter.format(date));
         }
     },
-    FINISH_TIME("", FINISH_CHANNEL_ID, DateTimeType.class, false),
+    FINISH_TIME("", FINISH_CHANNEL_ID, QuantityType.class, false),
     DRYING_STEP("dryingStep", "step", DecimalType.class, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java
index 44eecd47a8dcc..38c679eb96df5 100644
--- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java
+++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java
@@ -16,10 +16,7 @@
 import static org.openhab.binding.miele.internal.MieleBindingConstants.*;
 
 import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Map;
-import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -32,6 +29,7 @@
 import org.openhab.core.library.types.OpenClosedType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.types.State;
 import org.openhab.core.types.Type;
 import org.openhab.core.types.UnDefType;
@@ -76,35 +74,27 @@ public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationPr
     PROGRAM_PHASE(RAW_PHASE_PROPERTY_NAME, PHASE_CHANNEL_ID, DecimalType.class, false, false),
     START_TIME("", START_CHANNEL_ID, DateTimeType.class, false, false),
     END_TIME("", END_CHANNEL_ID, DateTimeType.class, false, false),
-    DURATION("duration", "duration", DateTimeType.class, false, false) {
+    DURATION("duration", "duration", QuantityType.class, false, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
-            Date date = new Date();
-            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT+0"));
             try {
-                date.setTime(Long.valueOf(s.trim()) * 60000);
-            } catch (Exception e) {
-                date.setTime(0);
+                return new QuantityType<>(Long.valueOf(s), Units.MINUTE);
+            } catch (NumberFormatException e) {
+                return UnDefType.UNDEF;
             }
-            return getState(dateFormatter.format(date));
         }
     },
-    ELAPSED_TIME("elapsedTime", "elapsed", DateTimeType.class, false, false) {
+    ELAPSED_TIME("elapsedTime", "elapsed", QuantityType.class, false, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
-            Date date = new Date();
-            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-            dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT+0"));
             try {
-                date.setTime(Long.valueOf(s) * 60000);
-            } catch (Exception e) {
-                date.setTime(0);
+                return new QuantityType<>(Long.valueOf(s), Units.MINUTE);
+            } catch (NumberFormatException e) {
+                return UnDefType.UNDEF;
             }
-            return getState(dateFormatter.format(date));
         }
     },
-    FINISH_TIME("", FINISH_CHANNEL_ID, DateTimeType.class, false, false),
+    FINISH_TIME("", FINISH_CHANNEL_ID, QuantityType.class, false, false),
     TARGET_TEMP("targetTemperature", "target", QuantityType.class, false, false) {
         @Override
         public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) {
diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml
index 5f7c683ae58cd..4d13057abdff2 100644
--- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml
+++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml
@@ -70,27 +70,27 @@
 	</channel-type>
 
 	<channel-type id="duration">
-		<item-type>DateTime</item-type>
+		<item-type>Number:Time</item-type>
 		<label>Duration</label>
 		<description>Duration of the program running on the appliance</description>
 		<category>Time</category>
-		<state readOnly="true" pattern="%1$tH:%1$tM"></state>
+		<state readOnly="true" pattern="%1$tR"></state>
 	</channel-type>
 
 	<channel-type id="elapsed">
-		<item-type>DateTime</item-type>
+		<item-type>Number:Time</item-type>
 		<label>Elapsed Time</label>
 		<description>Time elapsed in the program running on the appliance</description>
 		<category>Time</category>
-		<state readOnly="true" pattern="%1$tH:%1$tM"></state>
+		<state readOnly="true" pattern="%1$tR"></state>
 	</channel-type>
 
 	<channel-type id="finish">
-		<item-type>DateTime</item-type>
+		<item-type>Number:Time</item-type>
 		<label>Finish Time</label>
 		<description>Time to finish the program running on the appliance</description>
 		<category>Time</category>
-		<state readOnly="true" pattern="%1$tH:%1$tM"></state>
+		<state readOnly="true" pattern="%1$tR"></state>
 	</channel-type>
 
 	<channel-type id="door">

From d0681251cb7518990cb2aee156b179c14bf6f7ec Mon Sep 17 00:00:00 2001
From: Mark Herwege <mherwege@users.noreply.github.com>
Date: Sat, 10 Dec 2022 23:32:25 +0100
Subject: [PATCH 27/48] [systeminfo] QuantityTypes and state descriptions
 cleanup (#13804)

* State descriptions cleanup
* Converted channels to QuantityType, adjusted default translations
* Channel definitions and percent to QuanityType
* Changed default state descriptions from MB to MiB

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
---
 .../org.openhab.binding.systeminfo/README.md  | 134 +++++++++---------
 .../internal/handler/SysteminfoHandler.java   |  24 +++-
 .../internal/model/OSHISysteminfo.java        | 101 +++++++------
 .../internal/model/SysteminfoInterface.java   |  89 ++++++------
 .../OH-INF/i18n/systeminfo.properties         |  26 ++--
 .../main/resources/OH-INF/thing/channels.xml  |  90 ++++++------
 .../systeminfo/test/SysteminfoOSGiTest.java   |  84 ++++++-----
 7 files changed, 291 insertions(+), 257 deletions(-)

diff --git a/bundles/org.openhab.binding.systeminfo/README.md b/bundles/org.openhab.binding.systeminfo/README.md
index bc3abf59fe129..1d01a923ab322 100644
--- a/bundles/org.openhab.binding.systeminfo/README.md
+++ b/bundles/org.openhab.binding.systeminfo/README.md
@@ -118,22 +118,22 @@ The binding introduces the following channels:
 | load15             | Load for the last 15 minutes                                     | Number              | Medium           | True     |
 | threads            | Number of threads currently running or for the process           | Number              | Medium           | True     |
 | path               | The full path of the process                                     | String              | Low              | False    |
-| uptime             | System uptime (time after start) in minutes                      | Number              | Medium           | True     |
+| uptime             | System uptime (time after start) in minutes                      | Number:Time         | Medium           | True     |
 | name               | Name of the device or process                                    | String              | Low              | False    |
-| available          | Available size in MB                                             | Number              | High             | False    |
-| used               | Used size in MB                                                  | Number              | High             | False    |
-| total              | Total size in MB                                                 | Number              | Low              | False    |
-| availablePercent   | Available size in %                                              | Number              | High             | False    |
-| usedPercent        | Used size in %                                                   | Number              | High             | False    |
+| available          | Available size                                                   | Number:DataAmount   | High             | False    |
+| used               | Used size                                                        | Number:DataAmount   | High             | False    |
+| total              | Total size                                                       | Number:DataAmount   | Low              | False    |
+| availablePercent   | Available size in %                                              | Number:Dimensionless| High             | False    |
+| usedPercent        | Used size in %                                                   | Number:Dimensionless| High             | False    |
 | model              | The model of the device                                          | String              | Low              | True     |
 | serial             | The serial number of the device                                  | String              | Low              | True     |
 | description        | Description of the device                                        | String              | Low              | True     |
 | type               | Storage type                                                     | String              | Low              | True     |
-| cpuTemp            | CPU Temperature in degrees Celsius                               | Number              | High             | True     |
-| cpuVoltage         | CPU Voltage in V                                                 | Number              | Medium           | True     |
+| cpuTemp            | CPU Temperature in degrees Celsius                               | Number:Temperature  | High             | True     |
+| cpuVoltage         | CPU Voltage                                                      | Number:ElectricPotential| Medium       | True     |
 | fanSpeed           | Fan speed in rpm                                                 | Number              | Medium           | True     |
-| remainingTime      | Remaining time in minutes                                        | Number              | Medium           | False    |
-| remainingCapacity  | Remaining capacity in %                                          | Number              | Medium           | False    |
+| remainingTime      | Remaining time in minutes                                        | Number:Time         | Medium           | False    |
+| remainingCapacity  | Remaining capacity in %                                          | Number:Dimensionless| Medium           | False    |
 | information        | Product, manufacturer, SN, width and height of the display in cm | String              | Low              | True     |
 | ip                 | Host IP address of the network                                   | String              | Low              | False    |
 | mac                | MAC address                                                      | String              | Low              | True     |
@@ -141,9 +141,9 @@ The binding introduces the following channels:
 | networkDisplayName | The display name of the network                                  | String              | Low              | False    |
 | packetsSent        | Number of packets sent                                           | Number              | Medium           | True     |
 | packetsReceived    | Number of packets received                                       | Number              | Medium           | True     |
-| dataSent           | Data sent in MB                                                  | Number              | Medium           | True     |
-| dataReceived       | Data received in MB                                              | Number              | Medium           | True     |
-| availableHeap      | How many bytes are free out of the currently committed heap      | Number:DataAmount   | Medium           | True     |
+| dataSent           | Volume of data sent                                              | Number:DataAmount   | Medium           | True     |
+| dataReceived       | Volume of data received                                          | Number:DataAmount   | Medium           | True     |
+| availableHeap      | How much space is available in the currently committed heap      | Number:DataAmount   | Medium           | True     |
 | usedHeapPercent    | How much of the MAX heap size is actually used in %              | Number:Dimensionless| Medium           | False    |
 
 ## Channel configuration
@@ -195,80 +195,80 @@ Items:
 
 ```
 /* Network information*/
-String Network_AdapterName        "Adapter name"        <network>        { channel="systeminfo:computer:work:network#networkDisplayName" }
-String Network_Name               "Name"                <network>        { channel="systeminfo:computer:work:network#networkName" }
-String Network_IP                 "IP address"          <network>        { channel="systeminfo:computer:work:network#ip" }
-String Network_Mac                "Mac address"         <network>        { channel="systeminfo:computer:work:network#mac" }
-Number Network_DataSent           "Data sent"           <flowpipe>       { channel="systeminfo:computer:work:network#dataSent" }
-Number Network_DataReceived       "Data received"       <returnpipe>     { channel="systeminfo:computer:work:network#dataReceived" }
-Number Network_PacketsSent        "Packets sent"        <flowpipe>       { channel="systeminfo:computer:work:network#packetsSent" }
-Number Network_PacketsReceived    "Packets received"    <returnpipe>     { channel="systeminfo:computer:work:network#packetsReceived" }
+String Network_AdapterName         "Adapter name"        <network>       { channel="systeminfo:computer:work:network#networkDisplayName" }
+String Network_Name                "Name"                <network>       { channel="systeminfo:computer:work:network#networkName" }
+String Network_IP                  "IP address"          <network>       { channel="systeminfo:computer:work:network#ip" }
+String Network_Mac                 "Mac address"         <network>       { channel="systeminfo:computer:work:network#mac" }
+Number Network_DataSent            "Data sent"           <flowpipe>      { channel="systeminfo:computer:work:network#dataSent" }
+Number Network_DataReceived        "Data received"       <returnpipe>    { channel="systeminfo:computer:work:network#dataReceived" }
+Number Network_PacketsSent         "Packets sent"        <flowpipe>      { channel="systeminfo:computer:work:network#packetsSent" }
+Number Network_PacketsReceived     "Packets received"    <returnpipe>    { channel="systeminfo:computer:work:network#packetsReceived" }
 
 /* CPU information*/
-String CPU_Name                   "Name"                <none>           { channel="systeminfo:computer:work:cpu#name" }
-String CPU_Description            "Description"         <none>           { channel="systeminfo:computer:work:cpu#description" }
-Number CPU_Load                   "CPU Load"            <none>           { channel="systeminfo:computer:work:cpu#load" }
-Number CPU_Load1                  "Load (1 min)"        <none>           { channel="systeminfo:computer:work:cpu#load1" }
-Number CPU_Load5                  "Load (5 min)"        <none>           { channel="systeminfo:computer:work:cpu#load5" }
-Number CPU_Load15                 "Load (15 min)"       <none>           { channel="systeminfo:computer:work:cpu#load15" }
-Number CPU_Threads                "Threads"             <none>           { channel="systeminfo:computer:work:cpu#threads" }
-Number CPU_Uptime                 "Uptime"              <time>           { channel="systeminfo:computer:work:cpu#uptime" }
+String CPU_Name                    "Name"                <none>          { channel="systeminfo:computer:work:cpu#name" }
+String CPU_Description             "Description"         <none>          { channel="systeminfo:computer:work:cpu#description" }
+Number:Dimensionless CPU_Load      "CPU Load"            <none>          { channel="systeminfo:computer:work:cpu#load" }
+Number CPU_Load1                   "Load (1 min)"        <none>          { channel="systeminfo:computer:work:cpu#load1" }
+Number CPU_Load5                   "Load (5 min)"        <none>          { channel="systeminfo:computer:work:cpu#load5" }
+Number CPU_Load15                  "Load (15 min)"       <none>          { channel="systeminfo:computer:work:cpu#load15" }
+Number CPU_Threads                 "Threads"             <none>          { channel="systeminfo:computer:work:cpu#threads" }
+Number:Time CPU_Uptime             "Uptime"              <time>          { channel="systeminfo:computer:work:cpu#uptime" }
 
 /* Drive information*/
-String Drive_Name                 "Name"                <none>           { channel="systeminfo:computer:work:drive#name" }
-String Drive_Model                "Model"               <none>           { channel="systeminfo:computer:work:drive#model" }
-String Drive_Serial               "Serial"              <none>           { channel="systeminfo:computer:work:drive#serial" }
+String Drive_Name                  "Name"                <none>          { channel="systeminfo:computer:work:drive#name" }
+String Drive_Model                 "Model"               <none>          { channel="systeminfo:computer:work:drive#model" }
+String Drive_Serial                "Serial"              <none>          { channel="systeminfo:computer:work:drive#serial" }
 
 /* Storage information*/
-String Storage_Name               "Name"                <none>           { channel="systeminfo:computer:work:storage#name" }
-String Storage_Type               "Type"                <none>           { channel="systeminfo:computer:work:storage#type" }
-String Storage_Description        "Description"         <none>           { channel="systeminfo:computer:work:storage#description" }
-Number Storage_Available          "Available"           <none>           { channel="systeminfo:computer:work:storage#available" }
-Number Storage_Used               "Used"                <none>           { channel="systeminfo:computer:work:storage#used" }
-Number Storage_Total              "Total"               <none>           { channel="systeminfo:computer:work:storage#total" }
-Number Storage_Available_Percent  "Available (%)"       <none>           { channel="systeminfo:computer:work:storage#availablePercent" }
-Number Storage_Used_Percent       "Used (%)"            <none>           { channel="systeminfo:computer:work:storage#usedPercent" }
+String Storage_Name                "Name"                <none>          { channel="systeminfo:computer:work:storage#name" }
+String Storage_Type                "Type"                <none>          { channel="systeminfo:computer:work:storage#type" }
+String Storage_Description         "Description"         <none>          { channel="systeminfo:computer:work:storage#description" }
+Number:DataAmount Storage_Available "Available"          <none>          { channel="systeminfo:computer:work:storage#available" }
+Number:DataAmount Storage_Used     "Used"                <none>          { channel="systeminfo:computer:work:storage#used" }
+Number:DataAmount Storage_Total    "Total"               <none>          { channel="systeminfo:computer:work:storage#total" }
+Number:Dimensionless Storage_Available_Percent "Available (%)" <none>    { channel="systeminfo:computer:work:storage#availablePercent" }
+Number:Dimensionless Storage_Used_Percent "Used (%)"     <none>          { channel="systeminfo:computer:work:storage#usedPercent" }
 
 /* Memory information*/
-Number Memory_Available           "Available"           <none>           { channel="systeminfo:computer:work:memory#available" }
-Number Memory_Used                "Used"                <none>           { channel="systeminfo:computer:work:memory#used" }
-Number Memory_Total               "Total"               <none>           { channel="systeminfo:computer:work:memory#total" }
-Number Memory_Available_Percent   "Available (%)"       <none>           { channel="systeminfo:computer:work:memory#availablePercent" }
-Number Memory_Used_Percent        "Used (%)"            <none>           { channel="systeminfo:computer:work:memory#usedPercent" }
+Number Memory_Available            "Available"           <none>          { channel="systeminfo:computer:work:memory#available" }
+Number:DataAmount Memory_Used      "Used"                <none>          { channel="systeminfo:computer:work:memory#used" }
+Number:DataAmount Memory_Total     "Total"               <none>          { channel="systeminfo:computer:work:memory#total" }
+Number:Dimensionless Memory_Available_Percent "Available (%)" <none>     { channel="systeminfo:computer:work:memory#availablePercent" }
+Number:Dimensionless Memory_Used_Percent "Used (%)"      <none>          { channel="systeminfo:computer:work:memory#usedPercent" }
 
 /* Swap memory information*/
-Number Swap_Available             "Available"           <none>           { channel="systeminfo:computer:work:swap#available" }
-Number Swap_Used                  "Used"                <none>           { channel="systeminfo:computer:work:swap#used" }
-Number Swap_Total                 "Total"               <none>           { channel="systeminfo:computer:work:swap#total" }
-Number Swap_Available_Percent     "Available (%)"       <none>           { channel="systeminfo:computer:work:swap#availablePercent" }
-Number Swap_Used_Percent          "Used (%)"            <none>           { channel="systeminfo:computer:work:swap#usedPercent" }
+Number:DataAmount Swap_Available   "Available"           <none>          { channel="systeminfo:computer:work:swap#available" }
+Number:DataAmount Swap_Used        "Used"                <none>          { channel="systeminfo:computer:work:swap#used" }
+Number:DataAmount Swap_Total       "Total"               <none>          { channel="systeminfo:computer:work:swap#total" }
+Number:Dimensionless Swap_Available_Percent "Available (%)" <none>       { channel="systeminfo:computer:work:swap#availablePercent" }
+Number:Dimensionless Swap_Used_Percent "Used (%)"        <none>          { channel="systeminfo:computer:work:swap#usedPercent" }
 
 /* Battery information*/
-String Battery_Name               "Name"                <batterylevel>   { channel="systeminfo:computer:work:battery#name" }
-Number Battery_RemainingCapacity  "Remaining Capacity"  <batterylevel>   { channel="systeminfo:computer:work:battery#remainingCapacity" }
-Number Battery_RemainingTime      "Remaining Time"      <batterylevel>   { channel="systeminfo:computer:work:battery#remainingTime" }
+String Battery_Name                "Name"                <batterylevel>  { channel="systeminfo:computer:work:battery#name" }
+Number:Dimensionless Battery_RemainingCapacity "Remaining Capacity" <batterylevel> { channel="systeminfo:computer:work:battery#remainingCapacity" }
+Number:Time Battery_RemainingTime  "Remaining Time"      <batterylevel>  { channel="systeminfo:computer:work:battery#remainingTime" }
 
 /* Display information*/
-String Display_Description        "Display description" <screen>         { channel="systeminfo:computer:work:display#information" }
+String Display_Description         "Display description" <screen>        { channel="systeminfo:computer:work:display#information" }
 
 /* Sensors information*/
-Number Sensor_CPUTemp             "CPU Temperature"     <temperature>    { channel="systeminfo:computer:work:sensors#cpuTemp" }
-Number Sensor_CPUVoltage          "CPU Voltage"         <energy>         { channel="systeminfo:computer:work:sensors#cpuVoltage" }
-Number Sensor_FanSpeed            "Fan speed"           <fan>            { channel="systeminfo:computer:work:sensors#fanSpeed" }
+Number:Temperature Sensor_CPUTemp  "CPU Temperature"     <temperature>   { channel="systeminfo:computer:work:sensors#cpuTemp" }
+Number:ElectricPotential Sensor_CPUVoltage "CPU Voltage" <energy>        { channel="systeminfo:computer:work:sensors#cpuVoltage" }
+Number Sensor_FanSpeed             "Fan speed"           <fan>           { channel="systeminfo:computer:work:sensors#fanSpeed" }
 
 /* Current process information*/
-Number Current_process_load       "Load"                <none>           { channel="systeminfo:computer:work:currentProcess#load" }
-Number Current_process_used       "Used"                <none>           { channel="systeminfo:computer:work:currentProcess#used" }
-String Current_process_name       "Name"                <none>           { channel="systeminfo:computer:work:currentProcess#name" }
-Number Current_process_threads    "Threads"             <none>           { channel="systeminfo:computer:work:currentProcess#threads" }
-String Current_process_path       "Path"                <none>           { channel="systeminfo:computer:work:currentProcess#path" }
+Number:Dimensionless Current_process_load "Load"         <none>          { channel="systeminfo:computer:work:currentProcess#load" }
+Number:Dimensionless Current_process_used "Used"         <none>          { channel="systeminfo:computer:work:currentProcess#used" }
+String Current_process_name        "Name"                <none>          { channel="systeminfo:computer:work:currentProcess#name" }
+Number Current_process_threads     "Threads"             <none>          { channel="systeminfo:computer:work:currentProcess#threads" }
+String Current_process_path        "Path"                <none>          { channel="systeminfo:computer:work:currentProcess#path" }
 
 /* Process information*/
-Number Process_load               "Load"                <none>           { channel="systeminfo:computer:work:process#load" }
-Number Process_used               "Used"                <none>           { channel="systeminfo:computer:work:process#used" }
-String Process_name               "Name"                <none>           { channel="systeminfo:computer:work:process#name" }
-Number Process_threads            "Threads"             <none>           { channel="systeminfo:computer:work:process#threads" }
-String Process_path               "Path"                <none>           { channel="systeminfo:computer:work:process#path" }
+Number:Dimensionless Process_load  "Load"                <none>          { channel="systeminfo:computer:work:process#load" }
+Number:Dimensionless Process_used  "Used"                <none>          { channel="systeminfo:computer:work:process#used" }
+String Process_name                "Name"                <none>          { channel="systeminfo:computer:work:process#name" }
+Number Process_threads             "Threads"             <none>          { channel="systeminfo:computer:work:process#threads" }
+String Process_path                "Path"                <none>          { channel="systeminfo:computer:work:process#path" }
 ```
 
 Sitemap:
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/handler/SysteminfoHandler.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/handler/SysteminfoHandler.java
index 3b8efb316e6e2..76a92016f5618 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/handler/SysteminfoHandler.java
+++ b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/handler/SysteminfoHandler.java
@@ -462,7 +462,7 @@ private State getInfoForChannel(ChannelUID channelUID) {
                     state = systeminfo.getBatteryName(deviceIndex);
                     break;
                 case CHANNEL_BATTERY_REMAINING_CAPACITY:
-                    state = systeminfo.getBatteryRemainingCapacity(deviceIndex);
+                    state = new QuantityType<>(systeminfo.getBatteryRemainingCapacity(deviceIndex), Units.PERCENT);
                     break;
                 case CHANNEL_BATTERY_REMAINING_TIME:
                     state = systeminfo.getBatteryRemainingTime(deviceIndex);
@@ -511,10 +511,13 @@ private State getInfoForChannel(ChannelUID channelUID) {
                     state = systeminfo.getMemoryTotal();
                     break;
                 case CHANNEL_MEMORY_AVAILABLE_PERCENT:
-                    state = systeminfo.getMemoryAvailablePercent();
+                    PercentType memoryAvailablePercent = systeminfo.getMemoryAvailablePercent();
+                    state = (memoryAvailablePercent != null) ? new QuantityType<>(memoryAvailablePercent, Units.PERCENT)
+                            : null;
                     break;
                 case CHANNEL_MEMORY_USED_PERCENT:
-                    state = systeminfo.getMemoryUsedPercent();
+                    PercentType memoryUsedPercent = systeminfo.getMemoryUsedPercent();
+                    state = (memoryUsedPercent != null) ? new QuantityType<>(memoryUsedPercent, Units.PERCENT) : null;
                     break;
                 case CHANNEL_SWAP_AVAILABLE:
                     state = systeminfo.getSwapAvailable();
@@ -526,10 +529,13 @@ private State getInfoForChannel(ChannelUID channelUID) {
                     state = systeminfo.getSwapTotal();
                     break;
                 case CHANNEL_SWAP_AVAILABLE_PERCENT:
-                    state = systeminfo.getSwapAvailablePercent();
+                    PercentType swapAvailablePercent = systeminfo.getSwapAvailablePercent();
+                    state = (swapAvailablePercent != null) ? new QuantityType<>(swapAvailablePercent, Units.PERCENT)
+                            : null;
                     break;
                 case CHANNEL_SWAP_USED_PERCENT:
-                    state = systeminfo.getSwapUsedPercent();
+                    PercentType swapUsedPercent = systeminfo.getSwapUsedPercent();
+                    state = (swapUsedPercent != null) ? new QuantityType<>(swapUsedPercent, Units.PERCENT) : null;
                     break;
                 case CHANNEL_DRIVE_MODEL:
                     state = systeminfo.getDriveModel(deviceIndex);
@@ -559,10 +565,14 @@ private State getInfoForChannel(ChannelUID channelUID) {
                     state = systeminfo.getStorageType(deviceIndex);
                     break;
                 case CHANNEL_STORAGE_AVAILABLE_PERCENT:
-                    state = systeminfo.getStorageAvailablePercent(deviceIndex);
+                    PercentType storageAvailablePercent = systeminfo.getStorageAvailablePercent(deviceIndex);
+                    state = (storageAvailablePercent != null)
+                            ? new QuantityType<>(storageAvailablePercent, Units.PERCENT)
+                            : null;
                     break;
                 case CHANNEL_STORAGE_USED_PERCENT:
-                    state = systeminfo.getStorageUsedPercent(deviceIndex);
+                    PercentType storageUsedPercent = systeminfo.getStorageUsedPercent(deviceIndex);
+                    state = (storageUsedPercent != null) ? new QuantityType<>(storageUsedPercent, Units.PERCENT) : null;
                     break;
                 case CHANNEL_NETWORK_IP:
                     state = systeminfo.getNetworkIp(deviceIndex);
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java
index 4c4b3903c7ad8..9350755f3d3e2 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java
+++ b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java
@@ -18,11 +18,19 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.measure.quantity.ElectricPotential;
+import javax.measure.quantity.Temperature;
+import javax.measure.quantity.Time;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.core.library.dimension.DataAmount;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.Units;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,6 +61,7 @@
  *         CentralProcessor#getSystemSerialNumber()
  * @author Wouter Born - Update to OSHI 4.0.0 and add null annotations
  * @author Mark Herwege - Add dynamic creation of extra channels
+ * @author Mark Herwege - Use units of measure
  *
  * @see <a href="https://github.com/oshi/oshi">OSHI GitHub repository</a>
  */
@@ -189,59 +198,59 @@ public DecimalType getCpuPhysicalCores() {
     }
 
     @Override
-    public DecimalType getMemoryTotal() {
+    public QuantityType<DataAmount> getMemoryTotal() {
         long totalMemory = memory.getTotal();
         totalMemory = getSizeInMB(totalMemory);
-        return new DecimalType(totalMemory);
+        return new QuantityType<>(totalMemory, Units.MEBIBYTE);
     }
 
     @Override
-    public DecimalType getMemoryAvailable() {
+    public QuantityType<DataAmount> getMemoryAvailable() {
         long availableMemory = memory.getAvailable();
         availableMemory = getSizeInMB(availableMemory);
-        return new DecimalType(availableMemory);
+        return new QuantityType<>(availableMemory, Units.MEBIBYTE);
     }
 
     @Override
-    public DecimalType getMemoryUsed() {
+    public QuantityType<DataAmount> getMemoryUsed() {
         long totalMemory = memory.getTotal();
         long availableMemory = memory.getAvailable();
         long usedMemory = totalMemory - availableMemory;
         usedMemory = getSizeInMB(usedMemory);
-        return new DecimalType(usedMemory);
+        return new QuantityType<>(usedMemory, Units.MEBIBYTE);
     }
 
     @Override
-    public DecimalType getStorageTotal(int index) throws DeviceNotFoundException {
+    public QuantityType<DataAmount> getStorageTotal(int index) throws DeviceNotFoundException {
         OSFileStore fileStore = getDevice(fileStores, index);
         fileStore.updateAttributes();
         long totalSpace = fileStore.getTotalSpace();
         totalSpace = getSizeInMB(totalSpace);
-        return new DecimalType(totalSpace);
+        return new QuantityType<>(totalSpace, Units.MEBIBYTE);
     }
 
     @Override
-    public DecimalType getStorageAvailable(int index) throws DeviceNotFoundException {
+    public QuantityType<DataAmount> getStorageAvailable(int index) throws DeviceNotFoundException {
         OSFileStore fileStore = getDevice(fileStores, index);
         fileStore.updateAttributes();
         long freeSpace = fileStore.getUsableSpace();
         freeSpace = getSizeInMB(freeSpace);
-        return new DecimalType(freeSpace);
+        return new QuantityType<>(freeSpace, Units.MEBIBYTE);
     }
 
     @Override
-    public DecimalType getStorageUsed(int index) throws DeviceNotFoundException {
+    public QuantityType<DataAmount> getStorageUsed(int index) throws DeviceNotFoundException {
         OSFileStore fileStore = getDevice(fileStores, index);
         fileStore.updateAttributes();
         long totalSpace = fileStore.getTotalSpace();
         long freeSpace = fileStore.getUsableSpace();
         long usedSpace = totalSpace - freeSpace;
         usedSpace = getSizeInMB(usedSpace);
-        return new DecimalType(usedSpace);
+        return new QuantityType<>(usedSpace, Units.MEBIBYTE);
     }
 
     @Override
-    public @Nullable DecimalType getStorageAvailablePercent(int deviceIndex) throws DeviceNotFoundException {
+    public @Nullable PercentType getStorageAvailablePercent(int deviceIndex) throws DeviceNotFoundException {
         OSFileStore fileStore = getDevice(fileStores, deviceIndex);
         fileStore.updateAttributes();
         long totalSpace = fileStore.getTotalSpace();
@@ -249,14 +258,14 @@ public DecimalType getStorageUsed(int index) throws DeviceNotFoundException {
         if (totalSpace > 0) {
             double freePercentDecimal = (double) freeSpace / (double) totalSpace;
             BigDecimal freePercent = getPercentsValue(freePercentDecimal);
-            return new DecimalType(freePercent);
+            return new PercentType(freePercent);
         } else {
             return null;
         }
     }
 
     @Override
-    public @Nullable DecimalType getStorageUsedPercent(int deviceIndex) throws DeviceNotFoundException {
+    public @Nullable PercentType getStorageUsedPercent(int deviceIndex) throws DeviceNotFoundException {
         OSFileStore fileStore = getDevice(fileStores, deviceIndex);
         fileStore.updateAttributes();
         long totalSpace = fileStore.getTotalSpace();
@@ -265,7 +274,7 @@ public DecimalType getStorageUsed(int index) throws DeviceNotFoundException {
         if (totalSpace > 0) {
             double usedPercentDecimal = (double) usedSpace / (double) totalSpace;
             BigDecimal usedPercent = getPercentsValue(usedPercentDecimal);
-            return new DecimalType(usedPercent);
+            return new PercentType(usedPercent);
         } else {
             return null;
         }
@@ -332,17 +341,17 @@ public StringType getDisplayInformation(int index) throws DeviceNotFoundExceptio
     }
 
     @Override
-    public @Nullable DecimalType getSensorsCpuTemperature() {
+    public @Nullable QuantityType<Temperature> getSensorsCpuTemperature() {
         BigDecimal cpuTemp = new BigDecimal(sensors.getCpuTemperature());
         cpuTemp = cpuTemp.setScale(PRECISION_AFTER_DECIMAL_SIGN, RoundingMode.HALF_UP);
-        return cpuTemp.signum() == 1 ? new DecimalType(cpuTemp) : null;
+        return cpuTemp.signum() == 1 ? new QuantityType<>(cpuTemp, SIUnits.CELSIUS) : null;
     }
 
     @Override
-    public @Nullable DecimalType getSensorsCpuVoltage() {
+    public @Nullable QuantityType<ElectricPotential> getSensorsCpuVoltage() {
         BigDecimal cpuVoltage = new BigDecimal(sensors.getCpuVoltage());
         cpuVoltage = cpuVoltage.setScale(PRECISION_AFTER_DECIMAL_SIGN, RoundingMode.HALF_UP);
-        return cpuVoltage.signum() == 1 ? new DecimalType(cpuVoltage) : null;
+        return cpuVoltage.signum() == 1 ? new QuantityType<>(cpuVoltage, Units.VOLT) : null;
     }
 
     @Override
@@ -358,22 +367,22 @@ public StringType getDisplayInformation(int index) throws DeviceNotFoundExceptio
     }
 
     @Override
-    public @Nullable DecimalType getBatteryRemainingTime(int index) throws DeviceNotFoundException {
+    public @Nullable QuantityType<Time> getBatteryRemainingTime(int index) throws DeviceNotFoundException {
         PowerSource powerSource = getDevice(powerSources, index);
         powerSource.updateAttributes();
         double remainingTimeInSeconds = powerSource.getTimeRemainingEstimated();
         // The getTimeRemaining() method returns (-1.0) if is calculating or (-2.0) if the time is unlimited.
         BigDecimal remainingTime = getTimeInMinutes(remainingTimeInSeconds);
-        return remainingTime.signum() == 1 ? new DecimalType(remainingTime) : null;
+        return remainingTime.signum() == 1 ? new QuantityType<>(remainingTime, Units.MINUTE) : null;
     }
 
     @Override
-    public DecimalType getBatteryRemainingCapacity(int index) throws DeviceNotFoundException {
+    public PercentType getBatteryRemainingCapacity(int index) throws DeviceNotFoundException {
         PowerSource powerSource = getDevice(powerSources, index);
         powerSource.updateAttributes();
         double remainingCapacity = powerSource.getRemainingCapacityPercent();
         BigDecimal remainingCapacityPercents = getPercentsValue(remainingCapacity);
-        return new DecimalType(remainingCapacityPercents);
+        return new PercentType(remainingCapacityPercents);
     }
 
     @Override
@@ -384,27 +393,27 @@ public StringType getBatteryName(int index) throws DeviceNotFoundException {
     }
 
     @Override
-    public @Nullable DecimalType getMemoryAvailablePercent() {
+    public @Nullable PercentType getMemoryAvailablePercent() {
         long availableMemory = memory.getAvailable();
         long totalMemory = memory.getTotal();
         if (totalMemory > 0) {
             double freePercentDecimal = (double) availableMemory / (double) totalMemory;
             BigDecimal freePercent = getPercentsValue(freePercentDecimal);
-            return new DecimalType(freePercent);
+            return new PercentType(freePercent);
         } else {
             return null;
         }
     }
 
     @Override
-    public @Nullable DecimalType getMemoryUsedPercent() {
+    public @Nullable PercentType getMemoryUsedPercent() {
         long availableMemory = memory.getAvailable();
         long totalMemory = memory.getTotal();
         long usedMemory = totalMemory - availableMemory;
         if (totalMemory > 0) {
             double usedPercentDecimal = (double) usedMemory / (double) totalMemory;
             BigDecimal usedPercent = getPercentsValue(usedPercentDecimal);
-            return new DecimalType(usedPercent);
+            return new PercentType(usedPercent);
         } else {
             return null;
         }
@@ -432,50 +441,50 @@ public StringType getDriveSerialNumber(int deviceIndex) throws DeviceNotFoundExc
     }
 
     @Override
-    public @Nullable DecimalType getSwapTotal() {
+    public QuantityType<DataAmount> getSwapTotal() {
         long swapTotal = memory.getVirtualMemory().getSwapTotal();
         swapTotal = getSizeInMB(swapTotal);
-        return new DecimalType(swapTotal);
+        return new QuantityType<>(swapTotal, Units.MEBIBYTE);
     }
 
     @Override
-    public @Nullable DecimalType getSwapAvailable() {
+    public QuantityType<DataAmount> getSwapAvailable() {
         long swapTotal = memory.getVirtualMemory().getSwapTotal();
         long swapUsed = memory.getVirtualMemory().getSwapUsed();
         long swapAvailable = swapTotal - swapUsed;
         swapAvailable = getSizeInMB(swapAvailable);
-        return new DecimalType(swapAvailable);
+        return new QuantityType<>(swapAvailable, Units.MEBIBYTE);
     }
 
     @Override
-    public @Nullable DecimalType getSwapUsed() {
+    public QuantityType<DataAmount> getSwapUsed() {
         long swapUsed = memory.getVirtualMemory().getSwapUsed();
         swapUsed = getSizeInMB(swapUsed);
-        return new DecimalType(swapUsed);
+        return new QuantityType<>(swapUsed, Units.MEBIBYTE);
     }
 
     @Override
-    public @Nullable DecimalType getSwapAvailablePercent() {
+    public @Nullable PercentType getSwapAvailablePercent() {
         long swapTotal = memory.getVirtualMemory().getSwapTotal();
         long swapUsed = memory.getVirtualMemory().getSwapUsed();
         long swapAvailable = swapTotal - swapUsed;
         if (swapTotal > 0) {
             double swapAvailablePercentDecimal = (double) swapAvailable / (double) swapTotal;
             BigDecimal swapAvailablePercent = getPercentsValue(swapAvailablePercentDecimal);
-            return new DecimalType(swapAvailablePercent);
+            return new PercentType(swapAvailablePercent);
         } else {
             return null;
         }
     }
 
     @Override
-    public @Nullable DecimalType getSwapUsedPercent() {
+    public @Nullable PercentType getSwapUsedPercent() {
         long swapTotal = memory.getVirtualMemory().getSwapTotal();
         long swapUsed = memory.getVirtualMemory().getSwapUsed();
         if (swapTotal > 0) {
             double swapUsedPercentDecimal = (double) swapUsed / (double) swapTotal;
             BigDecimal swapUsedPercent = getPercentsValue(swapUsedPercentDecimal);
-            return new DecimalType(swapUsedPercent);
+            return new PercentType(swapUsedPercent);
         } else {
             return null;
         }
@@ -561,9 +570,9 @@ private BigDecimal getAvarageCpuLoad(int timeInMinutes) {
     }
 
     @Override
-    public DecimalType getCpuUptime() {
+    public QuantityType<Time> getCpuUptime() {
         long seconds = operatingSystem.getSystemUptime();
-        return new DecimalType(getTimeInMinutes(seconds));
+        return new QuantityType<>(getTimeInMinutes(seconds), Units.MINUTE);
     }
 
     @Override
@@ -596,19 +605,19 @@ public DecimalType getNetworkPacketsSent(int networkIndex) throws DeviceNotFound
     }
 
     @Override
-    public DecimalType getNetworkDataSent(int networkIndex) throws DeviceNotFoundException {
+    public QuantityType<DataAmount> getNetworkDataSent(int networkIndex) throws DeviceNotFoundException {
         NetworkIF network = getDevice(networks, networkIndex);
         network.updateAttributes();
         long bytesSent = network.getBytesSent();
-        return new DecimalType(getSizeInMB(bytesSent));
+        return new QuantityType<>(getSizeInMB(bytesSent), Units.MEBIBYTE);
     }
 
     @Override
-    public DecimalType getNetworkDataReceived(int networkIndex) throws DeviceNotFoundException {
+    public QuantityType<DataAmount> getNetworkDataReceived(int networkIndex) throws DeviceNotFoundException {
         NetworkIF network = getDevice(networks, networkIndex);
         network.updateAttributes();
         long bytesRecv = network.getBytesRecv();
-        return new DecimalType(getSizeInMB(bytesRecv));
+        return new QuantityType<>(getSizeInMB(bytesRecv), Units.MEBIBYTE);
     }
 
     @Override
@@ -642,12 +651,12 @@ public int getCurrentProcessID() {
     }
 
     @Override
-    public @Nullable DecimalType getProcessMemoryUsage(int pid) throws DeviceNotFoundException {
+    public @Nullable QuantityType<DataAmount> getProcessMemoryUsage(int pid) throws DeviceNotFoundException {
         if (pid > 0) {
             OSProcess process = getProcess(pid);
             long memortInBytes = process.getResidentSetSize();
             long memoryInMB = getSizeInMB(memortInBytes);
-            return new DecimalType(memoryInMB);
+            return new QuantityType<>(memoryInMB, Units.MEBIBYTE);
         } else {
             return null;
         }
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/SysteminfoInterface.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/SysteminfoInterface.java
index 87a7c97610ac6..a76ff564fb5dc 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/SysteminfoInterface.java
+++ b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/SysteminfoInterface.java
@@ -12,10 +12,16 @@
  */
 package org.openhab.binding.systeminfo.internal.model;
 
+import javax.measure.quantity.ElectricPotential;
+import javax.measure.quantity.Temperature;
+import javax.measure.quantity.Time;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.core.library.dimension.DataAmount;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
 
 /**
@@ -24,6 +30,7 @@
  * @author Svilen Valkanov - Initial contribution
  * @author Wouter Born - Add null annotations
  * @author Mark Herwege - Add dynamic creation of extra channels
+ * @author Mark Herwege - Use units of measure
  */
 @NonNullByDefault
 public interface SysteminfoInterface {
@@ -76,7 +83,7 @@ public interface SysteminfoInterface {
     /**
      * Returns the system cpu load.
      *
-     * @return the system cpu load between 0 and 1 or null, if no information is available
+     * @return the system cpu load between 0 and 100% or null, if no information is available
      */
     public @Nullable PercentType getSystemCpuLoad();
 
@@ -104,9 +111,9 @@ public interface SysteminfoInterface {
     /**
      * Get the System uptime (time since boot).
      *
-     * @return time in minutes since boot
+     * @return time since boot
      */
-    public DecimalType getCpuUptime();
+    public QuantityType<Time> getCpuUptime();
 
     /**
      * Get the number of threads currently running
@@ -119,101 +126,101 @@ public interface SysteminfoInterface {
     /**
      * Returns total size of memory
      *
-     * @return memory size in MB
+     * @return memory size
      */
-    public DecimalType getMemoryTotal();
+    public QuantityType<DataAmount> getMemoryTotal();
 
     /**
      * Returns available size of memory
      *
-     * @return memory size in MB
+     * @return memory size
      */
-    public DecimalType getMemoryAvailable();
+    public QuantityType<DataAmount> getMemoryAvailable();
 
     /**
      * Returns used size of memory
      *
-     * @return memory size in MB
+     * @return memory size
      */
-    public DecimalType getMemoryUsed();
+    public QuantityType<DataAmount> getMemoryUsed();
 
     /**
      * Percents of available memory on the machine
      *
      * @return percent of available memory or null, if no information is available
      */
-    public @Nullable DecimalType getMemoryAvailablePercent();
+    public @Nullable PercentType getMemoryAvailablePercent();
 
     /**
      * Percents of used memory on the machine
      *
      * @return percent of used memory or null, if no information is available
      */
-    public @Nullable DecimalType getMemoryUsedPercent();
+    public @Nullable PercentType getMemoryUsedPercent();
 
     // Swap memory info
     /**
      * Returns total size of swap memory
      *
-     * @return memory size in MB or 0, if no there is no swap memory
+     * @return memory size or 0, if there is no swap memory
      */
-    public @Nullable DecimalType getSwapTotal();
+    public QuantityType<DataAmount> getSwapTotal();
 
     /**
      * Returns available size swap of memory
      *
-     * @return memory size in MB or 0, if no there is no swap memory
+     * @return memory size or 0, if no there is no swap memory
      */
-    public @Nullable DecimalType getSwapAvailable();
+    public QuantityType<DataAmount> getSwapAvailable();
 
     /**
      * Returns used size of swap memory
      *
-     * @return memory size in MB or 0, if no there is no swap memory
+     * @return memory size or 0, if no there is no swap memory
      */
-    public @Nullable DecimalType getSwapUsed();
+    public QuantityType<DataAmount> getSwapUsed();
 
     /**
      * Percents of available swap memory on the machine
      *
      * @return percent of available memory or null, if no there is no swap memory
      */
-    public @Nullable DecimalType getSwapAvailablePercent();
+    public @Nullable PercentType getSwapAvailablePercent();
 
     /**
      * Percents of used swap memory on the machine
      *
      * @return percent of used memory or null, if no there is no swap memory
      */
-    public @Nullable DecimalType getSwapUsedPercent();
+    public @Nullable PercentType getSwapUsedPercent();
 
     // Storage info
     /**
      * Returns the total space of the logical storage volume.
      *
      * @param deviceIndex - the index of the logical volume
-     * @return storage size in MB
+     * @return storage size
      * @throws DeviceNotFoundException
      */
-    public DecimalType getStorageTotal(int deviceIndex) throws DeviceNotFoundException;
+    public QuantityType<DataAmount> getStorageTotal(int deviceIndex) throws DeviceNotFoundException;
 
     /**
      * Returns the available storage space on the logical storage volume
      *
      * @param deviceIndex - the index of the logical volume
-     * @return storage size in MB
+     * @return storage size
      * @throws DeviceNotFoundException
      */
-    public DecimalType getStorageAvailable(int deviceIndex) throws DeviceNotFoundException;
+    public QuantityType<DataAmount> getStorageAvailable(int deviceIndex) throws DeviceNotFoundException;
 
     /**
      * Gets the used storage space on the logical storage volume
      *
      * @param deviceIndex - the index of the logical volume
-     * @return storage size in MB
+     * @return storage size
      * @throws DeviceNotFoundException
      */
-    public DecimalType getStorageUsed(int deviceIndex) throws DeviceNotFoundException;
+    public QuantityType<DataAmount> getStorageUsed(int deviceIndex) throws DeviceNotFoundException;
 
     /**
      * Gets the percent of available storage on the logical volume
@@ -222,7 +229,7 @@ public interface SysteminfoInterface {
      * @return percent of available storage or null
      * @throws DeviceNotFoundException
      */
-    public @Nullable DecimalType getStorageAvailablePercent(int deviceIndex) throws DeviceNotFoundException;
+    public @Nullable PercentType getStorageAvailablePercent(int deviceIndex) throws DeviceNotFoundException;
 
     /**
      * Gets the percent of used storage on the logical volume
@@ -231,7 +238,7 @@ public interface SysteminfoInterface {
      * @return percent of used storage or null
      * @throws DeviceNotFoundException
      */
-    public @Nullable DecimalType getStorageUsedPercent(int deviceIndex) throws DeviceNotFoundException;
+    public @Nullable PercentType getStorageUsedPercent(int deviceIndex) throws DeviceNotFoundException;
 
     /**
      * Gets the name of the logical storage volume
@@ -330,20 +337,20 @@ public interface SysteminfoInterface {
     public DecimalType getNetworkPacketsSent(int networkIndex) throws DeviceNotFoundException;
 
     /**
-     * Get data sent in MB for this network
+     * Get data sent for this network
      *
      * @param networkIndex - the index of the network
      * @throws DeviceNotFoundException
      */
-    public DecimalType getNetworkDataSent(int networkIndex) throws DeviceNotFoundException;
+    public QuantityType<DataAmount> getNetworkDataSent(int networkIndex) throws DeviceNotFoundException;
 
     /**
-     * Get data received in MB for this network
+     * Get data received for this network
      *
      * @param networkIndex - the index of the network
      * @throws DeviceNotFoundException
      */
-    public DecimalType getNetworkDataReceived(int networkIndex) throws DeviceNotFoundException;
+    public QuantityType<DataAmount> getNetworkDataReceived(int networkIndex) throws DeviceNotFoundException;
 
     // Display info
     /**
@@ -358,16 +365,16 @@ public interface SysteminfoInterface {
     /**
      * Get the information from the CPU temperature sensors.
      *
-     * @return Temperature in degrees Celsius if available, null otherwise.
+     * @return Temperature if available, null otherwise.
      */
-    public @Nullable DecimalType getSensorsCpuTemperature();
+    public @Nullable QuantityType<Temperature> getSensorsCpuTemperature();
 
     /**
      * Get the information for the CPU voltage.
      *
-     * @return Voltage in Volts if available, null otherwise.
+     * @return Voltage if available, null otherwise.
      */
-    public @Nullable DecimalType getSensorsCpuVoltage();
+    public @Nullable QuantityType<ElectricPotential> getSensorsCpuVoltage();
 
     /**
      * Get fan speed
@@ -383,19 +390,19 @@ public interface SysteminfoInterface {
      * Get estimated time remaining for the power source.
      *
      * @param deviceIndex
-     * @return minutes remaining charge or null, if the time is estimated as unlimited
+     * @return duration remaining charge or null, if the time is estimated as unlimited
      * @throws DeviceNotFoundException
      */
-    public @Nullable DecimalType getBatteryRemainingTime(int deviceIndex) throws DeviceNotFoundException;
+    public @Nullable QuantityType<Time> getBatteryRemainingTime(int deviceIndex) throws DeviceNotFoundException;
 
     /**
      * Battery remaining capacity.
      *
      * @param deviceIndex
-     * @return percentage value /0-100/
+     * @return percentage value
      * @throws DeviceNotFoundException
      */
-    public DecimalType getBatteryRemainingCapacity(int deviceIndex) throws DeviceNotFoundException;
+    public PercentType getBatteryRemainingCapacity(int deviceIndex) throws DeviceNotFoundException;
 
     /**
      * Get battery name
@@ -433,10 +440,10 @@ public interface SysteminfoInterface {
      * Returns the size of RAM memory only usage of the process
      *
      * @param pid - the PID of the process
-     * @return memory size in MB
+     * @return memory size
      * @throws DeviceNotFoundException- thrown if process with this PID can not be found
      */
-    public @Nullable DecimalType getProcessMemoryUsage(int pid) throws DeviceNotFoundException;
+    public @Nullable QuantityType<DataAmount> getProcessMemoryUsage(int pid) throws DeviceNotFoundException;
 
     /**
      * Returns the full path of the executing process.
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo.properties b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo.properties
index 289ef8f0d6e70..dc184f6a5e340 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo.properties
+++ b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo.properties
@@ -43,23 +43,23 @@ channel-group-type.systeminfo.swapGroup.description = Swap memory information
 # channel types
 
 channel-type.systeminfo.available.label = Available
-channel-type.systeminfo.available.description = Available size in MB
+channel-type.systeminfo.available.description = Available size
 channel-type.systeminfo.availableHeap.label = Available Heap
 channel-type.systeminfo.availableHeap.description = How much data is available in the Java heap.
 channel-type.systeminfo.availablePercent.label = Available (%)
 channel-type.systeminfo.availablePercent.description = Available size in percent
 channel-type.systeminfo.cpuTemp.label = CPU Temperature
-channel-type.systeminfo.cpuTemp.description = CPU Temperature in Celsius degrees
+channel-type.systeminfo.cpuTemp.description = CPU Temperature
 channel-type.systeminfo.cpuVoltage.label = CPU Voltage
-channel-type.systeminfo.cpuVoltage.description = CPU Voltage in V
+channel-type.systeminfo.cpuVoltage.description = CPU Voltage
 channel-type.systeminfo.dataReceived.label = Data Received
-channel-type.systeminfo.dataReceived.description = Data received in MB
+channel-type.systeminfo.dataReceived.description = Volume of data received
 channel-type.systeminfo.dataSent.label = Data Sent
-channel-type.systeminfo.dataSent.description = Data sent in MB
+channel-type.systeminfo.dataSent.description = Volume of data sent
 channel-type.systeminfo.description.label = Description
 channel-type.systeminfo.description.description = Description of the device
 channel-type.systeminfo.fanSpeed.label = Fan Speed
-channel-type.systeminfo.fanSpeed.description = Fan speed in rpm
+channel-type.systeminfo.fanSpeed.description = Fan speed in rotations per minute
 channel-type.systeminfo.information.label = Display Information
 channel-type.systeminfo.information.description = Product, manufacturer, SN, width and height of the display in cm
 channel-type.systeminfo.ip.label = IP Address
@@ -93,27 +93,27 @@ channel-type.systeminfo.path_process.description = The full path
 channel-type.systeminfo.remainingCapacity.label = Remaining Capacity
 channel-type.systeminfo.remainingCapacity.description = Remaining capacity in percent
 channel-type.systeminfo.remainingTime.label = Remaining Time
-channel-type.systeminfo.remainingTime.description = Remaining time in minutes
+channel-type.systeminfo.remainingTime.description = Remaining time
 channel-type.systeminfo.serial.label = Serial Number
 channel-type.systeminfo.serial.description = The serial number of the device
 channel-type.systeminfo.threads.label = Number of Threads
-channel-type.systeminfo.threads.description = Number of threads currently running
+channel-type.systeminfo.threads.description = Total number of threads currently running
 channel-type.systeminfo.threads_process.label = Number of Threads
-channel-type.systeminfo.threads_process.description = Number of threads currently running
+channel-type.systeminfo.threads_process.description = Number of threads for process currently running
 channel-type.systeminfo.total.label = Total
-channel-type.systeminfo.total.description = Total size in MB
+channel-type.systeminfo.total.description = Total size
 channel-type.systeminfo.type.label = Type
 channel-type.systeminfo.type.description = Storage type
 channel-type.systeminfo.uptime.label = System Uptime
-channel-type.systeminfo.uptime.description = System uptime (time after start) in minutes
+channel-type.systeminfo.uptime.description = System uptime (time after start)
 channel-type.systeminfo.used.label = Used
-channel-type.systeminfo.used.description = Used size in MB
+channel-type.systeminfo.used.description = Used size
 channel-type.systeminfo.usedHeapPercent.label = Used Heap Percent
 channel-type.systeminfo.usedHeapPercent.description = How much data in percent has been used from the max size the Java heap can grow to.
 channel-type.systeminfo.usedPercent.label = Used (%)
 channel-type.systeminfo.usedPercent.description = Used size in percent
 channel-type.systeminfo.used_process.label = Used
-channel-type.systeminfo.used_process.description = Used size in MB
+channel-type.systeminfo.used_process.description = Used size
 
 # channel types config
 
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/thing/channels.xml
index 5add605847cf0..150075edc5682 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/thing/channels.xml
@@ -144,7 +144,7 @@
 		<item-type>Number:DataAmount</item-type>
 		<label>Available Heap</label>
 		<description>How much data is available in the Java heap.</description>
-		<state pattern="%.1f %unit%" readOnly="true"/>
+		<state pattern="%.0f MiB" readOnly="true"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
 
@@ -173,39 +173,39 @@
 	</channel-type>
 
 	<channel-type id="available">
-		<item-type>Number</item-type>
+		<item-type>Number:DataAmount</item-type>
 		<label>Available</label>
-		<description>Available size in MB</description>
-		<state readOnly="true" pattern="%d MB"/>
+		<description>Available size</description>
+		<state readOnly="true" pattern="%.0f MiB"/>
 		<config-description-ref uri="channel-type:systeminfo:highpriority"/>
 	</channel-type>
 
 	<channel-type id="used">
-		<item-type>Number</item-type>
+		<item-type>Number:DataAmount</item-type>
 		<label>Used</label>
-		<description>Used size in MB</description>
-		<state readOnly="true" pattern="%d MB"/>
+		<description>Used size</description>
+		<state readOnly="true" pattern="%.0f MiB"/>
 		<config-description-ref uri="channel-type:systeminfo:highpriority"/>
 	</channel-type>
 
 	<channel-type id="used_process">
-		<item-type>Number</item-type>
+		<item-type>Number:DataAmount</item-type>
 		<label>Used</label>
-		<description>Used size in MB</description>
-		<state readOnly="true" pattern="%d MB"/>
+		<description>Used size</description>
+		<state readOnly="true" pattern="%.0f MiB"/>
 		<config-description-ref uri="channel-type:systeminfo:highpriority_process"/>
 	</channel-type>
 
 	<channel-type id="total">
-		<item-type>Number</item-type>
+		<item-type>Number:DataAmount</item-type>
 		<label>Total</label>
-		<description>Total size in MB</description>
-		<state readOnly="true" pattern="%d MB"/>
+		<description>Total size</description>
+		<state readOnly="true" pattern="%.0f MiB"/>
 		<config-description-ref uri="channel-type:systeminfo:lowpriority"/>
 	</channel-type>
 
 	<channel-type id="availablePercent">
-		<item-type>Number</item-type>
+		<item-type>Number:Dimensionless</item-type>
 		<label>Available (%)</label>
 		<description>Available size in percent</description>
 		<state readOnly="true" pattern="%.1f %%"/>
@@ -213,7 +213,7 @@
 	</channel-type>
 
 	<channel-type id="usedPercent">
-		<item-type>Number</item-type>
+		<item-type>Number:Dimensionless</item-type>
 		<label>Used (%)</label>
 		<description>Used size in percent</description>
 		<state readOnly="true" pattern="%.1f %%"/>
@@ -256,7 +256,7 @@
 		<item-type>String</item-type>
 		<label>Description</label>
 		<description>Description of the device</description>
-		<state readOnly="true" pattern="%s "/>
+		<state readOnly="true" pattern="%s"/>
 		<config-description-ref uri="channel-type:systeminfo:lowpriority"/>
 	</channel-type>
 
@@ -264,22 +264,22 @@
 		<item-type>String</item-type>
 		<label>Type</label>
 		<description>Storage type</description>
-		<state readOnly="true" pattern="%s "/>
+		<state readOnly="true" pattern="%s"/>
 		<config-description-ref uri="channel-type:systeminfo:lowpriority"/>
 	</channel-type>
 
 	<channel-type id="cpuTemp" advanced="true">
-		<item-type>Number</item-type>
+		<item-type>Number:Temperature</item-type>
 		<label>CPU Temperature</label>
-		<description>CPU Temperature in Celsius degrees</description>
-		<state readOnly="true" pattern="%.1f °"/>
+		<description>CPU temperature</description>
+		<state readOnly="true" pattern="%.1f °C"/>
 		<config-description-ref uri="channel-type:systeminfo:highpriority"/>
 	</channel-type>
 
 	<channel-type id="cpuVoltage" advanced="true">
-		<item-type>Number</item-type>
+		<item-type>Number:ElectricPotential</item-type>
 		<label>CPU Voltage</label>
-		<description>CPU Voltage in V</description>
+		<description>CPU voltage</description>
 		<state readOnly="true" pattern="%.1f V"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
@@ -287,21 +287,21 @@
 	<channel-type id="fanSpeed" advanced="true">
 		<item-type>Number</item-type>
 		<label>Fan Speed</label>
-		<description>Fan speed in rpm</description>
+		<description>Fan speed in rotations per minute</description>
 		<state readOnly="true" pattern="%d rpm"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
 
 	<channel-type id="remainingTime">
-		<item-type>Number</item-type>
+		<item-type>Number:Time</item-type>
 		<label>Remaining Time</label>
-		<description>Remaining time in minutes</description>
-		<state readOnly="true" pattern="%.1f Minutes"/>
+		<description>Remaining time</description>
+		<state readOnly="true" pattern="%.1f min"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
 
 	<channel-type id="remainingCapacity">
-		<item-type>Number</item-type>
+		<item-type>Number:Dimensionless</item-type>
 		<label>Remaining Capacity</label>
 		<description>Remaining capacity in percent</description>
 		<state readOnly="true" pattern="%.1f %%"/>
@@ -333,17 +333,17 @@
 	</channel-type>
 
 	<channel-type id="uptime" advanced="true">
-		<item-type>Number</item-type>
+		<item-type>Number:Time</item-type>
 		<label>System Uptime</label>
-		<description>System uptime (time after start) in minutes</description>
-		<state readOnly="true" pattern="%.1f Minutes"/>
+		<description>System uptime (time after start)</description>
+		<state readOnly="true" pattern="%.1f min"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
 
 	<channel-type id="threads" advanced="true">
 		<item-type>Number</item-type>
 		<label>Number of Threads</label>
-		<description>Number of threads currently running</description>
+		<description>Total number of threads currently running</description>
 		<state readOnly="true" pattern="%d"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
@@ -351,7 +351,7 @@
 	<channel-type id="threads_process" advanced="true">
 		<item-type>Number</item-type>
 		<label>Number of Threads</label>
-		<description>Number of threads currently running</description>
+		<description>Number of threads for process currently running</description>
 		<state readOnly="true" pattern="%d"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority_process"/>
 	</channel-type>
@@ -360,7 +360,7 @@
 		<item-type>String</item-type>
 		<label>Display Information</label>
 		<description>Product, manufacturer, SN, width and height of the display in cm</description>
-		<state readOnly="true" pattern="%s "/>
+		<state readOnly="true" pattern="%s"/>
 		<config-description-ref uri="channel-type:systeminfo:lowpriority"/>
 	</channel-type>
 
@@ -368,7 +368,7 @@
 		<item-type>String</item-type>
 		<label>IP Address</label>
 		<description>Host IP address of the network</description>
-		<state readOnly="true" pattern="%s "/>
+		<state readOnly="true" pattern="%s"/>
 		<config-description-ref uri="channel-type:systeminfo:lowpriority"/>
 	</channel-type>
 
@@ -376,7 +376,7 @@
 		<item-type>String</item-type>
 		<label>Mac Address</label>
 		<description>Mac address of the network</description>
-		<state readOnly="true" pattern="%s "/>
+		<state readOnly="true" pattern="%s"/>
 		<config-description-ref uri="channel-type:systeminfo:lowpriority"/>
 	</channel-type>
 
@@ -384,7 +384,7 @@
 		<item-type>String</item-type>
 		<label>Network Name</label>
 		<description>The name of the network.</description>
-		<state readOnly="true" pattern="%s "/>
+		<state readOnly="true" pattern="%s"/>
 		<config-description-ref uri="channel-type:systeminfo:lowpriority"/>
 	</channel-type>
 
@@ -392,7 +392,7 @@
 		<item-type>String</item-type>
 		<label>Network Display Name</label>
 		<description>The display name of the network</description>
-		<state readOnly="true" pattern="%s "/>
+		<state readOnly="true" pattern="%s"/>
 		<config-description-ref uri="channel-type:systeminfo:lowpriority"/>
 	</channel-type>
 
@@ -400,7 +400,7 @@
 		<item-type>Number</item-type>
 		<label>Packets Sent</label>
 		<description>Number of packets sent</description>
-		<state readOnly="true" pattern="%d "/>
+		<state readOnly="true" pattern="%d"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
 
@@ -408,23 +408,23 @@
 		<item-type>Number</item-type>
 		<label>Packets Received</label>
 		<description>Number of packets received</description>
-		<state readOnly="true" pattern="%d "/>
+		<state readOnly="true" pattern="%d"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
 
 	<channel-type id="dataSent" advanced="true">
-		<item-type>Number</item-type>
+		<item-type>Number:DataAmount</item-type>
 		<label>Data Sent</label>
-		<description>Data sent in MB</description>
-		<state readOnly="true" pattern="%d MB"/>
+		<description>Volume of data sent</description>
+		<state readOnly="true" pattern="%.0f MiB"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
 
 	<channel-type id="dataReceived" advanced="true">
-		<item-type>Number</item-type>
+		<item-type>Number:DataAmount</item-type>
 		<label>Data Received</label>
-		<description>Data received in MB</description>
-		<state readOnly="true" pattern="%d MB"/>
+		<description>Volume of data received</description>
+		<state readOnly="true" pattern="%.0f MiB"/>
 		<config-description-ref uri="channel-type:systeminfo:mediumpriority"/>
 	</channel-type>
 
diff --git a/itests/org.openhab.binding.systeminfo.tests/src/main/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java b/itests/org.openhab.binding.systeminfo.tests/src/main/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java
index 57b78ead6e22d..89824b373986c 100644
--- a/itests/org.openhab.binding.systeminfo.tests/src/main/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java
+++ b/itests/org.openhab.binding.systeminfo.tests/src/main/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java
@@ -24,6 +24,10 @@
 import java.util.Hashtable;
 import java.util.List;
 
+import javax.measure.quantity.ElectricPotential;
+import javax.measure.quantity.Temperature;
+import javax.measure.quantity.Time;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.junit.jupiter.api.AfterEach;
@@ -48,11 +52,15 @@
 import org.openhab.core.items.GenericItem;
 import org.openhab.core.items.ItemNotFoundException;
 import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.dimension.DataAmount;
 import org.openhab.core.library.items.NumberItem;
 import org.openhab.core.library.items.StringItem;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.test.java.JavaOSGiTest;
 import org.openhab.core.test.storage.VolatileStorageService;
 import org.openhab.core.thing.Channel;
@@ -314,8 +322,8 @@ private void assertItemState(String acceptedItemType, String itemName, String pr
 
     private void intializeItem(ChannelUID channelUID, String itemName, String acceptedItemType) {
         GenericItem item = null;
-        if ("Number".equals(acceptedItemType)) {
-            item = new NumberItem(itemName);
+        if (acceptedItemType.startsWith("Number")) {
+            item = new NumberItem(acceptedItemType, itemName);
         } else if ("String".equals(acceptedItemType)) {
             item = new StringItem(itemName);
         }
@@ -447,9 +455,9 @@ public void assertChannelCpuThreadsIsUpdated() {
     @Test
     public void assertChannelCpuUptimeIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_CPU_UPTIME;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:Time";
 
-        DecimalType mockedCpuUptimeValue = new DecimalType(100);
+        QuantityType<Time> mockedCpuUptimeValue = new QuantityType<>(100, Units.MINUTE);
         when(mockedSystemInfo.getCpuUptime()).thenReturn(mockedCpuUptimeValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -484,9 +492,9 @@ public void assertChannelCpuNameIsUpdated() {
     @Test
     public void assertChannelMemoryAvailableIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_MEMORY_AVAILABLE;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedMemoryAvailableValue = new DecimalType(1000);
+        QuantityType<DataAmount> mockedMemoryAvailableValue = new QuantityType<>(1000, Units.MEBIBYTE);
         when(mockedSystemInfo.getMemoryAvailable()).thenReturn(mockedMemoryAvailableValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -497,9 +505,9 @@ public void assertChannelMemoryAvailableIsUpdated() {
     @Test
     public void assertChannelMemoryUsedIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_MEMORY_USED;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedMemoryUsedValue = new DecimalType(24);
+        QuantityType<DataAmount> mockedMemoryUsedValue = new QuantityType<>(24, Units.MEBIBYTE);
         when(mockedSystemInfo.getMemoryUsed()).thenReturn(mockedMemoryUsedValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -509,9 +517,9 @@ public void assertChannelMemoryUsedIsUpdated() {
     @Test
     public void assertChannelMemoryTotalIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_MEMORY_TOTAL;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedMemoryTotalValue = new DecimalType(1024);
+        QuantityType<DataAmount> mockedMemoryTotalValue = new QuantityType<>(1024, Units.MEBIBYTE);
         when(mockedSystemInfo.getMemoryTotal()).thenReturn(mockedMemoryTotalValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -524,7 +532,7 @@ public void assertChannelMemoryAvailablePercentIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_MEMORY_AVAILABLE_PERCENT;
         String acceptedItemType = "Number";
 
-        DecimalType mockedMemoryAvailablePercentValue = new DecimalType(97);
+        PercentType mockedMemoryAvailablePercentValue = new PercentType(97);
         when(mockedSystemInfo.getMemoryAvailablePercent()).thenReturn(mockedMemoryAvailablePercentValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -535,9 +543,9 @@ public void assertChannelMemoryAvailablePercentIsUpdated() {
     @Test
     public void assertChannelSwapAvailableIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_SWAP_AVAILABLE;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedSwapAvailableValue = new DecimalType(482);
+        QuantityType<DataAmount> mockedSwapAvailableValue = new QuantityType<>(482, Units.MEBIBYTE);
         when(mockedSystemInfo.getSwapAvailable()).thenReturn(mockedSwapAvailableValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -548,9 +556,9 @@ public void assertChannelSwapAvailableIsUpdated() {
     @Test
     public void assertChannelSwapUsedIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_SWAP_USED;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedSwapUsedValue = new DecimalType(30);
+        QuantityType<DataAmount> mockedSwapUsedValue = new QuantityType<>(30, Units.MEBIBYTE);
         when(mockedSystemInfo.getSwapUsed()).thenReturn(mockedSwapUsedValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -560,9 +568,9 @@ public void assertChannelSwapUsedIsUpdated() {
     @Test
     public void assertChannelSwapTotalIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_SWAP_TOTAL;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedSwapTotalValue = new DecimalType(512);
+        QuantityType<DataAmount> mockedSwapTotalValue = new QuantityType<>(512, Units.MEBIBYTE);
         when(mockedSystemInfo.getSwapTotal()).thenReturn(mockedSwapTotalValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -574,7 +582,7 @@ public void assertChannelSwapAvailablePercentIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_SWAP_AVAILABLE_PERCENT;
         String acceptedItemType = "Number";
 
-        DecimalType mockedSwapAvailablePercentValue = new DecimalType(94);
+        PercentType mockedSwapAvailablePercentValue = new PercentType(94);
         when(mockedSystemInfo.getSwapAvailablePercent()).thenReturn(mockedSwapAvailablePercentValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -622,9 +630,9 @@ public void assertChannelStorageDescriptionIsUpdated() throws DeviceNotFoundExce
     @Test
     public void assertChannelStorageAvailableIsUpdated() throws DeviceNotFoundException {
         String channnelID = SysteminfoBindingConstants.CHANNEL_STORAGE_AVAILABLE;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedStorageAvailableValue = new DecimalType(2000);
+        QuantityType<DataAmount> mockedStorageAvailableValue = new QuantityType<>(2000, Units.MEBIBYTE);
         when(mockedSystemInfo.getStorageAvailable(DEFAULT_DEVICE_INDEX)).thenReturn(mockedStorageAvailableValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -635,9 +643,9 @@ public void assertChannelStorageAvailableIsUpdated() throws DeviceNotFoundExcept
     @Test
     public void assertChannelStorageUsedIsUpdated() throws DeviceNotFoundException {
         String channnelID = SysteminfoBindingConstants.CHANNEL_STORAGE_USED;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedStorageUsedValue = new DecimalType(500);
+        QuantityType<DataAmount> mockedStorageUsedValue = new QuantityType<>(500, Units.MEBIBYTE);
         when(mockedSystemInfo.getStorageUsed(DEFAULT_DEVICE_INDEX)).thenReturn(mockedStorageUsedValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -648,9 +656,9 @@ public void assertChannelStorageUsedIsUpdated() throws DeviceNotFoundException {
     @Test
     public void assertChannelStorageTotalIsUpdated() throws DeviceNotFoundException {
         String channnelID = SysteminfoBindingConstants.CHANNEL_STORAGE_TOTAL;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedStorageTotalValue = new DecimalType(2500);
+        QuantityType<DataAmount> mockedStorageTotalValue = new QuantityType<>(2500, Units.MEBIBYTE);
         when(mockedSystemInfo.getStorageTotal(DEFAULT_DEVICE_INDEX)).thenReturn(mockedStorageTotalValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -663,7 +671,7 @@ public void assertChannelStorageAvailablePercentIsUpdated() throws DeviceNotFoun
         String channnelID = SysteminfoBindingConstants.CHANNEL_STORAGE_AVAILABLE_PERCENT;
         String acceptedItemType = "Number";
 
-        DecimalType mockedStorageAvailablePercent = new DecimalType(20);
+        PercentType mockedStorageAvailablePercent = new PercentType(20);
         when(mockedSystemInfo.getStorageAvailablePercent(DEFAULT_DEVICE_INDEX))
                 .thenReturn(mockedStorageAvailablePercent);
 
@@ -714,9 +722,9 @@ public void assertChannelDriveSerialIsUpdated() throws DeviceNotFoundException {
     @Test
     public void assertChannelSensorsCpuTempIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_SENSORS_CPU_TEMPERATURE;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:Temperature";
 
-        DecimalType mockedSensorsCpuTemperatureValue = new DecimalType(60);
+        QuantityType<Temperature> mockedSensorsCpuTemperatureValue = new QuantityType<>(60, SIUnits.CELSIUS);
         when(mockedSystemInfo.getSensorsCpuTemperature()).thenReturn(mockedSensorsCpuTemperatureValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -727,9 +735,9 @@ public void assertChannelSensorsCpuTempIsUpdated() {
     @Test
     public void assertChannelSensorsCpuVoltageIsUpdated() {
         String channnelID = SysteminfoBindingConstants.CHANNEL_SENOSRS_CPU_VOLTAGE;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:ElectricPotential";
 
-        DecimalType mockedSensorsCpuVoltageValue = new DecimalType(1000);
+        QuantityType<ElectricPotential> mockedSensorsCpuVoltageValue = new QuantityType<>(1000, Units.VOLT);
         when(mockedSystemInfo.getSensorsCpuVoltage()).thenReturn(mockedSensorsCpuVoltageValue);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -767,7 +775,7 @@ public void assertChannelBatteryRemainingCapacityIsUpdated() throws DeviceNotFou
         String channnelID = SysteminfoBindingConstants.CHANNEL_BATTERY_REMAINING_CAPACITY;
         String acceptedItemType = "Number";
 
-        DecimalType mockedBatteryRemainingCapacity = new DecimalType(200);
+        PercentType mockedBatteryRemainingCapacity = new PercentType(20);
         when(mockedSystemInfo.getBatteryRemainingCapacity(DEFAULT_DEVICE_INDEX))
                 .thenReturn(mockedBatteryRemainingCapacity);
 
@@ -779,9 +787,9 @@ public void assertChannelBatteryRemainingCapacityIsUpdated() throws DeviceNotFou
     @Test
     public void assertChannelBatteryRemainingTimeIsUpdated() throws DeviceNotFoundException {
         String channnelID = SysteminfoBindingConstants.CHANNEL_BATTERY_REMAINING_TIME;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:Time";
 
-        DecimalType mockedBatteryRemainingTime = new DecimalType(3600);
+        QuantityType<Time> mockedBatteryRemainingTime = new QuantityType<>(3600, Units.MINUTE);
         when(mockedSystemInfo.getBatteryRemainingTime(DEFAULT_DEVICE_INDEX)).thenReturn(mockedBatteryRemainingTime);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -828,9 +836,9 @@ public void assertChannelNetworkMacIsUpdated() throws DeviceNotFoundException {
     @Test
     public void assertChannelNetworkDataSentIsUpdated() throws DeviceNotFoundException {
         String channnelID = SysteminfoBindingConstants.CHANNEL_NETWORK_DATA_SENT;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedNetworkDataSent = new DecimalType(1000);
+        QuantityType<DataAmount> mockedNetworkDataSent = new QuantityType<>(1000, Units.MEBIBYTE);
         when(mockedSystemInfo.getNetworkDataSent(DEFAULT_DEVICE_INDEX)).thenReturn(mockedNetworkDataSent);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -840,9 +848,9 @@ public void assertChannelNetworkDataSentIsUpdated() throws DeviceNotFoundExcepti
     @Test
     public void assertChannelNetworkDataReceivedIsUpdated() throws DeviceNotFoundException {
         String channnelID = SysteminfoBindingConstants.CHANNEL_NETWORK_DATA_RECEIVED;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
 
-        DecimalType mockedNetworkDataReceiveed = new DecimalType(800);
+        QuantityType<DataAmount> mockedNetworkDataReceiveed = new QuantityType<>(800, Units.MEBIBYTE);
         when(mockedSystemInfo.getNetworkDataReceived(DEFAULT_DEVICE_INDEX)).thenReturn(mockedNetworkDataReceiveed);
 
         initializeThingWithChannel(channnelID, acceptedItemType);
@@ -1048,11 +1056,11 @@ public void assertChannelProcessNameIsUpdatedWithPIDset() throws DeviceNotFoundE
     @Test
     public void assertChannelProcessMemoryIsUpdatedWithPIDset() throws DeviceNotFoundException {
         String channnelID = SysteminfoBindingConstants.CHANNEL_PROCESS_MEMORY;
-        String acceptedItemType = "Number";
+        String acceptedItemType = "Number:DataAmount";
         // The pid of the System idle process in Windows
         int pid = 0;
 
-        DecimalType mockedProcessMemory = new DecimalType(450);
+        QuantityType<DataAmount> mockedProcessMemory = new QuantityType<>(450, Units.MEBIBYTE);
         when(mockedSystemInfo.getProcessMemoryUsage(pid)).thenReturn(mockedProcessMemory);
 
         initializeThingWithChannelAndPID(channnelID, acceptedItemType, pid);

From 8c0925a63b2400309349895118108393e62c59e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Austvik?= <jaustvik@acm.org>
Date: Sun, 11 Dec 2022 10:10:37 +0100
Subject: [PATCH 28/48] Dont set read only temp file (#13905)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Because it breaks windows builds

Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
---
 .../nanoleaf/internal/layout/NanoleafLayoutTest.java  | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java b/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
index e7704879424c6..2400808d35e67 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
@@ -18,11 +18,7 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.FileAttribute;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
 import java.util.Collections;
-import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -66,14 +62,11 @@ public void testFile(String fileName) throws Exception {
         assertNotNull(result, "Should be able to render the layout: " + fileName);
         assertTrue(result.length > 0, "Should get content back, but got " + result.length + "bytes");
 
-        Set<PosixFilePermission> permissions = PosixFilePermissions.fromString("rw-r--r--");
-        FileAttribute<Set<PosixFilePermission>> attributes = PosixFilePermissions.asFileAttribute(permissions);
-        Path outFile = Files.createTempFile(temporaryDirectory, fileName.replace(".json", ""), ".png", attributes);
+        Path outFile = Files.createTempFile(temporaryDirectory, fileName.replace(".json", ""), ".png");
         Files.write(outFile, result);
 
         // For inspecting images on own computer
-        // Path permanentOutFile = Files.createFile(Path.of("/tmp", fileName.replace(".json", "") + ".png"),
-        // attributes);
+        // Path permanentOutFile = Files.createFile(Path.of("/tmp", fileName.replace(".json", "") + ".png"));
         // Files.write(permanentOutFile, result);
     }
 

From 015cc847bb1413962c229d5db54d61ddc5c5602e Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Sun, 11 Dec 2022 10:57:57 +0100
Subject: [PATCH 29/48] [transform/scale] Make unit tests compatible with
 Windows (#13910)

Fix #13900

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../internal/ScaleTransformServiceTest.java   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/bundles/org.openhab.transform.scale/src/test/java/org/openhab/transform/scale/internal/ScaleTransformServiceTest.java b/bundles/org.openhab.transform.scale/src/test/java/org/openhab/transform/scale/internal/ScaleTransformServiceTest.java
index 1a6095df8cd07..5acf8fc6c291e 100644
--- a/bundles/org.openhab.transform.scale/src/test/java/org/openhab/transform/scale/internal/ScaleTransformServiceTest.java
+++ b/bundles/org.openhab.transform.scale/src/test/java/org/openhab/transform/scale/internal/ScaleTransformServiceTest.java
@@ -13,8 +13,7 @@
 package org.openhab.transform.scale.internal;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -80,12 +79,12 @@ public void init() throws IOException {
     @Test
     public void testTransformByScale() throws TransformationException {
         // need to be sure we'll have the german version
-        String existingscale = "scale/humidex_de.scale";
+        String existingscale = "scale" + File.separator + "humidex_de.scale";
         String source = "10";
         String transformedResponse = processor.transform(existingscale, source);
         assertEquals("nicht wesentlich", transformedResponse);
 
-        existingscale = "scale/limits.scale";
+        existingscale = "scale" + File.separator + "limits.scale";
         source = "10";
         transformedResponse = processor.transform(existingscale, source);
         assertEquals("middle", transformedResponse);
@@ -93,7 +92,7 @@ public void testTransformByScale() throws TransformationException {
 
     @Test
     public void testTransformByScaleLimits() throws TransformationException {
-        String existingscale = "scale/limits.scale";
+        String existingscale = "scale" + File.separator + "limits.scale";
 
         // Testing upper bound opened range
         String source = "500";
@@ -106,7 +105,7 @@ public void testTransformByScaleLimits() throws TransformationException {
         assertEquals("low", transformedResponse);
 
         // Testing unfinite up and down range
-        existingscale = "scale/catchall.scale";
+        existingscale = "scale" + File.separator + "catchall.scale";
         source = "-10";
         transformedResponse = processor.transform(existingscale, source);
         assertEquals("catchall", transformedResponse);
@@ -116,7 +115,7 @@ public void testTransformByScaleLimits() throws TransformationException {
     public void testTransformByScaleUndef() throws TransformationException {
         // check that for undefined/non numeric value we return empty string
         // Issue #1107
-        String existingscale = "scale/humidex_fr.scale";
+        String existingscale = "scale" + File.separator + "humidex_fr.scale";
         String source = "-";
         assertThrows(TransformationException.class, () -> processor.transform(existingscale, source));
     }
@@ -125,7 +124,7 @@ public void testTransformByScaleUndef() throws TransformationException {
     public void testTransformByScaleErrorInBounds() throws TransformationException {
         // the tested file contains inputs that generate a conversion error of the bounds
         // of range
-        String existingscale = "scale/erroneous.scale";
+        String existingscale = "scale" + File.separator + "erroneous.scale";
         String source = "15";
         try {
             @SuppressWarnings("unused")
@@ -139,7 +138,7 @@ public void testTransformByScaleErrorInBounds() throws TransformationException {
     @Test
     public void testTransformByScaleErrorInValue() throws TransformationException {
         // checks that an error is raised when trying to scale an erroneous value
-        String existingscale = "scale/evaluationorder.scale";
+        String existingscale = "scale" + File.separator + "evaluationorder.scale";
         String source = "azerty";
         assertThrows(TransformationException.class, () -> processor.transform(existingscale, source));
     }
@@ -147,7 +146,7 @@ public void testTransformByScaleErrorInValue() throws TransformationException {
     @Test
     public void testEvaluationOrder() throws TransformationException {
         // Ensures that only first matching scale as presented in the file is taken in account
-        String evaluationOrder = "scale/evaluationorder.scale";
+        String evaluationOrder = "scale" + File.separator + "evaluationorder.scale";
         // This value matches two lines of the scale file
         String source = "12";
 
@@ -158,7 +157,7 @@ public void testEvaluationOrder() throws TransformationException {
     @Test
     public void testTransformQuantityType() throws TransformationException {
         QuantityType<Dimensionless> airQuality = new QuantityType<>("992 ppm");
-        String aqScaleFile = "scale/netatmo_aq.scale";
+        String aqScaleFile = "scale" + File.separator + "netatmo_aq.scale";
         String expected = "Correcte (992 ppm) !";
 
         String transformedResponse = processor.transform(aqScaleFile, airQuality.toString());
@@ -168,7 +167,7 @@ public void testTransformQuantityType() throws TransformationException {
     @Test
     public void testCatchNonNumericValue() throws TransformationException {
         // checks that an error is raised when trying to scale an erroneous value
-        String existingscale = "scale/catchnonnumeric.scale";
+        String existingscale = "scale" + File.separator + "catchnonnumeric.scale";
         String source = "azerty";
         String transformedResponse = processor.transform(existingscale, source);
         assertEquals("Non Numeric", transformedResponse);
@@ -176,7 +175,7 @@ public void testCatchNonNumericValue() throws TransformationException {
 
     @Test
     public void testTransformAndFormat() throws TransformationException {
-        String existingscale = "scale/netatmo_aq.scale";
+        String existingscale = "scale" + File.separator + "netatmo_aq.scale";
         String source = "992";
         String transformedResponse = processor.transform(existingscale, source);
         assertEquals("Correcte (992) !", transformedResponse);
@@ -184,7 +183,7 @@ public void testTransformAndFormat() throws TransformationException {
 
     @Test
     public void testValueExceedsRange() throws TransformationException {
-        String existingscale = "scale/humidex.scale";
+        String existingscale = "scale" + File.separator + "humidex.scale";
         String source = "200";
         assertThrows(TransformationException.class, () -> processor.transform(existingscale, source));
     }

From 48b471a313a099e57952002f01b8accdf32e2773 Mon Sep 17 00:00:00 2001
From: boc-tothefuture <broconne+github@gmail.com>
Date: Sun, 11 Dec 2022 05:00:13 -0500
Subject: [PATCH 30/48] [jrubyscripting] Reverses order of class imports and
 ScriptEngine puts calls to fix incompatability introduced after M5 (#13904)

Signed-off-by: Brian OConnell <broconne@gmail.com>
---
 .../internal/JRubyScriptEngineFactory.java      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineFactory.java b/bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineFactory.java
index a53fb534bb1f6..62030cc19c74c 100644
--- a/bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineFactory.java
+++ b/bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyScriptEngineFactory.java
@@ -61,7 +61,8 @@ public class JRubyScriptEngineFactory extends AbstractScriptEngineFactory {
 
     private JRubyDependencyTracker jrubyDependencyTracker;
 
-    // Adds $ in front of a set of variables so that Ruby recognizes them as global variables
+    // Adds $ in front of a set of variables so that Ruby recognizes them as global
+    // variables
     private static Map.Entry<String, Object> mapGlobalPresets(Map.Entry<String, Object> entry) {
         if (Character.isLowerCase(entry.getKey().charAt(0)) && !(entry.getValue() instanceof Class)
                 && !(entry.getValue() instanceof Enum)) {
@@ -98,7 +99,8 @@ public List<String> getScriptTypes() {
 
     @Override
     public void scopeValues(ScriptEngine scriptEngine, Map<String, Object> scopeValues) {
-        // Empty comments prevent the formatter from breaking up the correct streams chaining
+        // Empty comments prevent the formatter from breaking up the correct streams
+        // chaining
         logger.debug("Scope Values: {}", scopeValues);
         Map<String, Object> filteredScopeValues = //
                 scopeValues //
@@ -113,20 +115,23 @@ public void scopeValues(ScriptEngine scriptEngine, Map<String, Object> scopeValu
                         .collect(Collectors.partitioningBy(entry -> (entry.getValue() instanceof Class),
                                 Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
 
-        importClassesToRuby(scriptEngine, partitionedMap.getOrDefault(true, new HashMap<>()));
         super.scopeValues(scriptEngine, partitionedMap.getOrDefault(false, new HashMap<>()));
+        importClassesToRuby(scriptEngine, partitionedMap.getOrDefault(true, new HashMap<>()));
 
         Object scriptExtension = scopeValues.get("scriptExtension");
         if (scriptExtension instanceof ScriptExtensionManagerWrapper) {
             ScriptExtensionManagerWrapper wrapper = (ScriptExtensionManagerWrapper) scriptExtension;
             // we inject like this instead of using the script context, because
-            // this is executed _before_ the dependency tracker is added to the script context.
+            // this is executed _before_ the dependency tracker is added to the script
+            // context.
             // But we need this set up before we inject our requires
             scriptEngine.put("$dependencyListener", jrubyDependencyTracker.getTracker(wrapper.getScriptIdentifier()));
         }
 
-        // scopeValues is called twice. The first call only passed 'se'. The second call passed the rest of the
-        // presets, including 'ir'. We wait for the second call before running the require statements.
+        // scopeValues is called twice. The first call only passed 'se'. The second call
+        // passed the rest of the
+        // presets, including 'ir'. We wait for the second call before running the
+        // require statements.
         if (scopeValues.containsKey("ir")) {
             configuration.injectRequire(scriptEngine);
         }

From 45052a810c257829954dc4f9a9d9729774eb2297 Mon Sep 17 00:00:00 2001
From: Ondrej Pecta <opecta@gmail.com>
Date: Sun, 11 Dec 2022 12:07:25 +0100
Subject: [PATCH 31/48] [somfytahoma] added support for the control over the
 LAN (local mode) (#13411)

* [somfytahoma] added support for the control over the LAN (local mode)

Signed-off-by: Ondrej Pecta <opecta@gmail.com>
---
 .../org.openhab.binding.somfytahoma/README.md |  42 ++-
 .../internal/SomfyTahomaBindingConstants.java |  15 +-
 .../internal/config/SomfyTahomaConfig.java    |  32 ++
 .../SomfyTahomaItemDiscoveryService.java      |  64 ++--
 .../SomfyTahomaMDNSDiscoveryListener.java     |  84 +++++
 .../handler/SomfyTahomaBridgeHandler.java     | 324 +++++++++++++++---
 .../SomfyTahomaLightSensorHandler.java        |   4 +-
 .../SomfyTahomaTemperatureSensorHandler.java  |   7 +-
 .../internal/model/SomfyTahomaDevice.java     |  14 -
 .../model/SomfyTahomaDeviceDefinition.java    |  16 +
 .../internal/model/SomfyTahomaError.java      |  35 ++
 .../internal/model/SomfyTahomaLocalToken.java |  34 ++
 .../model/SomfyTahomaLoginResponse.java       |   6 +
 .../model/SomfyTahomaStatusResponse.java      |   5 +
 .../model/SomfyTahomaTokenReponse.java        |  29 ++
 .../main/resources/OH-INF/config/config.xml   |  30 ++
 .../OH-INF/i18n/somfytahoma.properties        |   8 +
 17 files changed, 646 insertions(+), 103 deletions(-)
 create mode 100644 bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaMDNSDiscoveryListener.java
 create mode 100644 bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaError.java
 create mode 100644 bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaLocalToken.java
 create mode 100644 bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaTokenReponse.java

diff --git a/bundles/org.openhab.binding.somfytahoma/README.md b/bundles/org.openhab.binding.somfytahoma/README.md
index caf52f72a583f..8dd228bc9f550 100644
--- a/bundles/org.openhab.binding.somfytahoma/README.md
+++ b/bundles/org.openhab.binding.somfytahoma/README.md
@@ -45,7 +45,7 @@ Any home automation system based on the OverKiz API is potentially supported.
 - water heater system (monitor and control)
 - Yutaki heat pump consisting of heat pump, heating control and hot water tank (controls and a lot of states; it is tested with components RAS-4WHNPE, RWM-4.ONE, DHWT-300S-3.0H2E)
 
-Both Somfy Tahoma and Somfy Connexoon gateways have been confirmed working.
+Both Somfy Tahoma and Somfy Connexoon gateways have been confirmed working in the cloud mode.
 
 ## Discovery
 
@@ -59,7 +59,41 @@ If you are missing some device, check the debug log during the discovery and cre
 
 ## Thing Configuration
 
-To retrieve thing configuration and url parameter, just add the automatically discovered device from your inbox and copy its values from thing edit page. (the url parameter is visible on edit page only)
+### bridge
+
+| Parameter      | Parameter ID  | Required/Optional | Description                                                                          |
+|----------------|---------------|-------------------|--------------------------------------------------------------------------------------|
+| Cloud portal   | cloudPortal   | Optional          | Cloud portal to connect to                                                           |
+| Email address  | email         | Required          | Email address for the portal                                                         |
+| Password       | password      | Required          | Password for the portal                                                              |
+| Refresh        | refresh       | Optional          | Refresh time for polling events (in seconds)                                         |
+| Status timeout | statusTimeout | Optional          | Reconciliation timeout after which the status is refreshed (in seconds)              |
+| Retries        | retries       | Optional          | Specifies the number of retries when command execution                               |
+| Retry delay    | retryDelay    | Optional          | Delay in milliseconds between subsequent retries after a command failure             |
+| Developer mode | devMode       | Optional          | Enables the direct control of your devices over the lan using the local API endpoint |
+| Gateway IP     | ip            | Optional          | Local IP address of gateway, relevant only if developer mode is enabled              |
+| Gateway PIN    | pin           | Optional          | Gateway PIN in format ABCD-EFGH-IJKL, relevant only if developer mode is enabled     |
+| Local token    | token         | Optional          | Token for local communication, relevant only if developer mode is enabled            |
+
+For more information about the developer mode please see https://github.com/Somfy-Developer/Somfy-TaHoma-Developer-Mode.
+If the gateway ip or pin are not provided, the binding tries to detect it automatically and saves it into the configuration.
+If the local token is not provided, the binding creates the local token automatically and saves it into the configuration.
+Please note that the action groups (scenarios) control does not work in local mode due to missing support in the gateway firmware.
+The gateway support for the developer mode is limited as well, so far Connexoon gateways do not support the developer mode.
+
+### gateway
+
+| Parameter  | Parameter ID | Required/Optional | Description                               |
+|------------|--------------|-------------------|-------------------------------------------|
+| Gateway id | id           | Required          | ID of your gateway (sometimes called pin) |
+
+### other devices
+
+| Parameter  | Parameter ID | Required/Optional | Description                  |
+|------------|--------------|-------------------|------------------------------|
+| Device URL | url          | Required          | The identifier of the device |
+
+To retrieve the url parameter or gateway id, just add the automatically discovered device from your inbox and copy its values from thing edit page. (the url parameter is visible on edit page only)
 Please see the example below.
 
 ## Channels
@@ -73,7 +107,7 @@ Please see the example below.
 | gate                                                                               | gate_state                      | get state of your gate (open, closed, pedestrian)                                                                                                                                                                                 |
 | gate                                                                               | gate_position                   | get position (0-100%) of your gate (where supported)                                                                                                                                                                              |
 | roller shutter, shutter, screen, ven. blind, garage door, awning, pergola, curtain | control                         | device controller which reacts to commands UP/DOWN/ON/OFF/OPEN/CLOSE/MY/STOP + closure 0-100                                                                                                                                      |
-| roller shutter                                                                     | moving                          | Indicates if the device is currently operating a command                                                                                                                                                            |
+| roller shutter                                                                     | moving                          | Indicates if the device is currently operating a command                                                                                                                                                                          |
 | window                                                                             | control                         | device controller which reacts to commands UP/DOWN/ON/OFF/OPEN/CLOSE/STOP + closure 0-100                                                                                                                                         |
 | silent roller shutter                                                              | silent_control                  | similar to control channel but in silent mode                                                                                                                                                                                     |
 | venetian blind, adjustable slats roller shutter, bioclimatic pergola               | orientation                     | percentual orientation of the blind's slats, it can have value 0-100. For IO Homecontrol devices only (non RTS)                                                                                                                   |
@@ -150,7 +184,7 @@ Please see the example below.
 | hitachi (yutaki) air to water heating zone                                         | zone_mode                       | sets the zone mode (Auto, Manual)                                                                                                                                                                                                 |
 | hitachi (yutaki) air to water heating zone                                         | thermostat_setting_zone1        | controls the thermostat setting for the zone 1                                                                                                                                                                                    |
 | hitachi (yutaki) air to water heating zone                                         | wh_setting_temp_zone1           | controls the water heating setting temperature for the zone 1                                                                                                                                                                     |
-| hitachi (yutaki) air to water heating zone                                         | room_ambient_temp_zone1         | controls the room ambient temperature for the zone 1                                                                                                                                                                               |
+| hitachi (yutaki) air to water heating zone                                         | room_ambient_temp_zone1         | controls the room ambient temperature for the zone 1                                                                                                                                                                              |
 | hitachi (yutaki) domestic hot water                                                | anti_legionella                 | controls the anti legionella mode (Run, Stop)                                                                                                                                                                                     |
 | hitachi (yutaki) domestic hot water                                                | anti_legionella_temp            | controls the anti legionella temperature                                                                                                                                                                                          |
 | hitachi (yutaki) domestic hot water                                                | target_boost_mode               | controls the boost mode (No request, Enabled, Disabled)                                                                                                                                                                           |
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/SomfyTahomaBindingConstants.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/SomfyTahomaBindingConstants.java
index 394f18669c5e6..4570882dc743f 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/SomfyTahomaBindingConstants.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/SomfyTahomaBindingConstants.java
@@ -291,7 +291,6 @@ public class SomfyTahomaBindingConstants {
     public static final String POWER_HEAT_PUMP = "power_heatpump";
     public static final String POWER_HEAT_ELEC = "power_heatelec";
     public static final String WATER_HEATER_MODE = "mode";
-    public static final String WATER_TEMPERATURE = "water_temperature";
     public static final String ELECTRIC_BOOSTER_OPERATING_TIME = "electric_booster_operating_time";
     public static final String SHOWERS = "showers";
 
@@ -367,12 +366,15 @@ public class SomfyTahomaBindingConstants {
     public static final String API_BASE_URL = "/enduser-mobile-web/enduserAPI/";
     public static final String EVENTS_URL = "events/";
     public static final String SETUP_URL = "setup/";
+
+    public static final String CONFIG_URL = "config/";
     public static final String GATEWAYS_URL = SETUP_URL + "gateways/";
     public static final String DEVICES_URL = SETUP_URL + "devices/";
     public static final String REFRESH_URL = DEVICES_URL + "states/refresh";
     public static final String EXEC_URL = "exec/";
     public static final String DELETE_URL = EXEC_URL + "current/setup/";
-    public static final String TAHOMA_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36";
+    public static final String LOCAL_TOKENS_URL = "/local/tokens/";
+    public static final String TAHOMA_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.82 Safari/537.36";
     public static final int TAHOMA_TIMEOUT = 5;
     public static final String UNAUTHORIZED = "Not logged in";
     public static final int TYPE_NONE = 0;
@@ -381,9 +383,13 @@ public class SomfyTahomaBindingConstants {
     public static final int TYPE_STRING = 3;
     public static final int TYPE_BOOLEAN = 6;
     public static final String UNAVAILABLE = "unavailable";
-    public static final String AUTHENTICATION_CHALLENGE = "HTTP protocol violation: Authentication challenge without WWW-Authenticate header";
-    public static final String AUTHENTICATION_OAUTH_GRANT_ERROR = "Provided Authorization Grant is invalid.";
+    public static final String TEMPORARILY_BANNED = "Too many attempts with an invalid token, temporarily banned.";
+
     public static final String TOO_MANY_REQUESTS = "Too many requests, try again later";
+    public static final String EVENT_LISTENER_TIMEOUT = "No registered event listener";
+    public static final String AUTHENTICATION_OAUTH_GRANT_ERROR = "Provided Authorization Grant is invalid.";
+    public static final String AUTHENTICATION_OAUTH_INVALID_GRANT = "error.invalid.grant";
+    public static final String OPENHAB_TOKEN = "openHAB token";
     public static final int SUSPEND_TIME = 120;
     public static final int RECONCILIATION_TIME = 600;
 
@@ -449,6 +455,7 @@ public class SomfyTahomaBindingConstants {
     public static final String RADIO_PART_BATTERY_STATE = "io:MaintenanceRadioPartBatteryState";
     public static final String SENSOR_PART_BATTERY_STATE = "io:MaintenanceSensorPartBatteryState";
     public static final String ZWAVE_SET_POINT_TYPE_STATE = "zwave:SetPointTypeState";
+    public static final String LUMINANCE_STATE = "core:LuminanceState";
 
     // supported uiClasses
     public static final String CLASS_ROLLER_SHUTTER = "RollerShutter";
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/config/SomfyTahomaConfig.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/config/SomfyTahomaConfig.java
index 46fe961773b17..04fa1c653b967 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/config/SomfyTahomaConfig.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/config/SomfyTahomaConfig.java
@@ -31,6 +31,10 @@ public class SomfyTahomaConfig {
     private int statusTimeout = 300;
     private int retries = 10;
     private int retryDelay = 1000;
+    private boolean devMode = false;
+    private String pin = "";
+    private String ip = "";
+    private String token = "";
 
     public String getCloudPortal() {
         return cloudPortal;
@@ -60,6 +64,22 @@ public int getRetryDelay() {
         return retryDelay;
     }
 
+    public boolean isDevMode() {
+        return devMode;
+    }
+
+    public String getPin() {
+        return pin;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
     public void setCloudPortal(String cloudPortal) {
         this.cloudPortal = cloudPortal;
     }
@@ -79,4 +99,16 @@ public void setRetries(int retries) {
     public void setRetryDelay(int retryDelay) {
         this.retryDelay = retryDelay;
     }
+
+    public void setPin(String pin) {
+        this.pin = pin;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
 }
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaItemDiscoveryService.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaItemDiscoveryService.java
index c19c52075c65f..ae08b5c000725 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaItemDiscoveryService.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaItemDiscoveryService.java
@@ -104,7 +104,7 @@ protected void startBackgroundDiscovery() {
     protected void stopBackgroundDiscovery() {
         logger.debug("Stopping SomfyTahoma background discovery");
         ScheduledFuture<?> localDiscoveryJob = discoveryJob;
-        if (localDiscoveryJob != null && !localDiscoveryJob.isCancelled()) {
+        if (localDiscoveryJob != null) {
             localDiscoveryJob.cancel(true);
         }
     }
@@ -137,14 +137,17 @@ private synchronized void runDiscovery() {
                 gatewayDiscovered(gw);
             }
 
-            List<SomfyTahomaActionGroup> actions = localBridgeHandler.listActionGroups();
+            // local mode does not have action groups
+            if (!localBridgeHandler.isDevModeReady()) {
+                List<SomfyTahomaActionGroup> actions = localBridgeHandler.listActionGroups();
 
-            for (SomfyTahomaActionGroup group : actions) {
-                String oid = group.getOid();
-                String label = group.getLabel();
+                for (SomfyTahomaActionGroup group : actions) {
+                    String oid = group.getOid();
+                    String label = group.getLabel();
 
-                // actiongroups use oid as deviceURL
-                actionGroupDiscovered(label, oid, oid);
+                    // actiongroups use oid as deviceURL
+                    actionGroupDiscovered(label, oid);
+                }
             }
         } else {
             logger.debug("Cannot start discovery since the bridge is not online!");
@@ -154,7 +157,8 @@ private synchronized void runDiscovery() {
     private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
         logger.debug("url: {}", device.getDeviceURL());
         String place = getPlaceLabel(setup, device.getPlaceOID());
-        switch (device.getUiClass()) {
+        String widget = device.getDefinition().getWidgetName();
+        switch (device.getDefinition().getUiClass()) {
             case CLASS_AWNING:
                 // widget: PositionableHorizontalAwning
                 // widget: DynamicAwning
@@ -180,7 +184,7 @@ private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
                 deviceDiscovered(device, THING_TYPE_GARAGEDOOR, place);
                 break;
             case CLASS_LIGHT:
-                if ("DimmerLight".equals(device.getWidget()) || "DynamicLight".equals(device.getWidget())) {
+                if ("DimmerLight".equals(widget) || "DynamicLight".equals(widget)) {
                     // widget: DimmerLight
                     // widget: DynamicLight
                     deviceDiscovered(device, THING_TYPE_DIMMER_LIGHT, place);
@@ -243,7 +247,7 @@ private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
                 if (device.getDeviceURL().startsWith("internal:")) {
                     // widget: TSKAlarmController
                     deviceDiscovered(device, THING_TYPE_INTERNAL_ALARM, place);
-                } else if ("MyFoxAlarmController".equals(device.getWidget())) {
+                } else if ("MyFoxAlarmController".equals(widget)) {
                     // widget: MyFoxAlarmController
                     deviceDiscovered(device, THING_TYPE_MYFOX_ALARM, place);
                 } else {
@@ -256,9 +260,9 @@ private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
                 }
                 break;
             case CLASS_HEATING_SYSTEM:
-                if ("SomfyThermostat".equals(device.getWidget())) {
+                if ("SomfyThermostat".equals(widget)) {
                     deviceDiscovered(device, THING_TYPE_THERMOSTAT, place);
-                } else if ("ValveHeatingTemperatureInterface".equals(device.getWidget())) {
+                } else if ("ValveHeatingTemperatureInterface".equals(widget)) {
                     deviceDiscovered(device, THING_TYPE_VALVE_HEATING_SYSTEM, place);
                 } else if (isOnOffHeatingSystem(device)) {
                     deviceDiscovered(device, THING_TYPE_ONOFF_HEATING_SYSTEM, place);
@@ -269,7 +273,7 @@ private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
                 }
                 break;
             case CLASS_EXTERIOR_HEATING_SYSTEM:
-                if ("DimmerExteriorHeating".equals(device.getWidget())) {
+                if ("DimmerExteriorHeating".equals(widget)) {
                     // widget: DimmerExteriorHeating
                     deviceDiscovered(device, THING_TYPE_EXTERIOR_HEATING_SYSTEM, place);
                 } else {
@@ -288,7 +292,7 @@ private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
                 deviceDiscovered(device, THING_TYPE_DOOR_LOCK, place);
                 break;
             case CLASS_PERGOLA:
-                if ("BioclimaticPergola".equals(device.getWidget())) {
+                if ("BioclimaticPergola".equals(widget)) {
                     // widget: BioclimaticPergola
                     deviceDiscovered(device, THING_TYPE_BIOCLIMATIC_PERGOLA, place);
                 } else {
@@ -315,7 +319,7 @@ private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
                 break;
             case CLASS_WATER_HEATING_SYSTEM:
                 // widget: DomesticHotWaterProduction
-                if ("DomesticHotWaterProduction".equals(device.getWidget())) {
+                if ("DomesticHotWaterProduction".equals(widget)) {
                     deviceDiscovered(device, THING_TYPE_WATERHEATINGSYSTEM, place);
                 } else {
                     logUnsupportedDevice(device);
@@ -340,13 +344,13 @@ private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
                 }
                 break;
             case CLASS_HITACHI_HEATING_SYSTEM:
-                if ("HitachiAirToWaterHeatingZone".equals(device.getWidget())) {
+                if ("HitachiAirToWaterHeatingZone".equals(widget)) {
                     // widget: HitachiAirToWaterHeatingZone
                     deviceDiscovered(device, THING_TYPE_HITACHI_ATWHZ, place);
-                } else if ("HitachiAirToWaterMainComponent".equals(device.getWidget())) {
+                } else if ("HitachiAirToWaterMainComponent".equals(widget)) {
                     // widget: HitachiAirToWaterMainComponent
                     deviceDiscovered(device, THING_TYPE_HITACHI_ATWMC, place);
-                } else if ("HitachiDHW".equals(device.getWidget())) {
+                } else if ("HitachiDHW".equals(widget)) {
                     // widget: HitachiDHW
                     deviceDiscovered(device, THING_TYPE_HITACHI_DHW, place);
                 } else {
@@ -354,7 +358,7 @@ private void discoverDevice(SomfyTahomaDevice device, SomfyTahomaSetup setup) {
                 }
                 break;
             case CLASS_RAIN_SENSOR:
-                if ("RainSensor".equals(device.getWidget())) {
+                if ("RainSensor".equals(widget)) {
                     // widget: RainSensor
                     deviceDiscovered(device, THING_TYPE_RAINSENSOR, place);
                 } else {
@@ -391,8 +395,8 @@ private boolean isStateLess(SomfyTahomaDevice device) {
 
     private void logUnsupportedDevice(SomfyTahomaDevice device) {
         if (!isStateLess(device)) {
-            logger.debug("Detected a new unsupported device: {} with widgetName: {}", device.getUiClass(),
-                    device.getWidget());
+            logger.debug("Detected a new unsupported device: {} with widgetName: {}",
+                    device.getDefinition().getUiClass(), device.getDefinition().getWidgetName());
             logger.debug("If you want to add the support, please create a new issue and attach the information below");
             logger.debug("Device definition:\n{}", device.getDefinition());
 
@@ -417,11 +421,11 @@ private boolean hasEnergyConsumption(SomfyTahomaDevice device) {
     }
 
     private boolean isSilentRollerShutter(SomfyTahomaDevice device) {
-        return "PositionableRollerShutterWithLowSpeedManagement".equals(device.getWidget());
+        return "PositionableRollerShutterWithLowSpeedManagement".equals(device.getDefinition().getWidgetName());
     }
 
     private boolean isUnoRollerShutter(SomfyTahomaDevice device) {
-        return "PositionableRollerShutterUno".equals(device.getWidget());
+        return "PositionableRollerShutterUno".equals(device.getDefinition().getWidgetName());
     }
 
     private boolean isOnOffHeatingSystem(SomfyTahomaDevice device) {
@@ -441,11 +445,10 @@ private void deviceDiscovered(SomfyTahomaDevice device, ThingTypeUID thingTypeUI
         if (place != null && !place.isBlank()) {
             label += " (" + place + ")";
         }
-        deviceDiscovered(label, device.getDeviceURL(), device.getOid(), thingTypeUID,
-                hasState(device, RSSI_LEVEL_STATE));
+        deviceDiscovered(label, device.getDeviceURL(), thingTypeUID, hasState(device, RSSI_LEVEL_STATE));
     }
 
-    private void deviceDiscovered(String label, String deviceURL, String oid, ThingTypeUID thingTypeUID, boolean rssi) {
+    private void deviceDiscovered(String label, String deviceURL, ThingTypeUID thingTypeUID, boolean rssi) {
         Map<String, Object> properties = new HashMap<>();
         properties.put("url", deviceURL);
         properties.put(NAME_STATE, label);
@@ -455,17 +458,18 @@ private void deviceDiscovered(String label, String deviceURL, String oid, ThingT
 
         SomfyTahomaBridgeHandler localBridgeHandler = bridgeHandler;
         if (localBridgeHandler != null) {
-            ThingUID thingUID = new ThingUID(thingTypeUID, localBridgeHandler.getThing().getUID(), oid);
+            ThingUID thingUID = new ThingUID(thingTypeUID, localBridgeHandler.getThing().getUID(),
+                    deviceURL.replaceAll("[^a-zA-Z0-9_]", ""));
 
-            logger.debug("Detected a/an {} - label: {} oid: {}", thingTypeUID.getId(), label, oid);
+            logger.debug("Detected a/an {} - label: {} device URL: {}", thingTypeUID.getId(), label, deviceURL);
             thingDiscovered(DiscoveryResultBuilder.create(thingUID).withThingType(thingTypeUID)
                     .withProperties(properties).withRepresentationProperty("url").withLabel(label)
                     .withBridge(localBridgeHandler.getThing().getUID()).build());
         }
     }
 
-    private void actionGroupDiscovered(String label, String deviceURL, String oid) {
-        deviceDiscovered(label, deviceURL, oid, THING_TYPE_ACTIONGROUP, false);
+    private void actionGroupDiscovered(String label, String deviceURL) {
+        deviceDiscovered(label, deviceURL, THING_TYPE_ACTIONGROUP, false);
     }
 
     private void gatewayDiscovered(SomfyTahomaGateway gw) {
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaMDNSDiscoveryListener.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaMDNSDiscoveryListener.java
new file mode 100644
index 0000000000000..96ea85bbbcbff
--- /dev/null
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaMDNSDiscoveryListener.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.somfytahoma.internal.discovery;
+
+import java.util.Enumeration;
+
+import javax.jmdns.ServiceEvent;
+import javax.jmdns.ServiceInfo;
+import javax.jmdns.ServiceListener;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.binding.somfytahoma.internal.handler.SomfyTahomaBridgeHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The {@link SomfyTahomaMDNSDiscoveryListener} represents a mDNS listener
+ * for a mDNS discovery.
+ *
+ * @author Ondrej Pecta - Initial contribution
+ */
+@NonNullByDefault
+public class SomfyTahomaMDNSDiscoveryListener implements ServiceListener {
+
+    private final Logger logger = LoggerFactory.getLogger(SomfyTahomaMDNSDiscoveryListener.class);
+    private final SomfyTahomaBridgeHandler handler;
+
+    public SomfyTahomaMDNSDiscoveryListener(SomfyTahomaBridgeHandler handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public void serviceAdded(@Nullable ServiceEvent event) {
+        if (event != null) {
+            logger.trace("Service added: {}", event.getInfo());
+        }
+    }
+
+    @Override
+    public void serviceRemoved(@Nullable ServiceEvent event) {
+        if (event != null) {
+            logger.trace("Service removed: {}", event.getInfo());
+        }
+    }
+
+    @Override
+    public void serviceResolved(@Nullable ServiceEvent event) {
+        if (event == null || event.getInfo() == null) {
+            logger.debug("Null event received");
+            return;
+        }
+
+        ServiceInfo info = event.getInfo();
+        logger.trace("Service resolved: {}", info);
+        if (info.getInet4Addresses().length > 0) {
+            logger.debug("Server address: {}", info.getInet4Addresses()[0].getHostAddress());
+            handler.setGatewayIPAddress(info.getInet4Addresses()[0].getHostAddress());
+        }
+        Enumeration<String> e = info.getPropertyNames();
+        if (e != null) {
+            while (e.hasMoreElements()) {
+                String name = e.nextElement();
+                if ("gateway_pin".equals(name)) {
+                    String pin = info.getPropertyString(name);
+                    logger.debug("Gateway PIN: {}", pin);
+                    handler.setGatewayPin(pin);
+                    handler.updateConfiguration();
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java
index 950146b52e452..2f7e9d69f8fec 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java
@@ -14,6 +14,8 @@
 
 import static org.openhab.binding.somfytahoma.internal.SomfyTahomaBindingConstants.*;
 
+import java.io.IOException;
+import java.net.InetAddress;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -28,23 +30,29 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import javax.jmdns.JmDNS;
 import javax.ws.rs.core.MediaType;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.util.StringContentProvider;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.openhab.binding.somfytahoma.internal.config.SomfyTahomaConfig;
 import org.openhab.binding.somfytahoma.internal.discovery.SomfyTahomaItemDiscoveryService;
+import org.openhab.binding.somfytahoma.internal.discovery.SomfyTahomaMDNSDiscoveryListener;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaAction;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaActionGroup;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaApplyResponse;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaDevice;
+import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaError;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaEvent;
+import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaLocalToken;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaLoginResponse;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaOauth2Error;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaOauth2Reponse;
@@ -53,7 +61,9 @@
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaState;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaStatus;
 import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaStatusResponse;
+import org.openhab.binding.somfytahoma.internal.model.SomfyTahomaTokenReponse;
 import org.openhab.core.cache.ExpiringCache;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ChannelUID;
@@ -86,7 +96,7 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
     /**
      * The shared HttpClient
      */
-    private final HttpClient httpClient;
+    private @Nullable HttpClient httpClient;
 
     /**
      * Future to poll for updates
@@ -103,6 +113,11 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
      */
     private @Nullable ScheduledFuture<?> reconciliationFuture;
 
+    /**
+     * Future for postponed login
+     */
+    private @Nullable ScheduledFuture<?> loginFuture;
+
     // List of futures used for command retries
     private Collection<ScheduledFuture<?>> retryFutures = new ConcurrentLinkedQueue<ScheduledFuture<?>>();
 
@@ -120,6 +135,9 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
     // Reconciliation flag
     private boolean reconciliation = false;
 
+    // Cloud fallback
+    private boolean cloudFallback = false;
+
     /**
      * Our configuration
      */
@@ -130,6 +148,8 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
      */
     private String eventsId = "";
 
+    private String localToken = "";
+
     private Map<String, SomfyTahomaDevice> devicePlaces = new HashMap<>();
 
     private ExpiringCache<List<SomfyTahomaDevice>> cachedDevices = new ExpiringCache<>(Duration.ofSeconds(30),
@@ -138,9 +158,11 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler {
     // Gson & parser
     private final Gson gson = new Gson();
 
+    private final HttpClientFactory httpClientFactory;
+
     public SomfyTahomaBridgeHandler(Bridge thing, HttpClientFactory httpClientFactory) {
         super(thing);
-        this.httpClient = httpClientFactory.createHttpClient("somfy_" + thing.getUID().getId());
+        this.httpClientFactory = httpClientFactory;
     }
 
     @Override
@@ -149,7 +171,24 @@ public void handleCommand(ChannelUID channelUID, Command command) {
 
     @Override
     public void initialize() {
+        updateStatus(ThingStatus.UNKNOWN);
         thingConfig = getConfigAs(SomfyTahomaConfig.class);
+        createHttpClient();
+
+        scheduler.execute(() -> {
+            login();
+            initPolling();
+            logger.debug("Initialize done...");
+        });
+    }
+
+    private void createHttpClient() {
+        // let's create the right http client
+        if (thingConfig.isDevMode()) {
+            this.httpClient = new HttpClient(new SslContextFactory.Client(true));
+        } else {
+            this.httpClient = httpClientFactory.createHttpClient("somfy_" + thing.getUID().getId());
+        }
 
         try {
             httpClient.start();
@@ -157,12 +196,8 @@ public void initialize() {
             logger.debug("Cannot start http client for: {}", thing.getBridgeUID().getId(), e);
             return;
         }
-
-        scheduler.execute(() -> {
-            login();
-            initPolling();
-            logger.debug("Initialize done...");
-        });
+        // Remove the WWWAuth protocol handler since Tahoma is not fully compliant
+        httpClient.getProtocolHandlers().remove(WWWAuthenticationProtocolHandler.NAME);
     }
 
     /**
@@ -214,9 +249,9 @@ public synchronized void login() {
         }
 
         reLoginNeeded = false;
+        cloudFallback = false;
 
         try {
-
             String urlParameters = "";
 
             // if cozytouch, must use oauth server
@@ -239,31 +274,37 @@ public synchronized void login() {
 
             SomfyTahomaLoginResponse data = gson.fromJson(response.getContentAsString(),
                     SomfyTahomaLoginResponse.class);
+
             if (data == null) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
                         "Received invalid data (login)");
-            } else if (data.isSuccess()) {
-                logger.debug("SomfyTahoma version: {}", data.getVersion());
+            } else if (!data.getErrorCode().isEmpty()) {
+                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, data.getError());
+                if (data.getError().startsWith(TOO_MANY_REQUESTS)) {
+                    setTooManyRequests();
+                }
+            } else {
+                if (thingConfig.isDevMode()) {
+                    initializeLocalMode();
+                }
+
                 String id = registerEvents();
                 if (id != null && !UNAUTHORIZED.equals(id)) {
                     eventsId = id;
                     logger.debug("Events id: {}", eventsId);
-                    updateStatus(ThingStatus.ONLINE);
+                    updateStatus(ThingStatus.ONLINE, ThingStatusDetail.NONE,
+                            isDevModeReady() ? "LAN mode" : cloudFallback ? "Cloud mode fallback" : "Cloud mode");
                 } else {
                     logger.debug("Events id error: {}", id);
-                }
-            } else {
-                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
-                        "Error logging in: " + data.getError());
-                if (data.getError().startsWith(TOO_MANY_REQUESTS)) {
-                    setTooManyRequests();
+                    updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
+                            "unable to register events");
                 }
             }
         } catch (JsonSyntaxException e) {
             logger.debug("Received invalid data (login)", e);
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Received invalid data (login)");
         } catch (ExecutionException e) {
-            if (isAuthenticationChallenge(e) || isOAuthGrantError(e)) {
+            if (isOAuthGrantError(e)) {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
                         "Error logging in (check your credentials)");
                 setTooManyRequests();
@@ -280,11 +321,106 @@ public synchronized void login() {
         }
     }
 
+    public boolean isDevModeReady() {
+        return thingConfig.isDevMode() && !localToken.isEmpty() && !cloudFallback;
+    }
+
+    private void initializeLocalMode() {
+        if (thingConfig.getIp().isEmpty() || thingConfig.getPin().isEmpty()) {
+            discoverGateway();
+        }
+
+        if (!thingConfig.getIp().isEmpty() && !thingConfig.getPin().isEmpty()) {
+            try {
+                if (thingConfig.getToken().isEmpty()) {
+                    localToken = getNewLocalToken();
+                    logger.debug("Local token retrieved");
+                    activateLocalToken();
+                    updateConfiguration();
+                } else {
+                    localToken = thingConfig.getToken();
+                    activateLocalToken();
+                }
+                logger.debug("Local mode initialized, waiting for cloud sync");
+                Thread.sleep(3000);
+            } catch (InterruptedException ex) {
+                logger.debug("Interruption during local mode initialization, falling back to cloud mode", ex);
+                Thread.currentThread().interrupt();
+            } catch (ExecutionException | TimeoutException ex) {
+                logger.debug("Exception during local mode initialization, falling back to cloud mode", ex);
+                cloudFallback = true;
+            }
+        } else {
+            logger.debug("Cannot switch to developer mode - gateway not found on LAN");
+            cloudFallback = true;
+        }
+    }
+
+    private String getNewLocalToken() throws ExecutionException, InterruptedException, TimeoutException {
+        // Get list of local tokens
+        SomfyTahomaLocalToken[] tokens = invokeCallToURL(
+                CONFIG_URL + thingConfig.getPin() + LOCAL_TOKENS_URL + "devmode", "", HttpMethod.GET,
+                SomfyTahomaLocalToken[].class);
+
+        // Delete old OH tokens
+        for (SomfyTahomaLocalToken token : tokens) {
+            if (OPENHAB_TOKEN.equals(token.getLabel())) {
+                logger.debug("Deleting token: {}", token.getUuid());
+                sendDeleteToTahomaWithCookie(CONFIG_URL + thingConfig.getPin() + LOCAL_TOKENS_URL + token.getUuid());
+            }
+        }
+
+        // Generate a new token
+        SomfyTahomaTokenReponse tokenResponse = invokeCallToURL(
+                CONFIG_URL + thingConfig.getPin() + LOCAL_TOKENS_URL + "generate", "", HttpMethod.GET,
+                SomfyTahomaTokenReponse.class);
+
+        return tokenResponse.getToken();
+    }
+
+    private void discoverGateway() {
+        logger.debug("Starting mDNS discovery...");
+        JmDNS jmdns = null;
+
+        try {
+            // Create a JmDNS instance
+            jmdns = JmDNS.create(InetAddress.getLocalHost());
+            jmdns.addServiceListener("_kizboxdev._tcp.local.", new SomfyTahomaMDNSDiscoveryListener(this));
+
+            // Wait a bit
+            Thread.sleep(TAHOMA_TIMEOUT * 1000);
+        } catch (InterruptedException e) {
+            logger.debug("mDNS discovery interrupted", e);
+            Thread.currentThread().interrupt();
+        } catch (IOException e) {
+            logger.debug("Exception during mDNS discovery", e);
+        }
+
+        if (jmdns != null) {
+            jmdns.unregisterAllServices();
+            try {
+                jmdns.close();
+            } catch (IOException e) {
+                // ignore
+            }
+        }
+    }
+
+    private void activateLocalToken() throws ExecutionException, InterruptedException, TimeoutException {
+        String param = "{\"label\" : \"" + OPENHAB_TOKEN + "\",\"token\" : \"" + localToken
+                + "\",\"scope\" : \"devmode\"}";
+        String response = sendPostToTahomaWithCookie(CONFIG_URL + thingConfig.getPin() + "/local/tokens", param);
+        logger.trace("Local token activation: {}", response);
+    }
+
     private void setTooManyRequests() {
-        logger.debug("Too many requests or bad credentials for the cloud portal, suspending activity for {} seconds",
-                SUSPEND_TIME);
-        tooManyRequests = true;
-        scheduler.schedule(this::enableLogin, SUSPEND_TIME, TimeUnit.SECONDS);
+        if (!tooManyRequests) {
+            logger.debug(
+                    "Too many requests or bad credentials for the cloud portal, suspending activity for {} seconds",
+                    SUSPEND_TIME);
+            tooManyRequests = true;
+            loginFuture = scheduler.schedule(this::enableLogin, SUSPEND_TIME, TimeUnit.SECONDS);
+        }
     }
 
     private @Nullable String registerEvents() {
@@ -302,6 +438,10 @@ private void enableLogin() {
     }
 
     private List<SomfyTahomaEvent> getEvents() {
+        if (eventsId.isEmpty()) {
+            return List.of();
+        }
+
         SomfyTahomaEvent[] response = invokeCallToURL(EVENTS_URL + eventsId + "/fetch", "", HttpMethod.POST,
                 SomfyTahomaEvent[].class);
         return response != null ? List.of(response) : List.of();
@@ -331,11 +471,24 @@ private void cleanup() {
         // cancel all scheduled retries
         retryFutures.forEach(x -> x.cancel(false));
 
-        try {
-            httpClient.stop();
-        } catch (Exception e) {
-            logger.debug("Error during http client stopping", e);
+        ScheduledFuture<?> localLoginFuture = loginFuture;
+        if (localLoginFuture != null) {
+            localLoginFuture.cancel(true);
+            loginFuture = null;
         }
+
+        HttpClient localHttpClient = httpClient;
+        if (localHttpClient != null) {
+            try {
+                localHttpClient.stop();
+            } catch (Exception e) {
+                logger.debug("Error during http client stopping", e);
+            }
+            httpClient = null;
+        }
+
+        // Clean access data
+        localToken = "";
     }
 
     @Override
@@ -351,16 +504,19 @@ public void bridgeStatusChanged(ThingStatusInfo bridgeStatusInfo) {
      */
     private void stopPolling() {
         ScheduledFuture<?> localPollFuture = pollFuture;
-        if (localPollFuture != null && !localPollFuture.isCancelled()) {
+        if (localPollFuture != null) {
             localPollFuture.cancel(true);
+            pollFuture = null;
         }
         ScheduledFuture<?> localStatusFuture = statusFuture;
-        if (localStatusFuture != null && !localStatusFuture.isCancelled()) {
+        if (localStatusFuture != null) {
             localStatusFuture.cancel(true);
+            statusFuture = null;
         }
         ScheduledFuture<?> localReconciliationFuture = reconciliationFuture;
-        if (localReconciliationFuture != null && !localReconciliationFuture.isCancelled()) {
+        if (localReconciliationFuture != null) {
             localReconciliationFuture.cancel(true);
+            reconciliationFuture = null;
         }
     }
 
@@ -404,7 +560,7 @@ private void saveDevicePlaces(List<SomfyTahomaDevice> devices) {
             if (!device.getPlaceOID().isEmpty()) {
                 SomfyTahomaDevice newDevice = new SomfyTahomaDevice();
                 newDevice.setPlaceOID(device.getPlaceOID());
-                newDevice.setWidget(device.getWidget());
+                newDevice.getDefinition().setWidgetName(device.getDefinition().getWidgetName());
                 devicePlaces.put(device.getDeviceURL(), newDevice);
             }
         }
@@ -637,10 +793,10 @@ private String sendMethodToTahomaWithCookie(String url, HttpMethod method)
 
     private String sendMethodToTahomaWithCookie(String url, HttpMethod method, String urlParameters)
             throws InterruptedException, ExecutionException, TimeoutException {
-        logger.trace("Sending {} to url: {} with data: {}", method.asString(), getApiFullUrl(url), urlParameters);
+        logger.debug("Sending {} to url: {} with data: {}", method.asString(), getApiFullUrl(url), urlParameters);
         Request request = sendRequestBuilder(url, method);
         if (!urlParameters.isEmpty()) {
-            request = request.content(new StringContentProvider(urlParameters), "application/json;charset=UTF-8");
+            request = request.content(new StringContentProvider(urlParameters), "application/json");
         }
 
         ContentResponse response = request.send();
@@ -651,17 +807,44 @@ private String sendMethodToTahomaWithCookie(String url, HttpMethod method, Strin
 
         if (response.getStatus() < 200 || response.getStatus() >= 300) {
             logger.debug("Received unexpected status code: {}", response.getStatus());
+            if (response.getHeaders().contains(HttpHeader.CONTENT_TYPE)) {
+                if (response.getHeaders().getField(HttpHeader.CONTENT_TYPE).getValue()
+                        .equalsIgnoreCase(MediaType.APPLICATION_JSON)) {
+                    try {
+                        SomfyTahomaError error = gson.fromJson(response.getContentAsString(), SomfyTahomaError.class);
+                        throw new ExecutionException(error.getError(), null);
+                    } catch (JsonSyntaxException e) {
+
+                    }
+                }
+            }
+            throw new ExecutionException(
+                    "Unknown http error " + response.getStatus() + " while attempting to send a message.", null);
         }
         return response.getContentAsString();
     }
 
     private Request sendRequestBuilder(String subUrl, HttpMethod method) {
+        return isLocalRequest(subUrl) ? sendRequestBuilderLocal(subUrl, method)
+                : sendRequestBuilderCloud(subUrl, method);
+    }
+
+    private boolean isLocalRequest(String subUrl) {
+        return isDevModeReady() && !subUrl.startsWith(CONFIG_URL);
+    }
+
+    private Request sendRequestBuilderCloud(String subUrl, HttpMethod method) {
         return httpClient.newRequest(getApiFullUrl(subUrl)).method(method)
                 .header(HttpHeader.ACCEPT_LANGUAGE, "en-US,en").header(HttpHeader.ACCEPT_ENCODING, "gzip, deflate")
                 .header("X-Requested-With", "XMLHttpRequest").timeout(TAHOMA_TIMEOUT, TimeUnit.SECONDS)
                 .agent(TAHOMA_AGENT);
     }
 
+    private Request sendRequestBuilderLocal(String subUrl, HttpMethod method) {
+        return httpClient.newRequest(getApiFullUrl(subUrl)).method(method).accept("application/json")
+                .header(HttpHeader.AUTHORIZATION, "Bearer " + localToken);
+    }
+
     /**
      * Performs the login for Cozytouch using OAUTH2 authorization.
      *
@@ -720,7 +903,9 @@ private String loginCozytouch()
     }
 
     private String getApiFullUrl(String subUrl) {
-        return "https://" + thingConfig.getCloudPortal() + API_BASE_URL + subUrl;
+        return isLocalRequest(subUrl)
+                ? "https://" + thingConfig.getIp() + ":8443/enduser-mobile-web/1/enduserAPI/" + subUrl
+                : "https://" + thingConfig.getCloudPortal() + API_BASE_URL + subUrl;
     }
 
     public void sendCommand(String io, String command, String params, String url) {
@@ -781,7 +966,7 @@ public void sendCommandToSameDevicesInPlace(String io, String command, String pa
         if (device != null && !device.getPlaceOID().isEmpty()) {
             devicePlaces.forEach((deviceUrl, devicePlace) -> {
                 if (device.getPlaceOID().equals(devicePlace.getPlaceOID())
-                        && device.getWidget().equals(devicePlace.getWidget())) {
+                        && device.getDefinition().getWidgetName().equals(devicePlace.getDefinition().getWidgetName())) {
                     sendCommand(deviceUrl, command, params, url);
                 }
             });
@@ -832,6 +1017,7 @@ public void executeActionGroup(String id) {
     private boolean reLogin() {
         logger.debug("Doing relogin");
         reLoginNeeded = true;
+        localToken = "";
         login();
         return ThingStatus.OFFLINE != thing.getStatus();
     }
@@ -850,28 +1036,53 @@ private boolean reLogin() {
     }
 
     public void forceGatewaySync() {
-        invokeCallToURL(REFRESH_URL, "", HttpMethod.PUT, null);
+        // refresh is valid only if in a cloud mode
+        if (!thingConfig.isDevMode() || localToken.isEmpty()) {
+            invokeCallToURL(REFRESH_URL, "", HttpMethod.PUT, null);
+        }
     }
 
     public SomfyTahomaStatus getTahomaStatus(String gatewayId) {
-        SomfyTahomaStatusResponse data = invokeCallToURL(GATEWAYS_URL + gatewayId, "", HttpMethod.GET,
-                SomfyTahomaStatusResponse.class);
-        if (data != null) {
-            logger.debug("Tahoma status: {}", data.getConnectivity().getStatus());
-            logger.debug("Tahoma protocol version: {}", data.getConnectivity().getProtocolVersion());
-            return data.getConnectivity();
+        SomfyTahomaStatusResponse status = null;
+
+        if (isDevModeReady()) {
+            // Local endpoint does not have a method for specific gateway
+            SomfyTahomaStatusResponse[] data = invokeCallToURL(GATEWAYS_URL, "", HttpMethod.GET,
+                    SomfyTahomaStatusResponse[].class);
+            if (data != null) {
+                for (SomfyTahomaStatusResponse gatewayStatus : data) {
+                    if (gatewayStatus.getGatewayId().equals(gatewayId)) {
+                        status = gatewayStatus;
+                        break;
+                    }
+                }
+            }
+        } else {
+            status = invokeCallToURL(GATEWAYS_URL + gatewayId, "", HttpMethod.GET, SomfyTahomaStatusResponse.class);
+        }
+
+        if (status != null) {
+            logger.debug("Tahoma status: {}", status.getConnectivity().getStatus());
+            logger.debug("Tahoma protocol version: {}", status.getConnectivity().getProtocolVersion());
+            return status.getConnectivity();
         }
         return new SomfyTahomaStatus();
     }
 
-    private boolean isAuthenticationChallenge(Exception ex) {
+    private boolean isTempBanned(Exception ex) {
         String msg = ex.getMessage();
-        return msg != null && msg.contains(AUTHENTICATION_CHALLENGE);
+        return msg != null && msg.contains(TEMPORARILY_BANNED);
+    }
+
+    private boolean isEventListenerTimeout(Exception ex) {
+        String msg = ex.getMessage();
+        return msg != null && msg.contains(EVENT_LISTENER_TIMEOUT);
     }
 
     private boolean isOAuthGrantError(Exception ex) {
         String msg = ex.getMessage();
-        return msg != null && msg.contains(AUTHENTICATION_OAUTH_GRANT_ERROR);
+        return msg != null
+                && (msg.contains(AUTHENTICATION_OAUTH_GRANT_ERROR) || msg.contains(AUTHENTICATION_OAUTH_INVALID_GRANT));
     }
 
     @Override
@@ -915,7 +1126,10 @@ public synchronized void refresh(String url, String stateName) {
             logger.debug("Received data: {} is not JSON", response, e);
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Received invalid data");
         } catch (ExecutionException e) {
-            if (isAuthenticationChallenge(e)) {
+            if (isTempBanned(e)) {
+                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, "Temporarily banned");
+                setTooManyRequests();
+            } else if (isEventListenerTimeout(e)) {
                 reLogin();
             } else {
                 logger.debug("Cannot call url: {} with params: {}!", getApiFullUrl(url), urlParameters, e);
@@ -930,4 +1144,22 @@ public synchronized void refresh(String url, String stateName) {
         }
         return null;
     }
+
+    public void setGatewayIPAddress(String gatewayIPAddress) {
+        thingConfig.setIp(gatewayIPAddress);
+    }
+
+    public void setGatewayPin(String gatewayPin) {
+        thingConfig.setPin(gatewayPin);
+    }
+
+    public void updateConfiguration() {
+        Configuration config = editConfiguration();
+        config.put("ip", thingConfig.getIp());
+        config.put("pin", thingConfig.getPin());
+        if (!localToken.isEmpty()) {
+            config.put("token", localToken);
+        }
+        updateConfiguration(config);
+    }
 }
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaLightSensorHandler.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaLightSensorHandler.java
index 120ec5f2c932c..4f20be8e5bc4b 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaLightSensorHandler.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaLightSensorHandler.java
@@ -28,7 +28,9 @@ public class SomfyTahomaLightSensorHandler extends SomfyTahomaBaseThingHandler {
 
     public SomfyTahomaLightSensorHandler(Thing thing) {
         super(thing);
-        stateNames.put(LUMINANCE, "core:LuminanceState");
+        stateNames.put(LUMINANCE, LUMINANCE_STATE);
         stateNames.put(SENSOR_DEFECT, SENSOR_DEFECT_STATE);
+        // override state type because the local server sends luminance in percent
+        cacheStateType(LUMINANCE_STATE, TYPE_DECIMAL);
     }
 }
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaTemperatureSensorHandler.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaTemperatureSensorHandler.java
index acb7ef86cd2c1..503593da58ef7 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaTemperatureSensorHandler.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaTemperatureSensorHandler.java
@@ -12,8 +12,7 @@
  */
 package org.openhab.binding.somfytahoma.internal.handler;
 
-import static org.openhab.binding.somfytahoma.internal.SomfyTahomaBindingConstants.TEMPERATURE;
-import static org.openhab.binding.somfytahoma.internal.SomfyTahomaBindingConstants.TYPE_DECIMAL;
+import static org.openhab.binding.somfytahoma.internal.SomfyTahomaBindingConstants.*;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.thing.Thing;
@@ -29,9 +28,9 @@ public class SomfyTahomaTemperatureSensorHandler extends SomfyTahomaBaseThingHan
 
     public SomfyTahomaTemperatureSensorHandler(Thing thing) {
         super(thing);
-        stateNames.put(TEMPERATURE, "core:TemperatureState");
+        stateNames.put(TEMPERATURE, TEMPERATURE_STATE);
 
         // override state type because the cloud sends both percent & decimal
-        cacheStateType("core:TemperatureState", TYPE_DECIMAL);
+        cacheStateType(TEMPERATURE_STATE, TYPE_DECIMAL);
     }
 }
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaDevice.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaDevice.java
index 21eb5864389d9..1f8b7700e66fa 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaDevice.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaDevice.java
@@ -27,8 +27,6 @@
 @NonNullByDefault
 public class SomfyTahomaDevice {
 
-    private String uiClass = "";
-    private String widget = "";
     private String deviceURL = "";
     private String label = "";
     private String oid = "";
@@ -49,18 +47,6 @@ public String getOid() {
         return oid;
     }
 
-    public String getUiClass() {
-        return uiClass;
-    }
-
-    public String getWidget() {
-        return widget;
-    }
-
-    public void setWidget(String widget) {
-        this.widget = widget;
-    }
-
     public SomfyTahomaDeviceDefinition getDefinition() {
         return definition;
     }
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaDeviceDefinition.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaDeviceDefinition.java
index a816f9904080b..774b1eff1f497 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaDeviceDefinition.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaDeviceDefinition.java
@@ -36,6 +36,22 @@ public List<SomfyTahomaDeviceDefinitionState> getStates() {
         return states;
     }
 
+    private String widgetName = "";
+
+    private String uiClass = "";
+
+    public String getWidgetName() {
+        return widgetName;
+    }
+
+    public String getUiClass() {
+        return uiClass;
+    }
+
+    public void setWidgetName(String widgetName) {
+        this.widgetName = widgetName;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaError.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaError.java
new file mode 100644
index 0000000000000..f8a3354b5d172
--- /dev/null
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaError.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.somfytahoma.internal.model;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The {@link SomfyTahomaError} is used to parse error from API server.
+ *
+ * @author Ondrej Pecta - Initial contribution
+ */
+@NonNullByDefault
+public class SomfyTahomaError {
+
+    private String error = "";
+    private String errorCode = "";
+
+    public String getError() {
+        return error;
+    }
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+}
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaLocalToken.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaLocalToken.java
new file mode 100644
index 0000000000000..0d67e30b38e65
--- /dev/null
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaLocalToken.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.somfytahoma.internal.model;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The {@link SomfyTahomaLocalToken} is used to parse a local token.
+ *
+ * @author Ondrej Pecta - Initial contribution
+ */
+@NonNullByDefault
+public class SomfyTahomaLocalToken {
+    String uuid = "";
+    String label = "";
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+}
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaLoginResponse.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaLoginResponse.java
index 21edc539a5164..6e8d9cd79c4d6 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaLoginResponse.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaLoginResponse.java
@@ -27,6 +27,8 @@ public class SomfyTahomaLoginResponse {
     private String version = "";
     private String error = "";
 
+    private String errorCode = "";
+
     public boolean isSuccess() {
         return success;
     }
@@ -38,4 +40,8 @@ public String getVersion() {
     public String getError() {
         return error;
     }
+
+    public String getErrorCode() {
+        return errorCode;
+    }
 }
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaStatusResponse.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaStatusResponse.java
index ecab7a6a5efa2..3fb3b41128d77 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaStatusResponse.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaStatusResponse.java
@@ -23,9 +23,14 @@
 @NonNullByDefault
 public class SomfyTahomaStatusResponse {
 
+    private String gatewayId = "";
     private SomfyTahomaStatus connectivity = new SomfyTahomaStatus();
 
     public SomfyTahomaStatus getConnectivity() {
         return connectivity;
     }
+
+    public String getGatewayId() {
+        return gatewayId;
+    }
 }
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaTokenReponse.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaTokenReponse.java
new file mode 100644
index 0000000000000..dcf900dd8c7fe
--- /dev/null
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/model/SomfyTahomaTokenReponse.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.somfytahoma.internal.model;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The {@link SomfyTahomaTokenReponse} holds information about generated token
+ *
+ * @author Ondrej Pecta - Initial contribution
+ */
+@NonNullByDefault
+public class SomfyTahomaTokenReponse {
+    private String token = "";
+
+    public String getToken() {
+        return token;
+    }
+}
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/config/config.xml
index 5bffde7cc5398..3fec91f7b4345 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/config/config.xml
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/config/config.xml
@@ -69,5 +69,35 @@
 			<description>Specifies the delay in milliseconds between subsequent retries after a command failure</description>
 			<default>1000</default>
 		</parameter>
+
+		<parameter name="devMode" type="boolean" required="false">
+			<label>Developer mode</label>
+			<description>Enables the direct control of your devices over the lan using the local API endpoint. See
+				https://github.com/Somfy-Developer/Somfy-TaHoma-Developer-Mode</description>
+			<default>false</default>
+			<advanced>true</advanced>
+		</parameter>
+
+		<parameter name="ip" type="text" required="false">
+			<label>Gateway IP</label>
+			<description>Local IP address of gateway. Relevant only if developer mode is enabled. If not provided, the binding
+				will try to autodetect it</description>
+			<advanced>true</advanced>
+		</parameter>
+
+		<parameter name="pin" type="text" required="false">
+			<label>Gateway PIN</label>
+			<description>Gateway PIN in format ABCD-EFGH-IJKL. Relevant only if developer mode is enabled. If not provided, the
+				binding will try to autodetect it</description>
+			<advanced>true</advanced>
+		</parameter>
+
+		<parameter name="token" type="text" required="false">
+			<label>Local token</label>
+			<description>Local token. Relevant only if developer mode is enabled. If not provided, the binding
+				will try to
+				generate it using the gateway IP and PIN</description>
+			<advanced>true</advanced>
+		</parameter>
 	</config-description>
 </config-description:config-descriptions>
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
index a08acf6d16386..d3a8e8739aab4 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
@@ -80,6 +80,14 @@ bridge-type.config.somfytahoma.bridge.retryDelay.label = Retry delay
 bridge-type.config.somfytahoma.bridge.retryDelay.description = Specifies the delay in milliseconds between subsequent retries after a command failure
 bridge-type.config.somfytahoma.bridge.statusTimeout.label = Status Timeout
 bridge-type.config.somfytahoma.bridge.statusTimeout.description = Specifies the timeout in seconds after which the status is got from the cloud
+bridge-type.config.somfytahoma.bridge.devMode.label = Developer mode
+bridge-type.config.somfytahoma.bridge.devMode.description = Enables the direct control of your devices over the lan using the local API endpoint. See https://github.com/Somfy-Developer/Somfy-TaHoma-Developer-Mode
+bridge-type.config.somfytahoma.bridge.ip.label = Gateway IP
+bridge-type.config.somfytahoma.bridge.ip.description = Local IP address of gateway. Relevant only if developer mode is enabled. If not provided, the binding will try to autodetect it
+bridge-type.config.somfytahoma.bridge.pin.label = Gateway PIN
+bridge-type.config.somfytahoma.bridge.pin.description = Gateway PIN in format ABCD-EFGH-IJKL. Relevant only if developer mode is enabled. If not provided, the binding will try to autodetect it
+bridge-type.config.somfytahoma.bridge.token.label = Local token
+bridge-type.config.somfytahoma.bridge.token.description = Local token. Relevant only if developer mode is enabled. If not provided, the binding will try to generate it using the gateway IP and PIN
 thing-type.config.somfytahoma.device.url.label = Somfy Tahoma Device URL
 thing-type.config.somfytahoma.device.url.description = The identifier of this Somfy device
 thing-type.config.somfytahoma.gateway.id.label = Somfy Tahoma Gateway ID

From 506c7387c5a3fcdbef241ea8440a08c44451f719 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <holgerfriedrich@users.noreply.github.com>
Date: Sun, 11 Dec 2022 12:47:55 +0100
Subject: [PATCH 32/48] [knx] Improve handling of serial gateways (#13897)

* [knx] Improve handling of serial gateways

Take over initialization logic from KNX IP gateway for serial gateway.
Properly re-initialize serial gateway after configuration changes done in UI.
Fixes #13892.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 .../internal/config/BridgeConfiguration.java  | 14 ++---
 .../knx/internal/config/DeviceConfig.java     | 10 ++-
 .../config/IPBridgeConfiguration.java         |  6 +-
 .../handler/AbstractKNXThingHandler.java      |  4 +-
 .../internal/handler/DeviceThingHandler.java  |  2 +-
 .../handler/IPBridgeThingHandler.java         | 10 ++-
 .../handler/SerialBridgeThingHandler.java     | 63 +++++++++++++++----
 7 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/BridgeConfiguration.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/BridgeConfiguration.java
index 3c0909db17c51..3070bd41c0b0e 100644
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/BridgeConfiguration.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/BridgeConfiguration.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.binding.knx.internal.config;
 
-import java.math.BigDecimal;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
@@ -25,23 +23,23 @@
 @NonNullByDefault
 public class BridgeConfiguration {
     private int autoReconnectPeriod = 0;
-    private BigDecimal readingPause = BigDecimal.valueOf(0);
-    private BigDecimal readRetriesLimit = BigDecimal.valueOf(0);
-    private BigDecimal responseTimeout = BigDecimal.valueOf(0);
+    private int readingPause = 0;
+    private int readRetriesLimit = 0;
+    private int responseTimeout = 0;
 
     public int getAutoReconnectPeriod() {
         return autoReconnectPeriod;
     }
 
-    public BigDecimal getReadingPause() {
+    public int getReadingPause() {
         return readingPause;
     }
 
-    public BigDecimal getReadRetriesLimit() {
+    public int getReadRetriesLimit() {
         return readRetriesLimit;
     }
 
-    public BigDecimal getResponseTimeout() {
+    public int getResponseTimeout() {
         return responseTimeout;
     }
 
diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/DeviceConfig.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/DeviceConfig.java
index 5f7953e1f6767..bd615ceee7f44 100644
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/DeviceConfig.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/DeviceConfig.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.binding.knx.internal.config;
 
-import java.math.BigDecimal;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
@@ -27,8 +25,8 @@ public class DeviceConfig {
 
     private String address = "";
     private boolean fetch = false;
-    private BigDecimal pingInterval = BigDecimal.valueOf(0);
-    private BigDecimal readInterval = BigDecimal.valueOf(0);
+    private int pingInterval = 0;
+    private int readInterval = 0;
 
     public String getAddress() {
         return address;
@@ -38,11 +36,11 @@ public Boolean getFetch() {
         return fetch;
     }
 
-    public BigDecimal getPingInterval() {
+    public int getPingInterval() {
         return pingInterval;
     }
 
-    public BigDecimal getReadInterval() {
+    public int getReadInterval() {
         return readInterval;
     }
 }
diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/IPBridgeConfiguration.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/IPBridgeConfiguration.java
index f6c77e038da10..4e998a613855f 100644
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/IPBridgeConfiguration.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/IPBridgeConfiguration.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.binding.knx.internal.config;
 
-import java.math.BigDecimal;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
@@ -28,7 +26,7 @@ public class IPBridgeConfiguration extends BridgeConfiguration {
     private boolean useNAT = false;
     private String type = "";
     private String ipAddress = "";
-    private BigDecimal portNumber = BigDecimal.valueOf(0);
+    private int portNumber = 0;
     private String localIp = "";
     private String localSourceAddr = "";
     private String routerBackboneKey = "";
@@ -48,7 +46,7 @@ public String getIpAddress() {
         return ipAddress;
     }
 
-    public BigDecimal getPortNumber() {
+    public int getPortNumber() {
         return portNumber;
     }
 
diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/AbstractKNXThingHandler.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/AbstractKNXThingHandler.java
index 913e91480950d..7492f85eb1aa6 100644
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/AbstractKNXThingHandler.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/AbstractKNXThingHandler.java
@@ -152,7 +152,7 @@ private void pollDeviceStatus() {
                     if (!filledDescription && config.getFetch()) {
                         Future<?> descriptionJob = this.descriptionJob;
                         if (descriptionJob == null || descriptionJob.isCancelled()) {
-                            long initialDelay = Math.round(config.getPingInterval().longValue() * random.nextFloat());
+                            long initialDelay = Math.round(config.getPingInterval() * random.nextFloat());
                             this.descriptionJob = getBackgroundScheduler().schedule(() -> {
                                 filledDescription = describeDevice(address);
                             }, initialDelay, TimeUnit.SECONDS);
@@ -181,7 +181,7 @@ protected void attachToClient() {
                 updateStatus(ThingStatus.UNKNOWN);
                 address = new IndividualAddress(config.getAddress());
 
-                long pingInterval = config.getPingInterval().longValue();
+                long pingInterval = config.getPingInterval();
                 long initialPingDelay = Math.round(INITIAL_PING_DELAY * random.nextFloat());
 
                 ScheduledFuture<?> pollingJob = this.pollingJob;
diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java
index d017dca4c6c75..6ea9d579aa9a8 100644
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/DeviceThingHandler.java
@@ -84,7 +84,7 @@ public DeviceThingHandler(Thing thing) {
     public void initialize() {
         super.initialize();
         DeviceConfig config = getConfigAs(DeviceConfig.class);
-        readInterval = config.getReadInterval().intValue();
+        readInterval = config.getReadInterval();
         initializeGroupAddresses();
     }
 
diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java
index f253d3a252f54..c6fa8bdbb6999 100644
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/IPBridgeThingHandler.java
@@ -65,9 +65,7 @@ public void initialize() {
         // initialisation would take too long and show a warning during binding startup
         // KNX secure is adding serious delay
         updateStatus(ThingStatus.UNKNOWN);
-        initJob = scheduler.submit(() -> {
-            initializeLater();
-        });
+        initJob = scheduler.submit(this::initializeLater);
     }
 
     public void initializeLater() {
@@ -106,7 +104,7 @@ public void initializeLater() {
         }
         String localSource = config.getLocalSourceAddr();
         String connectionTypeString = config.getType();
-        int port = config.getPortNumber().intValue();
+        int port = config.getPortNumber();
         String ip = config.getIpAddress();
         InetSocketAddress localEndPoint = null;
         boolean useNAT = false;
@@ -179,8 +177,8 @@ public void initializeLater() {
         updateStatus(ThingStatus.UNKNOWN);
         client = new IPClient(ipConnectionType, ip, localSource, port, localEndPoint, useNAT, autoReconnectPeriod,
                 secureRouting.backboneGroupKey, secureRouting.latencyToleranceMs, secureTunnel.devKey,
-                secureTunnel.user, secureTunnel.userKey, thing.getUID(), config.getResponseTimeout().intValue(),
-                config.getReadingPause().intValue(), config.getReadRetriesLimit().intValue(), getScheduler(), this);
+                secureTunnel.user, secureTunnel.userKey, thing.getUID(), config.getResponseTimeout(),
+                config.getReadingPause(), config.getReadRetriesLimit(), getScheduler(), this);
 
         final var tmpClient = client;
         if (tmpClient != null) {
diff --git a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/SerialBridgeThingHandler.java b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/SerialBridgeThingHandler.java
index c7d971a63492f..4528520c9ca6c 100644
--- a/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/SerialBridgeThingHandler.java
+++ b/bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/handler/SerialBridgeThingHandler.java
@@ -12,12 +12,18 @@
  */
 package org.openhab.binding.knx.internal.handler;
 
+import java.util.concurrent.Future;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.binding.knx.internal.client.AbstractKNXClient;
+import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.binding.knx.internal.client.KNXClient;
+import org.openhab.binding.knx.internal.client.NoOpClient;
 import org.openhab.binding.knx.internal.client.SerialClient;
 import org.openhab.binding.knx.internal.config.SerialBridgeConfiguration;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ThingStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The {@link IPBridgeThingHandler} is responsible for handling commands, which are
@@ -31,31 +37,66 @@
 @NonNullByDefault
 public class SerialBridgeThingHandler extends KNXBridgeBaseThingHandler {
 
-    private final SerialClient client;
+    private @Nullable SerialClient client = null;
+    private @Nullable Future<?> initJob = null;
+
+    private final Logger logger = LoggerFactory.getLogger(SerialBridgeThingHandler.class);
 
     public SerialBridgeThingHandler(Bridge bridge) {
         super(bridge);
-        SerialBridgeConfiguration config = getConfigAs(SerialBridgeConfiguration.class);
-        client = new SerialClient(config.getAutoReconnectPeriod(), thing.getUID(),
-                config.getResponseTimeout().intValue(), config.getReadingPause().intValue(),
-                config.getReadRetriesLimit().intValue(), getScheduler(), config.getSerialPort(), config.useCemi(),
-                this);
     }
 
     @Override
     public void initialize() {
+        // create new instance using current configuration settings;
+        // when a parameter change is done from UI, dispose() and initialize() are called
+        SerialBridgeConfiguration config = getConfigAs(SerialBridgeConfiguration.class);
+        client = new SerialClient(config.getAutoReconnectPeriod(), thing.getUID(), config.getResponseTimeout(),
+                config.getReadingPause(), config.getReadRetriesLimit(), getScheduler(), config.getSerialPort(),
+                config.useCemi(), this);
+
         updateStatus(ThingStatus.UNKNOWN);
-        client.initialize();
+        // delay actual initialization, allow for longer runtime of actual initialization
+        initJob = scheduler.submit(this::initializeLater);
+    }
+
+    public void initializeLater() {
+        final var tmpClient = client;
+        if (tmpClient != null) {
+            tmpClient.initialize();
+        }
     }
 
     @Override
     public void dispose() {
-        client.dispose();
+        final var tmpInitJob = initJob;
+        if (tmpInitJob != null) {
+            if (!tmpInitJob.isDone()) {
+                logger.trace("Bridge {}, shutdown during init, trying to cancel", thing.getUID());
+                tmpInitJob.cancel(true);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    logger.trace("Bridge {}, cancellation interrupted", thing.getUID());
+                }
+            }
+            initJob = null;
+        }
+
+        final var tmpClient = client;
+        if (tmpClient != null) {
+            tmpClient.dispose();
+            client = null;
+        }
         super.dispose();
     }
 
     @Override
-    protected AbstractKNXClient getClient() {
-        return client;
+    protected KNXClient getClient() {
+        KNXClient ret = client;
+        if (ret == null) {
+            return new NoOpClient();
+        }
+        return ret;
     }
 }

From 438552d485357d9060862bd9757718f876ef4333 Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Sun, 11 Dec 2022 15:25:39 +0100
Subject: [PATCH 33/48] [jsscripting] Upgrade openhab-js & Remove SharedCache
 (#13908)

Upgrades the included openhab-js version to 3.1.0, which uses the new
caches from core (introduced in
https://github.com/openhab/openhab-core/pull/2887) and provides many
doc improvements.

Removes the SharedCache from the addon because this functionality is
now provided by core (see
https://github.com/openhab/openhab-core/pull/2887).

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../README.md                                 | 215 +++++++++++++-----
 .../pom.xml                                   |   2 +-
 .../internal/scope/SharedCache.java           | 101 --------
 3 files changed, 159 insertions(+), 159 deletions(-)
 delete mode 100644 bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/scope/SharedCache.java

diff --git a/bundles/org.openhab.automation.jsscripting/README.md b/bundles/org.openhab.automation.jsscripting/README.md
index 12c46e083bf5c..0d84bd154103e 100644
--- a/bundles/org.openhab.automation.jsscripting/README.md
+++ b/bundles/org.openhab.automation.jsscripting/README.md
@@ -82,7 +82,7 @@ actions.NotificationAction.sendNotification("romeo@montague.org", "Balcony door
 Querying the status of a thing
 
 ```javascript
-const thingStatusInfo = actions.Things.getThingStatusInfo("zwave:serial_zstick:512");
+var thingStatusInfo = actions.Things.getThingStatusInfo("zwave:serial_zstick:512");
 console.log("Thing status",thingStatusInfo.getStatus());
 ```
 
@@ -124,32 +124,34 @@ console.log(event.itemState.toString() == "test") // OK
 
 ## Scripting Basics
 
-The openHAB JSScripting runtime attempts to provide a familiar environment to Javascript developers.
+The openHAB JavaScript Scripting runtime attempts to provide a familiar environment to JavaScript developers.
 
 ### Require
 
 Scripts may include standard NPM based libraries by using CommonJS `require`.
 The library search will look in the path `automation/js/node_modules` in the user configuration directory.
+See [libraries](#libraries) for more information.
 
 ### Console
 
 The JS Scripting binding supports the standard `console` object for logging.
-Script debug logging is enabled by default at the `INFO` level, but can be configured using the console logging commands.
+Script logging is enabled by default at the `INFO` level (messages from `console.debug` and `console.trace` won't be displayed), but can be configured using the [openHAB console](https://www.openhab.org/docs/administration/console.html):
 
 ```text
 log:set DEBUG org.openhab.automation.script
+log:set TRACE org.openhab.automation.script
+log:set DEFAULT org.openhab.automation.script
 ```
 
-The default logger name prefix is `org.openhab.automation.script`, this can be changed by assigning a new string to the `loggerName` property of the console.
-
-Please be aware that messages might not appear in the logs if the logger name does not start with `org.openhab`.
-This behaviour is due to [log4j2](https://logging.apache.org/log4j/2.x/) requiring definition for each logger prefix.
-
+The default logger name prefix is `org.openhab.automation.script`, this can be changed by assigning a new string to the `loggerName` property of the console:
 
 ```javascript
-console.loggerName = "org.openhab.custom"
+console.loggerName = 'org.openhab.custom';
 ```
 
+Please be aware that messages do not appear in the logs if the logger name does not start with `org.openhab`.
+This behaviour is due to [log4j2](https://logging.apache.org/log4j/2.x/) requiring a setting for each logger prefix in `$OPENHAB_USERDATA/etc/log4j2.xml` (on openHABian: `/srv/openhab-userdata/etc/log4j2.xml`).
+
 Supported logging functions include:
 
 - `console.log(obj1 [, obj2, ..., objN])`
@@ -164,11 +166,13 @@ The string representations of each of these objects are appended together in the
 
 See <https://developer.mozilla.org/en-US/docs/Web/API/console> for more information about console logging.
 
+Note: [openhab-js](https://github.com/openhab/openhab-js/) is logging to `org.openhab.automation.openhab-js`.
+
 ### Timers
 
 JS Scripting provides access to the global `setTimeout`, `setInterval`, `clearTimeout` and `clearInterval` methods specified in the [Web APIs](https://developer.mozilla.org/en-US/docs/Web/API).
 
-When a script is unloaded, all created timers and intervals are automatically cancelled.
+When a script is unloaded, all created timeouts and intervals are automatically cancelled.
 
 #### SetTimeout
 
@@ -243,10 +247,49 @@ For [file based rules](#file-based-rules), scripts will be loaded from `automati
 
 NPM libraries will be loaded from `automation/js/node_modules` in the user configuration directory.
 
+### Deinitialization Hook
+
+It is possible to hook into unloading of a script and register a function that is called when the script is unloaded.
+
+```javascript
+require('@runtime').lifecycleTracker.addDisposeHook(() => functionToCall());
+
+// Example
+require('@runtime').lifecycleTracker.addDisposeHook(() => {
+  console.log("Deinitialization hook runs...")
+});
+```
+
+## `SCRIPT` Transformation
+
+openHAB provides several [data transformation services](https://www.openhab.org/addons/#transform) as well as the `SCRIPT` transformation, that is available from the framework and needs no additional installation.
+It allows transforming values using any of the available scripting languages, which means JavaScript Scripting is supported as well.
+See the [transformation docs](https://openhab.org/docs/configuration/transformations.html#script-transformation) for more general information on the usage of `SCRIPT` transformation.
+
+Use the `SCRIPT` transformation with JavaScript Scripting by:
+
+1. Creating a script in the `$OPENHAB_CONF/transform` folder with the `.script` extension.
+   The script should take one argument `input` and return a value that supports `toString()` or `null`:
+
+   ```javascript
+   (function(data) {
+     // Do some data transformation here
+     return data;
+   })(input);
+   ```
+
+2. Using `SCRIPT(graaljs:<scriptname>.script):%s` as the transformation profile, e.g. on an Item.
+3. Passing parameters is also possible by using a URL like syntax: `SCRIPT(graaljs:<scriptname>.script?arg=value):%s`.
+   Parameters are injected into the script and can be referenced like variables.
+
 ## Standard Library
 
 Full documentation for the openHAB JavaScript library can be found at [openhab-js](https://openhab.github.io/openhab-js).
 
+The openHAB JavaScript library provides type definitions for most of its APIs to enable code completion is IDEs like [VS Code](https://code.visualstudio.com).
+To use the type definitions, install the [`openhab` npm package](https://npmjs.com/openhab) (read the [installation guide](https://github.com/openhab/openhab-js#custom-installation) for more information).
+If an API does not provide type definitions and therefore autocompletion won‘t work, the documentation will include a note.
+
 ### Items
 
 The items namespace allows interactions with openHAB items.
@@ -263,7 +306,7 @@ See [openhab-js : items](https://openhab.github.io/openhab-js/items.html) for fu
   - .safeItemName(s) ⇒ `string`
 
 ```javascript
-const item = items.getItem("KitchenLight");
+var item = items.getItem("KitchenLight");
 console.log("Kitchen Light State", item.state);
 ```
 
@@ -298,12 +341,12 @@ Calling `getItem(...)` returns an `Item` object with the following properties:
   - .removeTags(...tagNames)
 
 ```javascript
-const item = items.getItem("KitchenLight");
-//send an ON command
+var item = items.getItem("KitchenLight");
+// Send an ON command
 item.sendCommand("ON");
-//Post an update
+// Post an update
 item.postUpdate("OFF");
-//Get state
+// Get state
 console.log("KitchenLight state", item.state)
 ```
 
@@ -439,7 +482,7 @@ Calling `getThing(...)` returns a `Thing` object with the following properties:
   - .setEnabled(enabled)
 
 ```javascript
-const thing = things.getThing('astro:moon:home');
+var thing = things.getThing('astro:moon:home');
 console.log('Thing label: ' + thing.label);
 // Set Thing location
 thing.setLocation('living room');
@@ -452,6 +495,8 @@ thing.setEnabled(false);
 The actions namespace allows interactions with openHAB actions.
 The following are a list of standard actions.
 
+Note that most of the actions currently do **not** provide type definitions and therefore auto-completion does not work.
+
 See [openhab-js : actions](https://openhab.github.io/openhab-js/actions.html) for full API documentation and additional actions.
 
 #### Audio Actions
@@ -472,7 +517,7 @@ Additional information can be found on the  [Ephemeris Actions Docs](https://www
 
 ```javascript
 // Example
-let weekend = actions.Ephemeris.isWeekend();
+var weekend = actions.Ephemeris.isWeekend();
 ```
 
 #### Exec Actions
@@ -487,11 +532,11 @@ Execute a command line.
 actions.Exec.executeCommandLine('echo', 'Hello World!');
 
 // Execute command line with timeout.
-let Duration = Java.type('java.time.Duration');
+var Duration = Java.type('java.time.Duration');
 actions.Exec.executeCommandLine(Duration.ofSeconds(20), 'echo', 'Hello World!');
 
 // Get response from command line.
-let response = actions.Exec.executeCommandLine('echo', 'Hello World!');
+var response = actions.Exec.executeCommandLine('echo', 'Hello World!');
 
 // Get response from command line with timeout.
 response = actions.Exec.executeCommandLine(Duration.ofSeconds(20), 'echo', 'Hello World!');
@@ -515,6 +560,9 @@ The `ScriptExecution` actions provide the `callScript(string scriptName)` method
 You can also create timers using the [native JS methods for timer creation](#timers), your choice depends on the versatility you need.
 Sometimes, using `setTimer` is much faster and easier, but other times, you need the versatility that `createTimer` provides.
 
+Keep in mind that you should somehow manage the timers you create using `createTimer`, otherwise you could end up with unmanagable timers running until you restart openHAB.
+A possible solution is to store all timers in an array and cancel all timers in the [Deinitialization Hook](#deinitialization-hook).
+
 ##### `createTimer`
 
 ```javascript
@@ -566,12 +614,24 @@ See [openhab-js : actions.ScriptExecution](https://openhab.github.io/openhab-js/
 
 See [openhab-js : actions.Semantics](https://openhab.github.io/openhab-js/actions.html#.Semantics) for complete documentation.
 
-#### Things Actions
+#### Thing Actions
 
 It is possible to get the actions for a Thing using `actions.Things.getActions(bindingId, thingUid)`, e.g. `actions.Things.getActions('network', 'network:pingdevice:pc')`.
 
 See [openhab-js : actions.Things](https://openhab.github.io/openhab-js/actions.html#.Things) for complete documentation.
 
+#### Transformation Actions
+
+openHAB provides various [data transformation services](https://www.openhab.org/addons/#transform) which can translate between technical and human-readable values.
+Usually, they are used directly on Items, but it is also possible to access them from scripts.
+
+```javascript
+console.log(actions.Transformation.transform('MAP', 'en.map', 'OPEN')); // open
+console.log(actions.Transformation.transform('MAP', 'de.map', 'OPEN')); // offen
+```
+
+See [openhab-js : actions.Transformation](https://openhab.github.io/openhab-js/actions.Transformation.html) for complete documentation.
+
 #### Voice Actions
 
 See [openhab-js : actions.Voice](https://openhab.github.io/openhab-js/actions.html#.Voice) for complete documentation.
@@ -595,34 +655,48 @@ Replace `<message>` with the notification text.
 
 ### Cache
 
-The cache namespace provides a default cache that can be used to set and retrieve objects that will be persisted between reloads of scripts.
+The cache namespace provides both a private and a shared cache that can be used to set and retrieve objects that will be persisted between subsequent runs of the same or between scripts.
+
+The private cache can only be accessed by the same script and is cleared when the script is unloaded.
+You can use it to e.g. store timers or counters between subsequent runs of that script.
+When a script is unloaded and its cache is cleared, all timers (see [ScriptExecution Actions](#scriptexecution-actions)) stored in its private cache are cancelled.
+
+The shared cache is shared across all rules and scripts, it can therefore be accessed from any automation language.
+The access to every key is tracked and the key is removed when all scripts that ever accessed that key are unloaded.
+If that key stored a timer, the timer is cancelled.
 
 See [openhab-js : cache](https://openhab.github.io/openhab-js/cache.html) for full API documentation.
 
 - cache : <code>object</code>
-  - .get(key, defaultSupplier) ⇒ <code>Object | null</code>
-  - .put(key, value) ⇒ <code>Previous Object | null</code>
-  - .remove(key) ⇒ <code>Previous Object | null</code>
-  - .exists(key) ⇒ <code>boolean</code>
+  - .private
+    - .get(key, defaultSupplier) ⇒ <code>Object | null</code>
+    - .put(key, value) ⇒ <code>Previous Object | null</code>
+    - .remove(key) ⇒ <code>Previous Object | null</code>
+    - .exists(key) ⇒ <code>boolean</code>
+  - .shared
+    - .get(key, defaultSupplier) ⇒ <code>Object | null</code>
+    - .put(key, value) ⇒ <code>Previous Object | null</code>
+    - .remove(key) ⇒ <code>Previous Object | null</code>
+    - .exists(key) ⇒ <code>boolean</code>
 
 The `defaultSupplier` provided function will return a default value if a specified key is not already associated with a value.
 
-**Example** *(Get a previously set value with a default value (times &#x3D; 0))*
+**Example** *(Get a previously set value with a default value (times = 0))*
 
 ```js
-let counter = cache.get("counter", () => ({ "times": 0 }));
-console.log("Count",counter.times++);
+var counter = cache.private.get('counter', () => ({ 'times': 0 }));
+console.log('Count', counter.times++);
 ```
 
 **Example** *(Get a previously set object)*
 
 ```js
-let counter = cache.get("counter");
-if(counter == null){
-  counter = {times: 0};
-  cache.put("counter", counter);
+var counter = cache.private.get('counter');
+if (counter === null) {
+  counter = { times: 0 };
+  cache.private.put('counter', counter);
 }
-console.log("Count",counter.times++);
+console.log('Count', counter.times++);
 ```
 
 ### Log
@@ -631,7 +705,7 @@ By default, the JS Scripting binding supports console logging like `console.log(
 Additionally, scripts may create their own native openHAB logger using the log namespace.
 
 ```javascript
-let logger = log('my_logger');
+var logger = log('my_logger');
 
 //prints "Hello World!"
 logger.debug("Hello {}!", "world");
@@ -690,7 +764,7 @@ When you have a `time.ZonedDateTime`, a new `toToday()` method was added which w
 For example, if the time was 13:45 and today was a DST changeover, the time will still be 13:45 instead of one hour off.
 
 ```javascript
-const alarm = items.getItem('Alarm');
+var alarm = items.getItem('Alarm');
 alarm.postUpdate(time.toZDT(alarm).toToday());
 ```
 
@@ -714,7 +788,7 @@ time.toZDT(items.getItem('StartTime')).isBetweenTimes(time.toZDT(), 'PT1H'); //
 Tests to see if the delta between the `time.ZonedDateTime` and the passed in `time.ZonedDateTime` is within the passed in `time.Duration`.
 
 ```javascript
-const timestamp = time.toZDT();
+var timestamp = time.toZDT();
 // do some stuff
 if(timestamp.isClose(time.toZDT(), time.Duration.ofMillis(100))) {
   // did "do some stuff" take longer than 100 msecs to run?
@@ -726,7 +800,7 @@ if(timestamp.isClose(time.toZDT(), time.Duration.ofMillis(100))) {
 This method on `time.ZonedDateTime` returns the milliseconds from now to the passed in `time.ZonedDateTime`.
 
 ```javascript
-const timestamp = time.ZonedDateTime.now().plusMinutes(5);
+var timestamp = time.ZonedDateTime.now().plusMinutes(5);
 console.log(timestamp.getMillisFromNow());
 ```
 
@@ -752,7 +826,7 @@ See [openhab-js : rules](https://openhab.github.io/openhab-js/rules.html) for fu
 JSRules provides a simple, declarative syntax for defining rules that will be executed based on a trigger condition
 
 ```javascript
-const email = "juliet@capulet.org"
+var email = "juliet@capulet.org"
 
 rules.JSRule({
   name: "Balcony Lights ON at 5pm",
@@ -842,10 +916,12 @@ Operations and conditions can also optionally take functions:
 
 ```javascript
 rules.when().item("F1_light").changed().then(event => {
-  console.log(event);
+    console.log(event);
 }).build("Test Rule", "My Test Rule");
 ```
 
+Note that the Rule Builder currently does **not** provide type definitions and therefore auto-completion does not work.
+
 See [Examples](#rule-builder-examples) for further patterns.
 
 #### Rule Builder Triggers
@@ -884,7 +960,7 @@ See [Examples](#rule-builder-examples) for further patterns.
     - `from(state)`
     - `to(state)`
 
-Additionally all the above triggers have the following functions:
+Additionally, all the above triggers have the following functions:
 
 - `.if()` or `.if(fn)` -> a [rule condition](#rule-builder-conditions)
 - `.then()` or `.then(fn)` -> a [rule operation](#rule-builder-operations)
@@ -917,7 +993,7 @@ Additionally all the above triggers have the following functions:
 ```javascript
 // Basic rule, when the BedroomLight1 is changed, run a custom function
 rules.when().item('BedroomLight1').changed().then(e => {
-  console.log("BedroomLight1 state", e.newState)
+    console.log("BedroomLight1 state", e.newState)
 }).build();
 
 // Turn on the kitchen light at SUNSET
@@ -979,30 +1055,55 @@ Time triggers do not provide any event instance, therefore no property is popula
 
 See [openhab-js : EventObject](https://openhab.github.io/openhab-js/rules.html#.EventObject) for full API documentation.
 
-### Initialization hook: scriptLoaded
+## Advanced Scripting
+
+### Libraries
+
+#### Third Party Libraries
 
-For file based scripts, this function will be called if found when the script is loaded.
+Loading of third party libraries is supported the same way as loading the openHAB JavaScript library:
 
 ```javascript
-scriptLoaded = function () {
-  console.log("script loaded");
-  loadedDate = Date.now();
-};
+var myLibrary = require('my-library');
 ```
 
-### Deinitialization hook: scriptUnloaded
+Note: Only CommonJS `require` is supported, ES module loading using `import` is not supported.
 
-For file based scripts, this function will be called if found when the script is unloaded.
+Run the `npm` command from the `automation/js` folder to install third party libraries, e.g. from [npm](https://www.npmjs.com/search?q=openhab).
+This will create a `node_modules` folder (if it doesn't already exist) and install the library and it's dependencies there.
 
-```javascript
-scriptUnloaded = function () {
-  console.log("script unloaded");
-  // clean up rouge timers
-  clearInterval(timer);
-};
-```
+There are already some openHAB specific libraries available on [npm](https://www.npmjs.com/search?q=openhab), you may also search the forum for details.
 
-## Advanced Scripting
+#### Creating Your Own Library
+
+You can also create your own personal JavaScript library for openHAB, but you can not just create a folder in `node_modules` and put your library code in it!
+When it is run, `npm` will remove everything from `node_modules` that has not been properly installed.
+
+Follow these steps to create your own library (it's called a CommonJS module):
+
+1. Create a separate folder for your library outside of `automation/js`, you may also initialize a Git repository.
+2. Run `npm init` from your newly created folder; at least provide responses for the `name`, `version` and `main` (e.g. `index.js`) fields.
+3. Create the main file of your library (`index.js`) and add some exports:
+
+   ```javascript
+   var someProperty = 'Hello world!';
+   function someFunction () {
+     console.log('Hello from your personal library!');
+   }
+   
+   module.exports = {
+     someProperty,
+     someFunction
+   };
+   ```
+
+4. Tar it up by running `npm pack` from your library's folder.
+5. Install it by running `npm install <name>-<version>.tgz` from the `automation/js` folder.
+6. After you've installed it with `npm`, you can continue development of the library inside `node_modules`.
+
+It is also possible to upload your library to [npm](https://npmjs.com) to share it with other users.
+
+If you want to get some advanced information, you can read [this blog post](https://bugfender.com/blog/how-to-create-an-npm-package/) or just google it.
 
 ### @runtime
 
diff --git a/bundles/org.openhab.automation.jsscripting/pom.xml b/bundles/org.openhab.automation.jsscripting/pom.xml
index ded636d15b6a4..6247b4058df9d 100644
--- a/bundles/org.openhab.automation.jsscripting/pom.xml
+++ b/bundles/org.openhab.automation.jsscripting/pom.xml
@@ -25,7 +25,7 @@
     <graal.version>22.0.0.2</graal.version> <!-- DO NOT UPGRADE: 22.0.0.2 is the latest version working on armv7l / OpenJDK 11.0.16 -->
     <asm.version>6.2.1</asm.version>
     <oh.version>${project.version}</oh.version>
-    <ohjs.version>openhab@2.1.1</ohjs.version>
+    <ohjs.version>openhab@3.1.2</ohjs.version>
   </properties>
 
   <build>
diff --git a/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/scope/SharedCache.java b/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/scope/SharedCache.java
deleted file mode 100644
index 6b9329f3178f6..0000000000000
--- a/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/scope/SharedCache.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright (c) 2010-2022 Contributors to the openHAB project
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.openhab.automation.jsscripting.internal.scope;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Supplier;
-
-import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.automation.module.script.ScriptExtensionProvider;
-import org.osgi.service.component.annotations.Component;
-
-/**
- * Shared Cache implementation for JS scripting.
- *
- * @author Jonathan Gilbert - Initial contribution
- */
-@Component(immediate = true)
-@NonNullByDefault
-public class SharedCache implements ScriptExtensionProvider {
-
-    private static final String PRESET_NAME = "cache";
-    private static final String OBJECT_NAME = "sharedcache";
-
-    private JSCache cache = new JSCache();
-
-    @Override
-    public Collection<String> getDefaultPresets() {
-        return Set.of(PRESET_NAME);
-    }
-
-    @Override
-    public Collection<String> getPresets() {
-        return Set.of(PRESET_NAME);
-    }
-
-    @Override
-    public Collection<String> getTypes() {
-        return Set.of(OBJECT_NAME);
-    }
-
-    @Override
-    public @Nullable Object get(String scriptIdentifier, String type) throws IllegalArgumentException {
-        if (OBJECT_NAME.equals(type)) {
-            return cache;
-        }
-
-        return null;
-    }
-
-    @Override
-    public Map<String, Object> importPreset(String scriptIdentifier, String preset) {
-        if (PRESET_NAME.equals(preset)) {
-            final Object requestedType = get(scriptIdentifier, OBJECT_NAME);
-            if (requestedType != null) {
-                return Map.of(OBJECT_NAME, requestedType);
-            }
-        }
-
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public void unload(String scriptIdentifier) {
-        // ignore for now
-    }
-
-    public static class JSCache {
-        private Map<String, Object> backingMap = new HashMap<>();
-
-        public void put(String k, Object v) {
-            backingMap.put(k, v);
-        }
-
-        public @Nullable Object remove(String k) {
-            return backingMap.remove(k);
-        }
-
-        public @Nullable Object get(String k) {
-            return backingMap.get(k);
-        }
-
-        public @Nullable Object get(String k, Supplier<Object> supplier) {
-            return backingMap.computeIfAbsent(k, (unused_key) -> supplier.get());
-        }
-    }
-}

From 1dbcaf8f0c7e66d33544c0ca1774b312bb7e0070 Mon Sep 17 00:00:00 2001
From: Cody Cutrer <cody@cutrer.us>
Date: Sun, 11 Dec 2022 07:54:10 -0700
Subject: [PATCH 34/48] [homekit] delay starting until a particular StartLevel
 (#13877)

* [homekit] delay starting until a particular StartLevel

instead of a blind "delay by seconds", the new default won't even
attempt to start until items are loaded (both file-based and UI-based),
with an additional config to let the user delay it any further (in
case they have items coming from JSR223 scripts that can't run until
at least SL20 anyway).

Signed-off-by: Cody Cutrer <cody@cutrer.us>
---
 bundles/org.openhab.io.homekit/README.md      | 31 ++++----
 .../io/homekit/internal/HomekitImpl.java      | 73 ++++++++++++-------
 .../io/homekit/internal/HomekitSettings.java  |  1 -
 .../main/resources/OH-INF/config/config.xml   |  6 --
 .../resources/OH-INF/i18n/homekit.properties  |  2 -
 5 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/bundles/org.openhab.io.homekit/README.md b/bundles/org.openhab.io.homekit/README.md
index 23bd586a8bf8d..abcd298d4f137 100644
--- a/bundles/org.openhab.io.homekit/README.md
+++ b/bundles/org.openhab.io.homekit/README.md
@@ -105,22 +105,21 @@ Some settings are only visible in UI if the checkbox "Show advanced" is activate
 
 ### Overview of all settings
 
-| Setting                  | Description                                                                                                                                                                                                                                                                                       | Default value |
-|:-------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------|
-| networkInterface         | IP address or domain name under which the HomeKit bridge can be reached. If no value is configured, the add-on uses the primary IP address configured for openHAB. If unsure, keep it empty                                                                                                       | (none)        |
-| port                     | Port under which the HomeKit bridge can be reached.                                                                                                                                                                                                                                               | 9123          |
-| useOHmDNS                | mDNS service is used to advertise openHAB as HomeKit bridge in the network so that HomeKit clients can find it. openHAB has already mDNS service running. This option defines whether the mDNS service of openHAB or a separate service should be used.                                           | false         |
-| blockUserDeletion        | Blocks HomeKit user deletion in openHAB and as result unpairing of devices. If you experience an issue with accessories becoming non-responsive after some time, try to enable this setting. You can also enable this setting if your HomeKit setup is done and you will not re-pair ios devices. | false         |
-| pin                      | Pin code used for pairing with iOS devices. Apparently, pin codes are provided by Apple and represent specific device types, so they cannot be chosen freely. The pin code 031-45-154 is used in sample applications and known to work.                                                           | 031-45-154    |
-| startDelay               | HomeKit start delay in seconds in case the number of accessories is lower than last time. This helps to avoid resetting home app in case not all items have been initialised properly before HomeKit integration start. Ignored if `useDummyAccessories` is on.                                   | 30            |
-| useFahrenheitTemperature | Set to true to use Fahrenheit degrees, or false to use Celsius degrees. Note if an item has a QuantityType as its state, this configuration is ignored and it's always converted properly.                                                                                                        | false         |
-| thermostatTargetModeCool | Word used for activating the cooling mode of the device (if applicable). It can be overwritten at item level.                                                                                                                                                                                     | CoolOn        |
-| thermostatTargetModeHeat | Word used for activating the heating mode of the device (if applicable). It can be overwritten at item level.                                                                                                                                                                                     | HeatOn        |
-| thermostatTargetModeAuto | Word used for activating the automatic mode of the device (if applicable). It can be overwritten at item level.                                                                                                                                                                                   | Auto          |
-| thermostatTargetModeOff  | Word used to set the thermostat mode of the device to off (if applicable).  It can be overwritten at item level.                                                                                                                                                                                  | Off           |
-| name                     | Name under which this HomeKit bridge is announced on the network. This is also the name displayed on the iOS device when searching for available bridges.                                                                                                                                         | openHAB       |
-| instances                | Defines how many bridges to expose. Necessary if you have more than 149 accessories. Accessories must be assigned to additional instances via metadata. Additional bridges will use incrementing port numbers.                                                                                    | 1             |
-| useDummyAccessories      | When an accessory is missing, substitute a dummy in its place instead of removing it. See [Dummy Accessories](#dummy-accessories). | false     |
+| Setting                  | Description                                                                                                                                                                                                                                                                                                                                                                          | Default value        |
+|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------------|
+| networkInterface         | IP address or domain name under which the HomeKit bridge can be reached. If no value is configured, the add-on uses the primary IP address configured for openHAB. If unsure, keep it empty                                                                                                                                                                                          | (none)               |
+| port                     | Port under which the HomeKit bridge can be reached.                                                                                                                                                                                                                                                                                                                                  | 9123                 |
+| useOHmDNS                | mDNS service is used to advertise openHAB as HomeKit bridge in the network so that HomeKit clients can find it. openHAB has already mDNS service running. This option defines whether the mDNS service of openHAB or a separate service should be used.                                                                                                                              | false                |
+| blockUserDeletion        | Blocks HomeKit user deletion in openHAB and as result unpairing of devices. If you experience an issue with accessories becoming non-responsive after some time, try to enable this setting. You can also enable this setting if your HomeKit setup is done and you will not re-pair ios devices.                                                                                    | false                |
+| pin                      | Pin code used for pairing with iOS devices. Apparently, pin codes are provided by Apple and represent specific device types, so they cannot be chosen freely. The pin code 031-45-154 is used in sample applications and known to work.                                                                                                                                              | 031-45-154           |
+| useFahrenheitTemperature | Set to true to use Fahrenheit degrees, or false to use Celsius degrees. Note if an item has a QuantityType as its state, this configuration is ignored and it's always converted properly.                                                                                                                                                                                           | false                |
+| thermostatTargetModeCool | Word used for activating the cooling mode of the device (if applicable). It can be overwritten at item level.                                                                                                                                                                                                                                                                        | CoolOn               |
+| thermostatTargetModeHeat | Word used for activating the heating mode of the device (if applicable). It can be overwritten at item level.                                                                                                                                                                                                                                                                        | HeatOn               |
+| thermostatTargetModeAuto | Word used for activating the automatic mode of the device (if applicable). It can be overwritten at item level.                                                                                                                                                                                                                                                                      | Auto                 |
+| thermostatTargetModeOff  | Word used to set the thermostat mode of the device to off (if applicable).  It can be overwritten at item level.                                                                                                                                                                                                                                                                     | Off                  |
+| name                     | Name under which this HomeKit bridge is announced on the network. This is also the name displayed on the iOS device when searching for available bridges.                                                                                                                                                                                                                            | openHAB              |
+| instances                | Defines how many bridges to expose. Necessary if you have more than 149 accessories. Accessories must be assigned to additional instances via metadata. Additional bridges will use incrementing port numbers.                                                                                                                                                                       | 1                    |
+| useDummyAccessories      | When an accessory is missing, substitute a dummy in its place instead of removing it. See [Dummy Accessories](#dummy-accessories).                                                                                                                                                                                                                                                   | false                |
 
 ## Item Configuration
 
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
index 294ba08d1cdeb..468c1c9b9434a 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 
 import javax.jmdns.JmDNS;
 
@@ -37,6 +36,10 @@
 import org.openhab.core.net.CidrAddress;
 import org.openhab.core.net.NetworkAddressChangeListener;
 import org.openhab.core.net.NetworkAddressService;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyMarkerFilter;
+import org.openhab.core.service.ReadyService;
+import org.openhab.core.service.StartLevelService;
 import org.openhab.core.storage.Storage;
 import org.openhab.core.storage.StorageService;
 import org.openhab.io.homekit.Homekit;
@@ -66,7 +69,7 @@
         Constants.SERVICE_PID + "=org.openhab.homekit", "port:Integer=9123" })
 @ConfigurableService(category = "io", label = "HomeKit Integration", description_uri = "io:homekit")
 @NonNullByDefault
-public class HomekitImpl implements Homekit, NetworkAddressChangeListener {
+public class HomekitImpl implements Homekit, NetworkAddressChangeListener, ReadyService.ReadyTracker {
     private final Logger logger = LoggerFactory.getLogger(HomekitImpl.class);
 
     private final StorageService storageService;
@@ -74,6 +77,7 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener {
     private final ConfigurationAdmin configAdmin;
     private final ItemRegistry itemRegistry;
     private final MetadataRegistry metadataRegistry;
+    private final ReadyService readyService;
 
     private final List<HomekitAuthInfoImpl> authInfos = new ArrayList<>();
     private HomekitSettings settings;
@@ -81,6 +85,7 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener {
     private final List<HomekitServer> homekitServers = new ArrayList<>();
     private final List<HomekitRoot> bridges = new ArrayList<>();
     private MDNSClient mdnsClient;
+    private int currentStartLevel = 0;
 
     private final List<HomekitChangeListener> changeListeners = new ArrayList<>();
 
@@ -90,7 +95,8 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener {
     @Activate
     public HomekitImpl(@Reference StorageService storageService, @Reference ItemRegistry itemRegistry,
             @Reference NetworkAddressService networkAddressService, @Reference MetadataRegistry metadataRegistry,
-            @Reference ConfigurationAdmin configAdmin, @Reference MDNSClient mdnsClient, Map<String, Object> properties)
+            @Reference ConfigurationAdmin configAdmin, @Reference MDNSClient mdnsClient,
+            @Reference ReadyService readyService, Map<String, Object> properties)
             throws IOException, InvalidAlgorithmParameterException {
         this.storageService = storageService;
         this.networkAddressService = networkAddressService;
@@ -99,13 +105,9 @@ public HomekitImpl(@Reference StorageService storageService, @Reference ItemRegi
         this.mdnsClient = mdnsClient;
         this.itemRegistry = itemRegistry;
         this.metadataRegistry = metadataRegistry;
+        this.readyService = readyService;
         networkAddressService.addNetworkAddressChangeListener(this);
-        try {
-            startHomekitServer();
-        } catch (IOException | InvalidAlgorithmParameterException e) {
-            logger.warn("cannot activate HomeKit binding. {}", e.getMessage());
-            throw e;
-        }
+        readyService.registerTracker(this, new ReadyMarkerFilter().withType(StartLevelService.STARTLEVEL_MARKER_TYPE));
     }
 
     private HomekitSettings processConfig(Map<String, Object> properties) {
@@ -160,7 +162,9 @@ protected synchronized void modified(Map<String, Object> config) {
                     || oldSettings.instances != settings.instances) {
                 // the HomeKit server settings changed. we do a complete re-init
                 stopHomekitServer();
-                startHomekitServer();
+                if (currentStartLevel >= StartLevelService.STARTLEVEL_STATES) {
+                    startHomekitServer();
+                }
             } else {
                 for (HomekitChangeListener changeListener : changeListeners) {
                     changeListener.updateSettings(settings);
@@ -171,6 +175,36 @@ protected synchronized void modified(Map<String, Object> config) {
         }
     }
 
+    @Override
+    public synchronized void onReadyMarkerAdded(ReadyMarker readyMarker) {
+        int newLevel = Integer.parseInt(readyMarker.getIdentifier());
+        currentStartLevel = newLevel;
+
+        if (newLevel >= StartLevelService.STARTLEVEL_STATES) {
+            try {
+                startHomekitServer();
+            } catch (IOException | InvalidAlgorithmParameterException e) {
+                logger.warn("could not initialize HomeKit bridge: {}", e.getMessage());
+            }
+        }
+    }
+
+    @Override
+    @SuppressWarnings("PMD.EmptyWhileStmt")
+    public synchronized void onReadyMarkerRemoved(ReadyMarker readyMarker) {
+        int newLevel = Integer.parseInt(readyMarker.getIdentifier());
+
+        if (currentStartLevel > newLevel) {
+            while (newLevel-- > 0 && !readyService
+                    .isReady(new ReadyMarker(StartLevelService.STARTLEVEL_MARKER_TYPE, Integer.toString(newLevel)))) {
+            }
+            currentStartLevel = newLevel;
+            if (currentStartLevel < StartLevelService.STARTLEVEL_STATES) {
+                stopHomekitServer();
+            }
+        }
+    }
+
     private HomekitRoot startBridge(HomekitServer homekitServer, HomekitAuthInfoImpl authInfo,
             HomekitChangeListener changeListener, int instance) throws IOException {
         String name = settings.name;
@@ -187,21 +221,7 @@ private HomekitRoot startBridge(HomekitServer homekitServer, HomekitAuthInfoImpl
 
         final int lastAccessoryCount = changeListener.getLastAccessoryCount();
         int currentAccessoryCount = changeListener.getAccessories().size();
-        if (!settings.useDummyAccessories && currentAccessoryCount < lastAccessoryCount) {
-            logger.debug(
-                    "it looks like not all items were initialized yet. Old configuration had {} accessories, the current one has only {} accessories. Delay HomeKit bridge start for {} seconds.",
-                    lastAccessoryCount, currentAccessoryCount, settings.startDelay);
-            scheduler.schedule(() -> {
-                if (currentAccessoryCount < lastAccessoryCount) {
-                    // the number of items is still different, maybe it is desired.
-                    // make new configuration revision.
-                    changeListener.makeNewConfigurationRevision();
-                }
-                bridge.start();
-            }, settings.startDelay, TimeUnit.SECONDS);
-        } else { // start bridge immediately.
-            bridge.start();
-        }
+        bridge.start();
         return bridge;
     }
 
@@ -319,6 +339,9 @@ public void pruneDummyAccessories() {
     @Override
     public synchronized void onChanged(final List<CidrAddress> added, final List<CidrAddress> removed) {
         logger.trace("HomeKit bridge reacting on network interface changes.");
+        if (currentStartLevel < StartLevelService.STARTLEVEL_STATES) {
+            return;
+        }
         removed.forEach(i -> {
             logger.trace("removed interface {}", i.getAddress().toString());
             if (i.getAddress().equals(networkInterface)) {
diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitSettings.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitSettings.java
index 0f0a7dc5d6698..e9111d5e4f484 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitSettings.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitSettings.java
@@ -30,7 +30,6 @@ public class HomekitSettings {
     public String pin = "031-45-154";
     public String setupId;
     public String qrCode;
-    public int startDelay = 30;
     public boolean useDummyAccessories = false;
     public boolean useFahrenheitTemperature = false;
     public boolean useOHmDNS = false;
diff --git a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/config/config.xml
index ed04873c78437..ca5bbf3bcfc0d 100644
--- a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/config/config.xml
+++ b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/config/config.xml
@@ -68,12 +68,6 @@
 			<description>Defines the IP address of the network interface to expose the HomeKit integration on.</description>
 			<advanced>true</advanced>
 		</parameter>
-		<parameter name="startDelay" type="integer" required="true" groupName="core" unit="s">
-			<label>Start Delay</label>
-			<description>HomeKit start delay in case of item configuration differences.</description>
-			<default>30</default>
-			<advanced>true</advanced>
-		</parameter>
 		<parameter name="useDummyAccessories" type="boolean" required="true" groupName="core">
 			<label>Use Dummy Accessories</label>
 			<description><![CDATA[Create dummy accessories when an item is missing. See <a href="https://www.openhab.org/addons/integrations/homekit/#dummy-accessories">the documentation</a> for more information.
diff --git a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/i18n/homekit.properties b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/i18n/homekit.properties
index fc586100248a0..0aef5ac4f5f2e 100644
--- a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/i18n/homekit.properties
+++ b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/i18n/homekit.properties
@@ -23,8 +23,6 @@ io.config.homekit.qrCode.label = HomeKit QR Code
 io.config.homekit.qrCode.description = Scan QR code with home app to add openHAB as HomeKit bridge.
 io.config.homekit.setupId.label = Setup ID
 io.config.homekit.setupId.description = Setup ID used for pairing using QR Code. Alphanumeric code of length 4.
-io.config.homekit.startDelay.label = Start Delay
-io.config.homekit.startDelay.description = HomeKit start delay in case of item configuration differences.
 io.config.homekit.thermostatCurrentModeCooling.label = Cooling Value
 io.config.homekit.thermostatCurrentModeCooling.description = Value for setting target heatingCoolingCurrentMode to COOL (IE: indicating that the air condition is currently cooling the home).
 io.config.homekit.thermostatCurrentModeHeating.label = Heating Value

From 70cca8fc778cecc3091dc99a1cf8a8c0188981bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Austvik?= <jaustvik@acm.org>
Date: Sun, 11 Dec 2022 16:09:53 +0100
Subject: [PATCH 35/48] [nanoleaf] More color for less network calls (#13893)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [nanoleaf] More color for less network calls

This is a refactoring that moves the "get panel color" out of the
panel handler and into a separate class, with callbacks.

This makes us do only one REST call to get colors instead of one per
panel that is a thing. It also lets us retrieve colors for all panels -
 also those that doesn't have a thing in OpenHAB,

While testing this out, I found a bug where solid colors set in the app
wasn't reflected in neither the controller nor panel channels, and that
should also be fixed now.

Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
---
 .../internal/NanoleafBindingConstants.java    |   3 +-
 ...NanoleafControllerColorChangeListener.java |  30 +++
 .../NanoleafPanelColorChangeListener.java     |  33 +++
 .../internal/colors/NanoleafPanelColors.java  | 155 +++++++++++++
 .../handler/NanoleafControllerHandler.java    | 203 +++++++++++++++---
 .../handler/NanoleafPanelHandler.java         | 163 +++++---------
 .../internal/layout/ConstantPanelState.java   |  36 ++++
 .../internal/layout/LivePanelState.java       |  47 ++++
 .../nanoleaf/internal/layout/PanelState.java  |  45 +---
 .../internal/layout/shape/PanelFactory.java   |   3 +-
 .../internal/layout/NanoleafLayoutTest.java   |   7 +-
 11 files changed, 532 insertions(+), 193 deletions(-)
 create mode 100644 bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafControllerColorChangeListener.java
 create mode 100644 bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafPanelColorChangeListener.java
 create mode 100644 bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafPanelColors.java
 create mode 100644 bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/ConstantPanelState.java
 create mode 100644 bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/LivePanelState.java

diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/NanoleafBindingConstants.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/NanoleafBindingConstants.java
index 5109d8abce320..96a1e6ceea67b 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/NanoleafBindingConstants.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/NanoleafBindingConstants.java
@@ -91,7 +91,8 @@ public class NanoleafBindingConstants {
     public static final String SERVICE_TYPE = "_nanoleafapi._tcp.local.";
 
     // Effect/scene name for static color
-    public static final String EFFECT_NAME_STATIC_COLOR = "*Dynamic*";
+    public static final String EFFECT_NAME_STATIC_COLOR = "*Static*";
+    public static final String EFFECT_NAME_SOLID_COLOR = "*Solid*";
 
     // Color channels increase/decrease brightness step size
     public static final int BRIGHTNESS_STEP_SIZE = 5;
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafControllerColorChangeListener.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafControllerColorChangeListener.java
new file mode 100644
index 0000000000000..346e11188464c
--- /dev/null
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafControllerColorChangeListener.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.nanoleaf.internal.colors;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * A listener used to notify panels when they change color.
+ *
+ * @author Jørgen Austvik - Initial contribution
+ */
+
+@NonNullByDefault
+public interface NanoleafControllerColorChangeListener {
+
+    /**
+     * This method is called after any panel changes its color.
+     */
+    void onPanelChangedColor();
+}
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafPanelColorChangeListener.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafPanelColorChangeListener.java
new file mode 100644
index 0000000000000..e01d0c34445df
--- /dev/null
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafPanelColorChangeListener.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.nanoleaf.internal.colors;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.library.types.HSBType;
+
+/**
+ * A listener used to notify panels when they change color.
+ *
+ * @author Jørgen Austvik - Initial contribution
+ */
+
+@NonNullByDefault
+public interface NanoleafPanelColorChangeListener {
+
+    /**
+     * This method is called after a panel changes its color
+     *
+     * @param newColor the new color of the panel
+     */
+    void onPanelChangedColor(HSBType newColor);
+}
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafPanelColors.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafPanelColors.java
new file mode 100644
index 0000000000000..bb6d2ccc9ac21
--- /dev/null
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/colors/NanoleafPanelColors.java
@@ -0,0 +1,155 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.nanoleaf.internal.colors;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.binding.nanoleaf.internal.handler.NanoleafPanelHandler;
+import org.openhab.core.library.types.HSBType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Stores information about panels and their colors, while sending notifications to panels and controllers
+ * about updated states.
+ *
+ * @author Jørgen Austvik - Initial contribution
+ */
+@NonNullByDefault
+public class NanoleafPanelColors {
+
+    private final Logger logger = LoggerFactory.getLogger(NanoleafPanelColors.class);
+
+    // holds current color data per panel
+    private final Map<Integer, HSBType> panelColors = new ConcurrentHashMap<>();
+    private final Map<Integer, NanoleafPanelColorChangeListener> panelChangeListeners = new ConcurrentHashMap<>();
+    private @Nullable NanoleafControllerColorChangeListener controllerListener;
+
+    private boolean updatePanelColorNoController(Integer panelId, HSBType color) {
+        boolean updatePanel = false;
+        if (panelColors.containsKey(panelId)) {
+            HSBType existingColor = panelColors.get(panelId);
+            if (existingColor != null && !existingColor.equals(color)) {
+                // Color change - update the panel thing
+                updatePanel = true;
+            }
+        } else {
+            // First time we see this panels color - update the panel thing
+            updatePanel = true;
+        }
+
+        panelColors.put(panelId, color);
+
+        if (updatePanel) {
+            @Nullable
+            NanoleafPanelColorChangeListener panelHandler = panelChangeListeners.get(panelId);
+            if (panelHandler != null) {
+                panelHandler.onPanelChangedColor(color);
+            }
+        }
+
+        return updatePanel;
+    }
+
+    private void updatePanelColor(Integer panelId, HSBType color) {
+        boolean updatePanel = updatePanelColorNoController(panelId, color);
+        if (updatePanel) {
+            notifyControllerListener();
+        }
+    }
+
+    private void notifyControllerListener() {
+        NanoleafControllerColorChangeListener privateControllerListener = controllerListener;
+        if (privateControllerListener != null) {
+            privateControllerListener.onPanelChangedColor();
+        }
+    }
+
+    /**
+     * Retrieves the color of the panel. Used by the panels to read their state.
+     *
+     * @param panelId The id of the panel
+     * @return The color of the panel
+     */
+    public @Nullable HSBType getPanelColor(Integer panelId) {
+        return panelColors.get(panelId);
+    }
+
+    /**
+     * Called from panels to update the state.
+     *
+     * @param panelId The panel that received the update
+     * @param color The new color of the panel
+     */
+    public void setPanelColor(Integer panelId, HSBType color) {
+        updatePanelColor(panelId, color);
+    }
+
+    public void registerChangeListener(Integer panelId, NanoleafPanelHandler panelListener) {
+        logger.trace("Adding color change listener for panel {}", panelId);
+        panelChangeListeners.put(panelId, panelListener);
+    }
+
+    public void unregisterChangeListener(Integer panelId) {
+        logger.trace("Removing color change listener for panel {}", panelId);
+        panelChangeListeners.remove(panelId);
+    }
+
+    public void registerChangeListener(NanoleafControllerColorChangeListener controllerListener) {
+        logger.trace("Setting color change listener for controller");
+        this.controllerListener = controllerListener;
+    }
+
+    /**
+     * Returns the color of a panel.
+     * 
+     * @param panelId The panel
+     * @param defaultColor Default color if panel is missing color information
+     * @return Color of the panel
+     */
+    public HSBType getColor(Integer panelId, HSBType defaultColor) {
+        return panelColors.getOrDefault(panelId, defaultColor);
+    }
+
+    /**
+     * Returns true if we have color information for the given panel.
+     *
+     * @param panelId The panel to check if has color
+     * @return true if we have color information about the panel
+     */
+    public boolean hasColor(Integer panelId) {
+        return panelColors.containsKey(panelId);
+    }
+
+    /**
+     * Sets all panels to the same color. This will make controller repaint only once.
+     * 
+     * @param panelIds Panels to update
+     * @param color The color for all panels
+     */
+    public void setMultiple(List<Integer> panelIds, HSBType color) {
+        logger.debug("Setting all panels to color {}", color);
+        boolean updatePanel = false;
+        for (Integer panelId : panelIds) {
+            updatePanel |= updatePanelColorNoController(panelId, color);
+        }
+
+        if (updatePanel) {
+            notifyControllerListener();
+        }
+    }
+}
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
index cd34d655d755d..21fbfb325ff11 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
@@ -17,6 +17,8 @@
 import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -36,15 +38,21 @@
 import org.eclipse.jetty.client.util.StringContentProvider;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
+import org.openhab.binding.nanoleaf.internal.NanoleafBadRequestException;
 import org.openhab.binding.nanoleaf.internal.NanoleafBindingConstants;
 import org.openhab.binding.nanoleaf.internal.NanoleafControllerListener;
 import org.openhab.binding.nanoleaf.internal.NanoleafException;
+import org.openhab.binding.nanoleaf.internal.NanoleafNotFoundException;
 import org.openhab.binding.nanoleaf.internal.NanoleafUnauthorizedException;
 import org.openhab.binding.nanoleaf.internal.OpenAPIUtils;
+import org.openhab.binding.nanoleaf.internal.colors.NanoleafControllerColorChangeListener;
+import org.openhab.binding.nanoleaf.internal.colors.NanoleafPanelColors;
 import org.openhab.binding.nanoleaf.internal.commanddescription.NanoleafCommandDescriptionProvider;
 import org.openhab.binding.nanoleaf.internal.config.NanoleafControllerConfig;
 import org.openhab.binding.nanoleaf.internal.discovery.NanoleafPanelsDiscoveryService;
+import org.openhab.binding.nanoleaf.internal.layout.ConstantPanelState;
 import org.openhab.binding.nanoleaf.internal.layout.LayoutSettings;
+import org.openhab.binding.nanoleaf.internal.layout.LivePanelState;
 import org.openhab.binding.nanoleaf.internal.layout.NanoleafLayout;
 import org.openhab.binding.nanoleaf.internal.layout.PanelState;
 import org.openhab.binding.nanoleaf.internal.model.AuthToken;
@@ -58,10 +66,12 @@
 import org.openhab.binding.nanoleaf.internal.model.Layout;
 import org.openhab.binding.nanoleaf.internal.model.On;
 import org.openhab.binding.nanoleaf.internal.model.PanelLayout;
+import org.openhab.binding.nanoleaf.internal.model.PositionDatum;
 import org.openhab.binding.nanoleaf.internal.model.Rhythm;
 import org.openhab.binding.nanoleaf.internal.model.Sat;
 import org.openhab.binding.nanoleaf.internal.model.State;
 import org.openhab.binding.nanoleaf.internal.model.TouchEvents;
+import org.openhab.binding.nanoleaf.internal.model.Write;
 import org.openhab.core.config.core.Configuration;
 import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.library.types.DecimalType;
@@ -96,7 +106,7 @@
  * @author Kai Kreuzer - refactoring, bug fixing and code clean up
  */
 @NonNullByDefault
-public class NanoleafControllerHandler extends BaseBridgeHandler {
+public class NanoleafControllerHandler extends BaseBridgeHandler implements NanoleafControllerColorChangeListener {
 
     // Pairing interval in seconds
     private static final int PAIRING_INTERVAL = 10;
@@ -110,6 +120,7 @@ public class NanoleafControllerHandler extends BaseBridgeHandler {
     private @Nullable Request sseTouchjobRequest;
     private final List<NanoleafControllerListener> controllerListeners = new CopyOnWriteArrayList<NanoleafControllerListener>();
     private PanelLayout previousPanelLayout = new PanelLayout();
+    private final NanoleafPanelColors panelColors = new NanoleafPanelColors();
 
     private @NonNullByDefault({}) ScheduledFuture<?> pairingJob;
     private @NonNullByDefault({}) ScheduledFuture<?> updateJob;
@@ -154,6 +165,7 @@ private void initializeTouchHttpClient() {
     @Override
     public void initialize() {
         logger.debug("Initializing the controller (bridge)");
+        this.panelColors.registerChangeListener(this);
         updateStatus(ThingStatus.UNKNOWN);
         NanoleafControllerConfig config = getConfigAs(NanoleafControllerConfig.class);
         setAddress(config.address);
@@ -582,7 +594,7 @@ private void handleTouchEvents(TouchEvents touchEvents) {
                     if (panelHandler != null) {
                         logger.trace("Checking available panel -{}- versus event panel -{}-", panelHandler.getPanelID(),
                                 event.getPanelId());
-                        if (panelHandler.getPanelID().equals(event.getPanelId())) {
+                        if (panelHandler.getPanelID().equals(Integer.valueOf(event.getPanelId()))) {
                             logger.debug("Panel {} found. Triggering item with gesture {}.", panelHandler.getPanelID(),
                                     event.getGesture());
                             panelHandler.updatePanelGesture(event.getGesture());
@@ -648,34 +660,52 @@ private void updateFromControllerInfo() throws NanoleafException {
 
         Brightness stateBrightness = state.getBrightness();
         int brightness = stateBrightness != null ? stateBrightness.getValue() : 0;
+        HSBType stateColor = new HSBType(new DecimalType(hue), new PercentType(saturation),
+                new PercentType(powerState == OnOffType.ON ? brightness : 0));
 
-        updateState(CHANNEL_COLOR, new HSBType(new DecimalType(hue), new PercentType(saturation),
-                new PercentType(powerState == OnOffType.ON ? brightness : 0)));
+        updateState(CHANNEL_COLOR, stateColor);
         updateState(CHANNEL_COLOR_MODE, new StringType(state.getColorMode()));
         updateState(CHANNEL_RHYTHM_ACTIVE, controllerInfo.getRhythm().getRhythmActive() ? OnOffType.ON : OnOffType.OFF);
         updateState(CHANNEL_RHYTHM_MODE, new DecimalType(controllerInfo.getRhythm().getRhythmMode()));
         updateState(CHANNEL_RHYTHM_STATE,
                 controllerInfo.getRhythm().getRhythmConnected() ? OnOffType.ON : OnOffType.OFF);
 
-        // update the color channels of each panel
-        getThing().getThings().forEach(child -> {
-            NanoleafPanelHandler panelHandler = (NanoleafPanelHandler) child.getHandler();
-            if (panelHandler != null) {
-                logger.debug("Update color channel for panel {}", panelHandler.getThing().getUID());
-                panelHandler.updatePanelColorChannel();
-            }
-        });
-
+        updatePanelColors();
+        if (EFFECT_NAME_SOLID_COLOR.equals(controllerInfo.getEffects().getSelect())) {
+            setSolidColor(stateColor);
+        }
         updateProperties();
         updateConfiguration();
         updateLayout(controllerInfo.getPanelLayout());
-        updateVisualState(controllerInfo.getPanelLayout());
+        updateVisualState(controllerInfo.getPanelLayout(), powerState);
 
         for (NanoleafControllerListener controllerListener : controllerListeners) {
             controllerListener.onControllerInfoFetched(getThing().getUID(), controllerInfo);
         }
     }
 
+    private void setSolidColor(HSBType color) {
+        // If the panels are set to solid color, they are read from the state
+        PanelLayout panelLayout = controllerInfo.getPanelLayout();
+        Layout layout = panelLayout.getLayout();
+
+        if (layout != null) {
+            List<PositionDatum> positionData = layout.getPositionData();
+            if (positionData != null) {
+                List<Integer> allPanelIds = new ArrayList<>(positionData.size());
+                for (PositionDatum pd : positionData) {
+                    allPanelIds.add(pd.getPanelId());
+                }
+
+                panelColors.setMultiple(allPanelIds, color);
+            } else {
+                logger.debug("Missing position datum when setting solid color for {}", getThing().getUID());
+            }
+        } else {
+            logger.debug("Missing layout when setting solid color for {}", getThing().getUID());
+        }
+    }
+
     private void updateConfiguration() {
         // only update the Thing config if value isn't set yet
         if (getConfig().get(NanoleafControllerConfig.DEVICE_TYPE) == null) {
@@ -711,20 +741,20 @@ private void updateProperties() {
         }
     }
 
-    private void updateVisualState(PanelLayout panelLayout) {
+    private void updateVisualState(PanelLayout panelLayout, OnOffType powerState) {
         ChannelUID stateChannel = new ChannelUID(getThing().getUID(), CHANNEL_VISUAL_STATE);
 
-        Bridge bridge = getThing();
-        List<Thing> things = bridge.getThings();
-        if (things == null) {
-            logger.trace("No things to get state from!");
-            return;
-        }
-
         try {
+            PanelState panelState;
+            if (OnOffType.OFF.equals(powerState)) {
+                // If powered off: show all panels as black
+                panelState = new ConstantPanelState(HSBType.BLACK);
+            } else {
+                // Static color for panels, use it
+                panelState = new LivePanelState(panelColors);
+            }
+
             LayoutSettings settings = new LayoutSettings(false, true, true, true);
-            logger.trace("Getting panel state for {} things", things.size());
-            PanelState panelState = new PanelState(things);
             byte[] bytes = NanoleafLayout.render(panelLayout, panelState, settings);
             if (bytes.length > 0) {
                 updateState(stateChannel, new RawType(bytes, "image/png"));
@@ -756,11 +786,9 @@ private void updateLayout(PanelLayout panelLayout) {
             return;
         }
 
-        Bridge bridge = getThing();
-        List<Thing> things = bridge.getThings();
         try {
             LayoutSettings settings = new LayoutSettings(true, false, true, false);
-            byte[] bytes = NanoleafLayout.render(panelLayout, new PanelState(things), settings);
+            byte[] bytes = NanoleafLayout.render(panelLayout, new LivePanelState(panelColors), settings);
             if (bytes.length > 0) {
                 updateState(layoutChannel, new RawType(bytes, "image/png"));
                 logger.trace("Rendered layout of panel {} in updateState has {} bytes", getThing().getUID(),
@@ -799,6 +827,7 @@ private void sendStateCommand(String channel, Command command) throws NanoleafEx
                     h.setValue(((HSBType) command).getHue().intValue());
                     s.setValue(((HSBType) command).getSaturation().intValue());
                     b.setValue(((HSBType) command).getBrightness().intValue());
+                    setSolidColor((HSBType) command);
                     stateObject.setState(h);
                     stateObject.setState(s);
                     stateObject.setState(b);
@@ -919,6 +948,126 @@ private void sendRhythmCommand(Command command) throws NanoleafException {
         }
     }
 
+    private boolean hasStaticEffect() {
+        return EFFECT_NAME_STATIC_COLOR.equals(controllerInfo.getEffects().getSelect())
+                || EFFECT_NAME_SOLID_COLOR.equals(controllerInfo.getEffects().getSelect());
+    }
+
+    /**
+     * Checks if we are in a mode where color changes should be rendered.
+     *
+     * @return True if a color change on a panel should be rendered
+     */
+    private boolean showsUpdatedColors() {
+        if (!hasStaticEffect()) {
+            return false;
+        }
+
+        State state = controllerInfo.getState();
+        OnOffType powerState = state.getOnOff();
+        return OnOffType.ON.equals(powerState);
+    }
+
+    @Override
+    public void onPanelChangedColor() {
+        if (showsUpdatedColors()) {
+            // Update the visual state if a panel has changed color
+            updateVisualState(controllerInfo.getPanelLayout(), controllerInfo.getState().getOnOff());
+        }
+    }
+
+    /**
+     * For individual panels to get access to the panel colors.
+     *
+     * @return Information about colors of panels.
+     */
+    public NanoleafPanelColors getColorInformation() {
+        return panelColors;
+    }
+
+    private void updatePanelColors() {
+        // get panel color data from controller
+        try {
+            Effects effects = new Effects();
+            Write write = new Write();
+            write.setCommand("request");
+            write.setAnimName(EFFECT_NAME_STATIC_COLOR);
+            effects.setWrite(write);
+            Bridge bridge = getBridge();
+            if (bridge != null) {
+                NanoleafControllerHandler handler = (NanoleafControllerHandler) bridge.getHandler();
+                if (handler != null) {
+                    NanoleafControllerConfig config = handler.getControllerConfig();
+                    logger.debug("Sending Request from Panel for getColor()");
+                    Request setPanelUpdateRequest = OpenAPIUtils.requestBuilder(httpClient, config, API_EFFECT,
+                            HttpMethod.PUT);
+                    setPanelUpdateRequest.content(new StringContentProvider(gson.toJson(effects)), "application/json");
+                    ContentResponse panelData = OpenAPIUtils.sendOpenAPIRequest(setPanelUpdateRequest);
+                    // parse panel data
+
+                    parsePanelData(config, panelData);
+                }
+            }
+        } catch (NanoleafNotFoundException nfe) {
+            logger.debug("Panel data could not be retrieved as no data was returned (static type missing?) : {}",
+                    nfe.getMessage());
+        } catch (NanoleafBadRequestException nfe) {
+            logger.debug(
+                    "Panel data could not be retrieved as request not expected(static type missing / dynamic type on) : {}",
+                    nfe.getMessage());
+        } catch (NanoleafException nue) {
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
+                    "@text/error.nanoleaf.panel.communication");
+            logger.debug("Panel data could not be retrieved: {}", nue.getMessage());
+        }
+    }
+
+    void parsePanelData(NanoleafControllerConfig config, ContentResponse panelData) {
+        // panelData is in format (numPanels, (PanelId, 1, R, G, B, W, TransitionTime) * numPanel)
+        @Nullable
+        Write response = null;
+
+        String panelDataContent = panelData.getContentAsString();
+        try {
+            response = gson.fromJson(panelDataContent, Write.class);
+        } catch (JsonSyntaxException jse) {
+            logger.warn("Unable to parse panel data information from Nanoleaf", jse);
+            logger.trace("Panel Data which couldn't be parsed: {}", panelDataContent);
+        }
+
+        if (response != null) {
+            String[] tokenizedData = response.getAnimData().split(" ");
+            if (config.deviceType.equals(CONFIG_DEVICE_TYPE_LIGHTPANELS)
+                    || config.deviceType.equals(CONFIG_DEVICE_TYPE_CANVAS)) {
+                // panelData is in format (numPanels (PanelId 1 R G B W TransitionTime) * numPanel)
+                String[] panelDataPoints = Arrays.copyOfRange(tokenizedData, 1, tokenizedData.length);
+                for (int i = 0; i < panelDataPoints.length; i++) {
+                    if (i % 7 == 0) {
+                        // found panel data - store it
+                        panelColors.setPanelColor(Integer.valueOf(panelDataPoints[i]),
+                                HSBType.fromRGB(Integer.parseInt(panelDataPoints[i + 2]),
+                                        Integer.parseInt(panelDataPoints[i + 3]),
+                                        Integer.parseInt(panelDataPoints[i + 4])));
+                    }
+                }
+            } else {
+                // panelData is in format (0 numPanels (quotient(panelID) remainder(panelID) R G B W 0
+                // quotient(TransitionTime) remainder(TransitionTime)) * numPanel)
+                String[] panelDataPoints = Arrays.copyOfRange(tokenizedData, 2, tokenizedData.length);
+                for (int i = 0; i < panelDataPoints.length; i++) {
+                    if (i % 8 == 0) {
+                        Integer idQuotient = Integer.valueOf(panelDataPoints[i]);
+                        Integer idRemainder = Integer.valueOf(panelDataPoints[i + 1]);
+                        Integer idNum = idQuotient * 256 + idRemainder;
+                        // found panel data - store it
+                        panelColors.setPanelColor(idNum, HSBType.fromRGB(Integer.parseInt(panelDataPoints[i + 3]),
+                                Integer.parseInt(panelDataPoints[i + 4]), Integer.parseInt(panelDataPoints[i + 5])));
+                    }
+                }
+            }
+        }
+    }
+
     private @Nullable String getAddress() {
         return address;
     }
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafPanelHandler.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafPanelHandler.java
index 60b66196c6c9e..e80545dd901e1 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafPanelHandler.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafPanelHandler.java
@@ -16,23 +16,18 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.util.StringContentProvider;
 import org.eclipse.jetty.http.HttpMethod;
-import org.openhab.binding.nanoleaf.internal.NanoleafBadRequestException;
 import org.openhab.binding.nanoleaf.internal.NanoleafException;
-import org.openhab.binding.nanoleaf.internal.NanoleafNotFoundException;
 import org.openhab.binding.nanoleaf.internal.NanoleafUnauthorizedException;
 import org.openhab.binding.nanoleaf.internal.OpenAPIUtils;
+import org.openhab.binding.nanoleaf.internal.colors.NanoleafPanelColorChangeListener;
 import org.openhab.binding.nanoleaf.internal.config.NanoleafControllerConfig;
 import org.openhab.binding.nanoleaf.internal.model.Effects;
 import org.openhab.binding.nanoleaf.internal.model.Write;
@@ -50,6 +45,7 @@
 import org.openhab.core.thing.ThingStatusInfo;
 import org.openhab.core.thing.binding.BaseThingHandler;
 import org.openhab.core.thing.binding.BridgeHandler;
+import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.RefreshType;
 import org.slf4j.Logger;
@@ -65,7 +61,7 @@
  * @author Stefan Höhn - Canvas Touch Support
  */
 @NonNullByDefault
-public class NanoleafPanelHandler extends BaseThingHandler {
+public class NanoleafPanelHandler extends BaseThingHandler implements NanoleafPanelColorChangeListener {
 
     private static final PercentType MIN_PANEL_BRIGHTNESS = PercentType.ZERO;
     private static final PercentType MAX_PANEL_BRIGHTNESS = PercentType.HUNDRED;
@@ -75,9 +71,7 @@ public class NanoleafPanelHandler extends BaseThingHandler {
     private final HttpClient httpClient;
     // JSON parser for API responses
     private final Gson gson = new Gson();
-
-    // holds current color data per panel
-    private final Map<String, HSBType> panelInfo = new HashMap<>();
+    private HSBType currentPanelColor = HSBType.BLACK;
 
     private @NonNullByDefault({}) ScheduledFuture<?> singleTapJob;
     private @NonNullByDefault({}) ScheduledFuture<?> doubleTapJob;
@@ -141,6 +135,14 @@ public void handleCommand(ChannelUID channelUID, Command command) {
     @Override
     public void handleRemoval() {
         logger.debug("Nanoleaf panel {} removed", getThing().getUID());
+        Bridge bridge = getBridge();
+        if (bridge != null) {
+            ThingHandler handler = bridge.getHandler();
+            if (handler instanceof NanoleafControllerHandler) {
+                ((NanoleafControllerHandler) handler).getColorInformation().unregisterChangeListener(getPanelID());
+            }
+        }
+
         super.handleRemoval();
     }
 
@@ -166,21 +168,27 @@ private void stopAllJobs() {
 
     private void initializePanel(ThingStatusInfo panelStatus) {
         updateStatus(panelStatus.getStatus(), panelStatus.getStatusDetail());
+        updateState(CHANNEL_PANEL_COLOR, currentPanelColor);
         logger.debug("Panel {} status changed to {}-{}", this.getThing().getUID(), panelStatus.getStatus(),
                 panelStatus.getStatusDetail());
+
+        Bridge bridge = getBridge();
+        if (bridge != null) {
+            ThingHandler handler = bridge.getHandler();
+            if (handler instanceof NanoleafControllerHandler) {
+                ((NanoleafControllerHandler) handler).getColorInformation().registerChangeListener(getPanelID(), this);
+            }
+        }
     }
 
     private void sendRenderedEffectCommand(Command command) throws NanoleafException {
         logger.debug("Command Type: {}", command.getClass());
-        HSBType currentPanelColor = getPanelColor();
-        if (currentPanelColor != null) {
-            logger.debug("currentPanelColor: {}", currentPanelColor.toString());
-        }
-        HSBType newPanelColor = new HSBType();
+        logger.debug("currentPanelColor: {}", currentPanelColor);
 
+        HSBType newPanelColor = new HSBType();
         if (command instanceof HSBType) {
             newPanelColor = (HSBType) command;
-        } else if (command instanceof OnOffType && (currentPanelColor != null)) {
+        } else if (command instanceof OnOffType) {
             if (OnOffType.ON.equals(command)) {
                 newPanelColor = new HSBType(currentPanelColor.getHue(), currentPanelColor.getSaturation(),
                         MAX_PANEL_BRIGHTNESS);
@@ -188,11 +196,11 @@ private void sendRenderedEffectCommand(Command command) throws NanoleafException
                 newPanelColor = new HSBType(currentPanelColor.getHue(), currentPanelColor.getSaturation(),
                         MIN_PANEL_BRIGHTNESS);
             }
-        } else if (command instanceof PercentType && (currentPanelColor != null)) {
+        } else if (command instanceof PercentType) {
             PercentType brightness = new PercentType(
                     Math.max(MIN_PANEL_BRIGHTNESS.intValue(), ((PercentType) command).intValue()));
             newPanelColor = new HSBType(currentPanelColor.getHue(), currentPanelColor.getSaturation(), brightness);
-        } else if (command instanceof IncreaseDecreaseType && (currentPanelColor != null)) {
+        } else if (command instanceof IncreaseDecreaseType) {
             int brightness = currentPanelColor.getBrightness().intValue();
             if (command.equals(IncreaseDecreaseType.INCREASE)) {
                 brightness = Math.min(MAX_PANEL_BRIGHTNESS.intValue(), brightness + BRIGHTNESS_STEP_SIZE);
@@ -209,8 +217,8 @@ private void sendRenderedEffectCommand(Command command) throws NanoleafException
             return;
         }
         // store panel's new HSB value
-        logger.trace("Setting new color {}", newPanelColor);
-        panelInfo.put(getThing().getConfiguration().get(CONFIG_PANEL_ID).toString(), newPanelColor);
+        logger.trace("Setting new color {} to panel {}", newPanelColor, getPanelID());
+        setPanelColor(newPanelColor);
         // transform to RGB
         PercentType[] rgbPercent = newPanelColor.toRGB();
         logger.trace("Setting new rgbpercent {} {} {}", rgbPercent[0], rgbPercent[1], rgbPercent[2]);
@@ -258,15 +266,6 @@ private void sendRenderedEffectCommand(Command command) throws NanoleafException
         }
     }
 
-    public void updatePanelColorChannel() {
-        @Nullable
-        HSBType panelColor = getPanelColor();
-        logger.trace("updatePanelColorChannel: panelColor: {}", panelColor);
-        if (panelColor != null) {
-            updateState(CHANNEL_PANEL_COLOR, panelColor);
-        }
-    }
-
     /**
      * Apply the gesture to the panel
      *
@@ -286,98 +285,32 @@ public void updatePanelGesture(int gesture) {
         }
     }
 
-    public String getPanelID() {
-        String panelID = getThing().getConfiguration().get(CONFIG_PANEL_ID).toString();
-        return panelID;
-    }
-
-    public @Nullable HSBType getColor() {
-        String panelID = getPanelID();
-        return panelInfo.get(panelID);
+    public Integer getPanelID() {
+        return (Integer) getThing().getConfiguration().get(CONFIG_PANEL_ID);
     }
 
-    private @Nullable HSBType getPanelColor() {
-        String panelID = getPanelID();
-
-        // get panel color data from controller
-        try {
-            Effects effects = new Effects();
-            Write write = new Write();
-            write.setCommand("request");
-            write.setAnimName("*Static*");
-            effects.setWrite(write);
-            Bridge bridge = getBridge();
-            if (bridge != null) {
-                NanoleafControllerHandler handler = (NanoleafControllerHandler) bridge.getHandler();
-                if (handler != null) {
-                    NanoleafControllerConfig config = handler.getControllerConfig();
-                    logger.debug("Sending Request from Panel for getColor()");
-                    Request setPanelUpdateRequest = OpenAPIUtils.requestBuilder(httpClient, config, API_EFFECT,
-                            HttpMethod.PUT);
-                    setPanelUpdateRequest.content(new StringContentProvider(gson.toJson(effects)), "application/json");
-                    ContentResponse panelData = OpenAPIUtils.sendOpenAPIRequest(setPanelUpdateRequest);
-                    // parse panel data
-
-                    parsePanelData(panelID, config, panelData);
-                }
+    private void setPanelColor(HSBType color) {
+        Integer panelId = getPanelID();
+        Bridge bridge = getBridge();
+        if (bridge != null) {
+            ThingHandler handler = bridge.getHandler();
+            if (handler instanceof NanoleafControllerHandler) {
+                ((NanoleafControllerHandler) handler).getColorInformation().setPanelColor(panelId, color);
+            } else {
+                logger.debug("Couldn't find handler for panel {}", panelId);
             }
-        } catch (NanoleafNotFoundException nfe) {
-            logger.debug("Panel data could not be retrieved as no data was returned (static type missing?) : {}",
-                    nfe.getMessage());
-        } catch (NanoleafBadRequestException nfe) {
-            logger.debug(
-                    "Panel data could not be retrieved as request not expected(static type missing / dynamic type on) : {}",
-                    nfe.getMessage());
-        } catch (NanoleafException nue) {
-            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
-                    "@text/error.nanoleaf.panel.communication");
-            logger.debug("Panel data could not be retrieved: {}", nue.getMessage());
+        } else {
+            logger.debug("Couldn't find bridge for panel {}", panelId);
         }
-
-        return panelInfo.get(panelID);
     }
 
-    void parsePanelData(String panelID, NanoleafControllerConfig config, ContentResponse panelData) {
-        // panelData is in format (numPanels, (PanelId, 1, R, G, B, W, TransitionTime) * numPanel)
-        @Nullable
-        Write response = gson.fromJson(panelData.getContentAsString(), Write.class);
-        if (response != null) {
-            String[] tokenizedData = response.getAnimData().split(" ");
-            if (config.deviceType.equals(CONFIG_DEVICE_TYPE_LIGHTPANELS)
-                    || config.deviceType.equals(CONFIG_DEVICE_TYPE_CANVAS)) {
-                // panelData is in format (numPanels (PanelId 1 R G B W TransitionTime) * numPanel)
-                String[] panelDataPoints = Arrays.copyOfRange(tokenizedData, 1, tokenizedData.length);
-                for (int i = 0; i < panelDataPoints.length; i++) {
-                    if (i % 7 == 0) {
-                        String id = panelDataPoints[i];
-                        if (id.equals(panelID)) {
-                            // found panel data - store it
-                            panelInfo.put(panelID,
-                                    HSBType.fromRGB(Integer.parseInt(panelDataPoints[i + 2]),
-                                            Integer.parseInt(panelDataPoints[i + 3]),
-                                            Integer.parseInt(panelDataPoints[i + 4])));
-                        }
-                    }
-                }
-            } else {
-                // panelData is in format (0 numPanels (quotient(panelID) remainder(panelID) R G B W 0
-                // quotient(TransitionTime) remainder(TransitionTime)) * numPanel)
-                String[] panelDataPoints = Arrays.copyOfRange(tokenizedData, 2, tokenizedData.length);
-                for (int i = 0; i < panelDataPoints.length; i++) {
-                    if (i % 8 == 0) {
-                        Integer idQuotient = Integer.valueOf(panelDataPoints[i]);
-                        Integer idRemainder = Integer.valueOf(panelDataPoints[i + 1]);
-                        Integer idNum = idQuotient * 256 + idRemainder;
-                        if (String.valueOf(idNum).equals(panelID)) {
-                            // found panel data - store it
-                            panelInfo.put(panelID,
-                                    HSBType.fromRGB(Integer.parseInt(panelDataPoints[i + 3]),
-                                            Integer.parseInt(panelDataPoints[i + 4]),
-                                            Integer.parseInt(panelDataPoints[i + 5])));
-                        }
-                    }
-                }
-            }
+    @Override
+    public void onPanelChangedColor(HSBType newColor) {
+        if (logger.isTraceEnabled()) {
+            logger.trace("updatePanelColorChannel: panelColor: {} for panel {}", newColor, getPanelID());
         }
+
+        currentPanelColor = newColor;
+        updateState(CHANNEL_PANEL_COLOR, newColor);
     }
 }
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/ConstantPanelState.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/ConstantPanelState.java
new file mode 100644
index 0000000000000..7f6c0f4e716c8
--- /dev/null
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/ConstantPanelState.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.openhab.binding.nanoleaf.internal.layout;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.core.library.types.HSBType;
+
+/**
+ * Always returns the same color for all panels.
+ *
+ * @author Jørgen Austvik - Initial contribution
+ */
+@NonNullByDefault
+public class ConstantPanelState implements PanelState {
+    private final HSBType color;
+
+    public ConstantPanelState(HSBType color) {
+        this.color = color;
+    }
+
+    @Override
+    public HSBType getHSBForPanel(Integer panelId) {
+        return color;
+    }
+}
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/LivePanelState.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/LivePanelState.java
new file mode 100644
index 0000000000000..05b2f312b5b57
--- /dev/null
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/LivePanelState.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2010-2022 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.openhab.binding.nanoleaf.internal.layout;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.nanoleaf.internal.colors.NanoleafPanelColors;
+import org.openhab.core.library.types.HSBType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Stores the state of the panels.
+ *
+ * @author Jørgen Austvik - Initial contribution
+ */
+@NonNullByDefault
+public class LivePanelState implements PanelState {
+
+    private static final Logger logger = LoggerFactory.getLogger(LivePanelState.class);
+    private final NanoleafPanelColors panelColors;
+
+    public LivePanelState(NanoleafPanelColors panelColors) {
+        this.panelColors = panelColors;
+    }
+
+    @Override
+    public HSBType getHSBForPanel(Integer panelId) {
+        if (logger.isTraceEnabled()) {
+            if (!panelColors.hasColor(panelId)) {
+                logger.trace("Failed to get color for panel {}, falling back to black", panelId);
+            }
+        }
+
+        return panelColors.getColor(panelId, HSBType.BLACK);
+    }
+}
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/PanelState.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/PanelState.java
index 02c6a7a947d61..1fb251ff6bf3c 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/PanelState.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/PanelState.java
@@ -10,21 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-
 package org.openhab.binding.nanoleaf.internal.layout;
 
-import static org.openhab.binding.nanoleaf.internal.NanoleafBindingConstants.CONFIG_PANEL_ID;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.binding.nanoleaf.internal.handler.NanoleafPanelHandler;
 import org.openhab.core.library.types.HSBType;
-import org.openhab.core.thing.Thing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Stores the state of the panels.
@@ -32,37 +21,7 @@
  * @author Jørgen Austvik - Initial contribution
  */
 @NonNullByDefault
-public class PanelState {
-
-    private static final Logger logger = LoggerFactory.getLogger(PanelState.class);
-    private final Map<Integer, HSBType> panelStates = new HashMap<>();
-
-    public PanelState(List<Thing> panels) {
-        for (Thing panel : panels) {
-            Integer panelId = Integer.valueOf(panel.getConfiguration().get(CONFIG_PANEL_ID).toString());
-            NanoleafPanelHandler panelHandler = (NanoleafPanelHandler) panel.getHandler();
-            if (panelHandler != null) {
-                HSBType c = panelHandler.getColor();
-
-                if (c == null) {
-                    logger.trace("Panel {}: Failed to get color", panelId);
-                }
-
-                HSBType color = (c == null) ? HSBType.BLACK : c;
-                panelStates.put(panelId, color);
-            } else {
-                logger.trace("Panel {}: Couldn't find handler", panelId);
-            }
-        }
-    }
-
-    public HSBType getHSBForPanel(Integer panelId) {
-        if (logger.isTraceEnabled()) {
-            if (!panelStates.containsKey(panelId)) {
-                logger.trace("Failed to get color for panel {}, falling back to black", panelId);
-            }
-        }
+public interface PanelState {
 
-        return panelStates.getOrDefault(panelId, HSBType.BLACK);
-    }
+    HSBType getHSBForPanel(Integer panelId);
 }
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/PanelFactory.java b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/PanelFactory.java
index f0425f45b5b3f..2fa76a0d2c9d6 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/PanelFactory.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/layout/shape/PanelFactory.java
@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
+import java.util.Objects;
 import java.util.Queue;
 
 import org.eclipse.jdt.annotation.NonNull;
@@ -36,7 +37,7 @@ public static List<Panel> createPanels(List<PositionDatum> panels) {
         List<Panel> result = new ArrayList<>(panels.size());
         Deque<PositionDatum> panelStack = new ArrayDeque<>(panels);
         while (!panelStack.isEmpty()) {
-            PositionDatum panel = panelStack.peek();
+            PositionDatum panel = Objects.requireNonNull(panelStack.peek());
             final ShapeType shapeType = ShapeType.valueOf(panel.getShapeType());
             Panel shape = createPanel(shapeType, takeFirst(shapeType.getNumLightsPerShape(), panelStack));
             result.add(shape);
diff --git a/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java b/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
index 2400808d35e67..e459d2c27f48b 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
+++ b/bundles/org.openhab.binding.nanoleaf/src/test/java/org/openhab/binding/nanoleaf/internal/layout/NanoleafLayoutTest.java
@@ -18,7 +18,6 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -70,14 +69,10 @@ public void testFile(String fileName) throws Exception {
         // Files.write(permanentOutFile, result);
     }
 
-    private class TestPanelState extends PanelState {
+    private class TestPanelState implements PanelState {
         private final HSBType testColors[] = { HSBType.fromRGB(160, 120, 40), HSBType.fromRGB(80, 60, 20),
                 HSBType.fromRGB(120, 90, 30), HSBType.fromRGB(200, 150, 60) };
 
-        public TestPanelState() {
-            super(Collections.emptyList());
-        }
-
         @Override
         public HSBType getHSBForPanel(Integer panelId) {
             return testColors[panelId % testColors.length];

From 3ea004ad35583051042da6abc460b815ba41cfab Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Sun, 11 Dec 2022 15:21:25 +0000
Subject: [PATCH 36/48] [siemensrds] Update to documentation (#13913)

* [siemensrds] resolve issue #13906
* [siemensrds] add chapter to readme

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../org.openhab.binding.siemensrds/README.md    | 17 +++++++++++++----
 .../siemensrds/internal/RdsAccessToken.java     | 11 ++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/bundles/org.openhab.binding.siemensrds/README.md b/bundles/org.openhab.binding.siemensrds/README.md
index 41b4951a20af0..67993549e3811 100644
--- a/bundles/org.openhab.binding.siemensrds/README.md
+++ b/bundles/org.openhab.binding.siemensrds/README.md
@@ -41,6 +41,7 @@ However the Climatix IC cloud server is also used for supporting private custome
 But Siemens customer support people are often unaware of the latter fact, so when you ask them for the API key for the RDS smart thermostat range, their first reaction might often be to say you are talking nonsense!
 Do not accept that answer!
 You need to insist that you are requesting the Climatix IC cloud server API key _**for the RDS smart thermostat range**_ – it is a <u>different</u> key than those for OEM commercial customers.
+You can also get the API key by observing the traffic between your RDS App and the server, as explained [below](#observing-the-api-key).
 
 Note: You must create ONLY ONE Thing of the type Climatix IC Account; duplicate Climatix IC Account Things risk causing communication errors with the cloud server.   
 
@@ -71,18 +72,26 @@ The RDS Smart Thermostat supports several channels as shown below.
 | hotWaterAutoMode         | Switch             | The Domestic Water Heating is in Automatic Mode (Off=Manual, On=Automatic)  |
 | hotWaterOutputState      | Switch             | The On/Off state of the domestic water heating                              |
 
+## Observing the API Key
+
+You can find your API key by observing the traffic between the RDS App on a phone/tablet and the remote ClimatixIC server.
+The traffic is encrypted using SSL so regular network analyzers like [WireShark](https://www.wireshark.org/) will not work.
+But you can use an interposing SSL proxy server like [Charles Proxy](https://www.charlesproxy.com/).
+The general technique of using Charles Proxy to observe SSL App/server traffic is explained in this [video](https://m.youtube.com/watch?v=r7aV39-CKg4).
+And specifically for this case you can examine the SSL traffic to 'api.climatixic.com', and search for the 'Ocp-Apim-Subscription-Key’ header.
+
 ## Full Example
 
 ### `demo.things` File
 
-```
+```java
 Bridge siemensrds:climatixic:mybridgename "Climatix IC Account" [ userEmail="email@example.com", userPassword="secret", apiKey="32-character-code-provided-by-siemens", pollingInterval=60 ]
 }
 ```
 
 To manually configure an RDS Smart Thermostat Thing requires knowledge of the "Plant Id" which is a unique code used to identify a specific thermostat device in the Siemens Climatix IC cloud server account.
 
-```
+```java
 Bridge siemensrds:climatixic:mybridgename "Climatix IC Account" [ userEmail="email@example.com", userPassword="secret", apiKey="32-character-code-provided-by-siemens", pollingInterval=60 ] {
     Thing rds mydownstairs "Downstairs Thermostat" @ "Hall" [ plantId="Pd0123456-789a-bcde-0123456789abcdef0" ]
     Thing rds myupstairs "Upstairs Thermostat" @ "Landing" [ plantId="Pd0123456-789a-bcde-f0123456789abcdef" ]
@@ -91,7 +100,7 @@ Bridge siemensrds:climatixic:mybridgename "Climatix IC Account" [ userEmail="ema
 
 ### `demo.items` File
 
-```
+```java
 Number:Temperature Upstairs_RoomTemperature "Room Temperature" { channel="siemensrds:rds:mybridgename:myupstairs:roomTemperature" }
 Number:Temperature Upstairs_TargetTemperature "Target Temperature" { channel="siemensrds:rds:mybridgename:myupstairs:targetTemperature" }
 String Upstairs_ThermostatOutputState "Thermostat Output State" { channel="siemensrds:rds:mybridgename:myupstairs:thermostatOutputState" }
@@ -107,7 +116,7 @@ Switch Upstairs_HotWaterOutputState "Hotwater Output State" { channel="siemensrd
 
 ### `demo.sitemap` File
 
-```
+```php
 sitemap siemensrds label="Siemens RDS"
 {
 Frame label="Heating" {
diff --git a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsAccessToken.java b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsAccessToken.java
index 3cc7a51862a12..b2bd19893a779 100644
--- a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsAccessToken.java
+++ b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsAccessToken.java
@@ -27,6 +27,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
 
 import javax.net.ssl.HttpsURLConnection;
 
@@ -61,7 +62,7 @@ public class RdsAccessToken {
 
     private @Nullable Date expDate = null;
 
-    /*
+    /**
      * public static method: execute the HTTP POST on the server
      */
     public static String httpGetTokenJson(String apiKey, String payload) throws RdsCloudException, IOException {
@@ -105,14 +106,14 @@ public static String httpGetTokenJson(String apiKey, String payload) throws RdsC
         }
     }
 
-    /*
+    /**
      * public method: parse the JSON, and create a class that encapsulates the data
      */
     public static @Nullable RdsAccessToken createFromJson(String json) {
         return GSON.fromJson(json, RdsAccessToken.class);
     }
 
-    /*
+    /**
      * public method: return the access token
      */
     public String getToken() throws RdsCloudException {
@@ -123,14 +124,14 @@ public String getToken() throws RdsCloudException {
         throw new RdsCloudException("no access token");
     }
 
-    /*
+    /**
      * public method: check if the token has expired
      */
     public boolean isExpired() {
         Date expDate = this.expDate;
         if (expDate == null) {
             try {
-                expDate = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z").parse(expires);
+                expDate = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH).parse(expires);
             } catch (ParseException e) {
                 logger.debug("isExpired: expiry date parsing exception");
 

From 260f58904fbfa7f20b2766b77393496196d9bcd3 Mon Sep 17 00:00:00 2001
From: Kai Kreuzer <kai@openhab.org>
Date: Sun, 11 Dec 2022 17:09:31 +0100
Subject: [PATCH 37/48] [homekit] Simplify start level handling (#13914)

Signed-off-by: Kai Kreuzer <kai@openhab.org>
---
 .../io/homekit/internal/HomekitImpl.java      | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
index 468c1c9b9434a..7e4da4a9ac1fe 100644
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
@@ -107,7 +107,8 @@ public HomekitImpl(@Reference StorageService storageService, @Reference ItemRegi
         this.metadataRegistry = metadataRegistry;
         this.readyService = readyService;
         networkAddressService.addNetworkAddressChangeListener(this);
-        readyService.registerTracker(this, new ReadyMarkerFilter().withType(StartLevelService.STARTLEVEL_MARKER_TYPE));
+        readyService.registerTracker(this, new ReadyMarkerFilter().withType(StartLevelService.STARTLEVEL_MARKER_TYPE)
+                .withIdentifier(Integer.toString(StartLevelService.STARTLEVEL_STATES)));
     }
 
     private HomekitSettings processConfig(Map<String, Object> properties) {
@@ -152,8 +153,9 @@ protected synchronized void modified(Map<String, Object> config) {
         try {
             HomekitSettings oldSettings = settings;
             settings = processConfig(config);
-            if ((oldSettings == null) || (settings == null))
+            if ((oldSettings == null) || (settings == null)) {
                 return;
+            }
             if (!oldSettings.name.equals(settings.name) || !oldSettings.pin.equals(settings.pin)
                     || !oldSettings.setupId.equals(settings.setupId)
                     || (oldSettings.networkInterface != null
@@ -177,32 +179,16 @@ protected synchronized void modified(Map<String, Object> config) {
 
     @Override
     public synchronized void onReadyMarkerAdded(ReadyMarker readyMarker) {
-        int newLevel = Integer.parseInt(readyMarker.getIdentifier());
-        currentStartLevel = newLevel;
-
-        if (newLevel >= StartLevelService.STARTLEVEL_STATES) {
-            try {
-                startHomekitServer();
-            } catch (IOException | InvalidAlgorithmParameterException e) {
-                logger.warn("could not initialize HomeKit bridge: {}", e.getMessage());
-            }
+        try {
+            startHomekitServer();
+        } catch (IOException | InvalidAlgorithmParameterException e) {
+            logger.warn("could not initialize HomeKit bridge: {}", e.getMessage());
         }
     }
 
     @Override
-    @SuppressWarnings("PMD.EmptyWhileStmt")
     public synchronized void onReadyMarkerRemoved(ReadyMarker readyMarker) {
-        int newLevel = Integer.parseInt(readyMarker.getIdentifier());
-
-        if (currentStartLevel > newLevel) {
-            while (newLevel-- > 0 && !readyService
-                    .isReady(new ReadyMarker(StartLevelService.STARTLEVEL_MARKER_TYPE, Integer.toString(newLevel)))) {
-            }
-            currentStartLevel = newLevel;
-            if (currentStartLevel < StartLevelService.STARTLEVEL_STATES) {
-                stopHomekitServer();
-            }
-        }
+        stopHomekitServer();
     }
 
     private HomekitRoot startBridge(HomekitServer homekitServer, HomekitAuthInfoImpl authInfo,

From 74edb5377cfa0cfb38a5012660f9a90526278166 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sun, 11 Dec 2022 17:38:47 +0100
Subject: [PATCH 38/48] GitHub Actions workflow upgrades (#13915)

* Upgrade actions to fix deprecation warnings
* Use ubuntu-22.04 for builds

Signed-off-by: Wouter Born <github@maindrain.net>
---
 .github/workflows/ci-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index e3a7cd47effd6..9e248c2c2deed 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         java: [ '11', '17' ]
         maven: [ '3.8.6' ]
-        os: [ 'ubuntu-20.04' ]
+        os: [ 'ubuntu-22.04' ]
     name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     steps:
@@ -51,7 +51,7 @@ jobs:
           java-version: ${{ matrix.java }}
 
       - name: Set up Maven ${{ matrix.maven }}
-        uses: stCarolas/setup-maven@v4.4
+        uses: stCarolas/setup-maven@v4.5
         with:
           maven-version: ${{ matrix.maven }}
 
@@ -64,7 +64,7 @@ jobs:
       - name: Get Changed Files
         if: github.head_ref != ''
         id: files
-        uses: Ana06/get-changed-files@v2.0.0
+        uses: Ana06/get-changed-files@v2.2.0
         with:
           format: 'csv'
 

From 73b6e886f253f5c31091f2b951bb5ce496752550 Mon Sep 17 00:00:00 2001
From: Jerome Luckenbach <github@luckenba.ch>
Date: Sun, 11 Dec 2022 21:43:42 +0100
Subject: [PATCH 39/48] Fix wrong image and website build. (#13917)

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
---
 bundles/org.openhab.binding.nanoleaf/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.nanoleaf/README.md b/bundles/org.openhab.binding.nanoleaf/README.md
index df5d8f52a9d8c..788ae2c239b83 100644
--- a/bundles/org.openhab.binding.nanoleaf/README.md
+++ b/bundles/org.openhab.binding.nanoleaf/README.md
@@ -113,7 +113,7 @@ Since the colors of the panels can make it difficult to see the panel ids, pleas
 For state to work, you need to set static colors to your panel. 
 This is because Nanoleaf does not return updates on colors for dynamic effects and animations.
 
-![Image](doc/NanoCanvas_rendered.jpg)
+![Image](doc/NanoCanvas_rendered.png)
 
 ## Thing Configuration
 

From a3fccc6390015f182a05085ac0fc502ed38a759b Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 11 Dec 2022 22:47:37 +0100
Subject: [PATCH 40/48] Fix console command 'tables clean' (#13916)

NullPointerException was thrown because index table was not provided

Fixes #13911

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../persistence/jdbc/internal/JdbcPersistenceService.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java
index 28fc2c5a9730a..cc9257a3d1c46 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java
@@ -525,6 +525,7 @@ private boolean cleanupItem(ItemTableCheckEntry entry, boolean force) throws Jdb
                 if (!conf.getTableUseRealCaseSensitiveItemNames()) {
                     ItemsVO itemsVo = new ItemsVO();
                     itemsVo.setItemName(entry.getItemName());
+                    itemsVo.setItemsManageTable(conf.getItemsManageTable());
                     deleteItemsEntry(itemsVo);
                 }
                 itemNameToTableNameMap.remove(entry.getItemName());

From 712262fb1e1f84aff3e3fbe75cd6b2d958bc7906 Mon Sep 17 00:00:00 2001
From: Ondrej Pecta <opecta@gmail.com>
Date: Sun, 11 Dec 2022 23:17:52 +0100
Subject: [PATCH 41/48] [somfytahoma] fix the smoke sensor documentation
 (#13919)

Signed-off-by: Ondrej Pecta <opecta@gmail.com>
---
 bundles/org.openhab.binding.somfytahoma/README.md           | 3 +--
 .../src/main/resources/OH-INF/i18n/somfytahoma.properties   | 6 +++---
 .../src/main/resources/OH-INF/thing/channels.xml            | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bundles/org.openhab.binding.somfytahoma/README.md b/bundles/org.openhab.binding.somfytahoma/README.md
index 8dd228bc9f550..0eee7667a287a 100644
--- a/bundles/org.openhab.binding.somfytahoma/README.md
+++ b/bundles/org.openhab.binding.somfytahoma/README.md
@@ -122,8 +122,7 @@ Please see the example below.
 | smoke sensor, occupancy sensor, contact sensor & water sensor                      | sensor_defect                   | indicates the health of the sensor (dead, lowBatter, maintenanceRequired, noDefect)                                                                                                                                               |
 | smoke sensor                                                                       | radio_battery                   | maintenance radio part battery state (low, normal)                                                                                                                                                                                |
 | smoke sensor                                                                       | sensor_battery                  | maintenance sensor part battery state (absence, low, normal)                                                                                                                                                                      |
-| smoke sensor                                                                       | short_check                     | triggering the smoke sensor's short check                                                                                                                                                                                         |
-| smoke sensor                                                                       | long_check                      | triggering the smoke sensor's long check                                                                                                                                                                                          |
+| smoke sensor                                                                       | alarm_check                     | triggers the smoke sensor's beep check (short, long)                                                                                                                                                                              |
 | light sensor                                                                       | luminance                       | light luminance value in luxes                                                                                                                                                                                                    |
 | electricity sensor                                                                 | energy_consumption              | energy consumption value in watts                                                                                                                                                                                                 |
 | humidity sensor                                                                    | humidity                        | current relative humidity                                                                                                                                                                                                         |
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
index d3a8e8739aab4..3647f8dbc68f7 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
@@ -98,9 +98,9 @@ thing-type.config.somfytahoma.gateway.id.description = The identifier of this So
 channel-type.somfytahoma.active_zones_state.label = Active Zones State
 channel-type.somfytahoma.active_zones_state.description = Active Zones State
 channel-type.somfytahoma.alarm_check.label = Alarm Check Trigger
-channel-type.somfytahoma.alarm_check.description = A channel for triggering the smoke sensor's check
-channel-type.somfytahoma.alarm_check.command.option.SHORT = Short check
-channel-type.somfytahoma.alarm_check.command.option.LONG = Long check
+channel-type.somfytahoma.alarm_check.description = A channel for triggering the smoke sensor's beep check
+channel-type.somfytahoma.alarm_check.command.option.short = Short check
+channel-type.somfytahoma.alarm_check.command.option.long = Long check
 channel-type.somfytahoma.alarm_command.label = Command
 channel-type.somfytahoma.alarm_command.description = A channel used for sending commands to Somfy Alarm device
 channel-type.somfytahoma.alarm_command.state.option.on = ARM
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/thing/channels.xml
index d3dca6bedc567..60e3b2c0a8542 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/thing/channels.xml
@@ -279,11 +279,11 @@
 	<channel-type id="alarm_check">
 		<item-type>String</item-type>
 		<label>Alarm Check Trigger</label>
-		<description>A channel for triggering the smoke sensor's check</description>
+		<description>A channel for triggering the smoke sensor's beep check</description>
 		<command>
 			<options>
-				<option value="SHORT">Short check</option>
-				<option value="LONG">Long check</option>
+				<option value="short">Short check</option>
+				<option value="long">Long check</option>
 			</options>
 		</command>
 	</channel-type>

From e027932349dd9d0567fb121f44711be2e00c9e95 Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Mon, 12 Dec 2022 20:28:59 +0100
Subject: [PATCH 42/48] [goecharger] Consider correct channel ID
 (maxCurrentTemp) (#13927)

Fix #13891

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../binding/goecharger/internal/GoEChargerBindingConstants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/GoEChargerBindingConstants.java b/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/GoEChargerBindingConstants.java
index b05405691e03d..39ed58452fb40 100644
--- a/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/GoEChargerBindingConstants.java
+++ b/bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/GoEChargerBindingConstants.java
@@ -31,7 +31,7 @@ public class GoEChargerBindingConstants {
 
     // List of all Channel ids
     public static final String MAX_CURRENT = "maxCurrent";
-    public static final String MAX_CURRENT_TEMPORARY = "maxCurrentTemporary";
+    public static final String MAX_CURRENT_TEMPORARY = "maxCurrentTemp";
     public static final String ACCESS_CONFIGURATION = "accessConfiguration";
     public static final String PWM_SIGNAL = "pwmSignal";
     public static final String ERROR = "error";

From 518272a731b35bbf792ec04e3dd8378376accbe4 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 12 Dec 2022 22:10:48 +0100
Subject: [PATCH 43/48] Fix dimension for powerConsumption channel (#13930)

Fixes #13929

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 bundles/org.openhab.binding.miele/README.md               | 8 ++++----
 .../src/main/resources/OH-INF/thing/channeltypes.xml      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.binding.miele/README.md b/bundles/org.openhab.binding.miele/README.md
index 767fbaa7d5a05..a5df87bc3e4b7 100644
--- a/bundles/org.openhab.binding.miele/README.md
+++ b/bundles/org.openhab.binding.miele/README.md
@@ -131,7 +131,7 @@ Channels available for each appliance type are listed below.
 | finish              | Number:Time          | Read       | Time to finish the program running on the appliance                 |
 | door                | Contact              | Read       | Current state of the door of the appliance                          |
 | switch              | Switch               | Write      | Switch the appliance on or off                                      |
-| powerConsumption    | Number:Power         | Read       | Power consumption by the currently running program on the appliance |
+| powerConsumption    | Number:Energy        | Read       | Power consumption by the currently running program on the appliance |
 | waterConsumption    | Number:Volume        | Read       | Water consumption by the currently running program on the appliance |
 
 ##### Programs
@@ -354,7 +354,7 @@ See oven.
 | switch              | Switch               | Write      | Switch the appliance on or off                                      |
 | target              | Number:Temperature   | Read       | Temperature of the selected program (10 °C = cold)                  |
 | spinningspeed       | String               | Read       | Spinning speed in the program running on the appliance              |
-| powerConsumption    | Number:Power         | Read       | Power consumption by the currently running program on the appliance |
+| powerConsumption    | Number:Energy        | Read       | Power consumption by the currently running program on the appliance |
 | waterConsumption    | Number:Volume        | Read       | Water consumption by the currently running program on the appliance |
 
 ##### Programs
@@ -432,7 +432,7 @@ String Dishwasher_Program "Program [%s]"                    {channel="miele:dish
 String Dishwasher_Phase "Phase [%s]"                        {channel="miele:dishwasher:home:dishwasher:phase"}
 DateTime Dishwasher_ElapsedTime "Elapsed time" <time>       {channel="miele:dishwasher:home:dishwasher:elapsed"}
 DateTime Dishwasher_FinishTime "Remaining time" <time>      {channel="miele:dishwasher:home:dishwasher:finish"}
-Number:Power Dishwasher_PowerConsumption                    {channel="miele:dishwasher:home:dishwasher:powerConsumption"}
+Number:Energy Dishwasher_PowerConsumption                   {channel="miele:dishwasher:home:dishwasher:powerConsumption"}
 Number:Volume Dishwasher_WaterConsumption                   {channel="miele:dishwasher:home:dishwasher:waterConsumption"}
 
 String Fridge_State                                         {channel="miele:fridge:home:fridge:state"}
@@ -460,7 +460,7 @@ Number:Temperature WashingMachine_Temperature <temperature> {channel="miele:wash
 String WashingMachine_SpinningSpeed                         {channel="miele:washingmachine:home:washingmachine:spinningspeed"}
 DateTime WashingMachine_ElapsedTime "Elapsed time" <time>   {channel="miele:washingmachine:home:washingmachine:elapsed"}
 DateTime WashingMachine_FinishTime "Remaining time" <time>  {channel="miele:washingmachine:home:washingmachine:finish"}
-Number:Power WashingMachine_PowerConsumption                {channel="miele:washingmachine:home:washingmachine:powerConsumption"}
+Number:Energy WashingMachine_PowerConsumption               {channel="miele:washingmachine:home:washingmachine:powerConsumption"}
 Number:Volume WashingMachine_WaterConsumption               {channel="miele:washingmachine:home:washingmachine:waterConsumption"}
 
 String TumbleDryer_State                                    {channel="miele:tumbledryer:home:tumbledryer:state"}
diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml
index 4d13057abdff2..84fa83d71becc 100644
--- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml
+++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml
@@ -215,7 +215,7 @@
 	</channel-type>
 
 	<channel-type id="powerConsumption">
-		<item-type>Number:Power</item-type>
+		<item-type>Number:Energy</item-type>
 		<label>Power Consumption</label>
 		<description>Power consumption by the currently running program on the appliance</description>
 		<state readOnly="true" pattern="%.1f %unit%"/>

From 286a27db5b91f3aef213045407b70d4e06719d60 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Mon, 12 Dec 2022 22:12:24 +0100
Subject: [PATCH 44/48] [nest] Add missing enable SDM API configuration step to
 README.md (#13931)

Fixes #11814

Signed-off-by: Wouter Born <github@maindrain.net>
---
 bundles/org.openhab.binding.nest/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.nest/README.md b/bundles/org.openhab.binding.nest/README.md
index c4142637d34e0..fb407b1c16781 100644
--- a/bundles/org.openhab.binding.nest/README.md
+++ b/bundles/org.openhab.binding.nest/README.md
@@ -104,7 +104,10 @@ Finally, an SDM Account Thing can be created to access the SDM project using the
 1. All required SDM Account Thing configuration parameters have now been entered so create it by clicking "Create Thing"
 
 The SDM Account Thing should now be ONLINE and have as status description "Using periodic refresh".
-It should also be possible to use the configured account to discover your Nest devices via the Inbox.
+
+Next click the "Enable" button on the [Smart Device Management API](https://console.cloud.google.com/apis/library/smartdevicemanagement.googleapis.com) page for your GCP project to enable the SDM API.
+
+Now it should also be possible to use the configured account to discover your Nest devices via the Inbox.
 
 You can monitor the SDM API using the Google Cloud Platform Console via [API & Services > Smart Device Management API](https://console.cloud.google.com/apis/api/smartdevicemanagement.googleapis.com/overview).
 

From bd087f1c1c2334fe31aa937ba216f7ca90c9a215 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 12 Dec 2022 22:55:38 +0100
Subject: [PATCH 45/48] Fix examples after migration of time channels (#13933)

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 bundles/org.openhab.binding.miele/README.md | 86 ++++++++++-----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/bundles/org.openhab.binding.miele/README.md b/bundles/org.openhab.binding.miele/README.md
index a5df87bc3e4b7..08403d3219d5b 100644
--- a/bundles/org.openhab.binding.miele/README.md
+++ b/bundles/org.openhab.binding.miele/README.md
@@ -426,49 +426,49 @@ Bridge miele:xgw3000:home [ipAddress="192.168.0.18", interface="192.168.0.5"] {
 ## items/miele.items
 
 ```java
-String Dishwasher_State                                     {channel="miele:dishwasher:home:dishwasher:state"}
-Number Dishwasher_RawState                                  {channel="miele:dishwasher:home:dishwasher:rawState"}
-String Dishwasher_Program "Program [%s]"                    {channel="miele:dishwasher:home:dishwasher:program"}
-String Dishwasher_Phase "Phase [%s]"                        {channel="miele:dishwasher:home:dishwasher:phase"}
-DateTime Dishwasher_ElapsedTime "Elapsed time" <time>       {channel="miele:dishwasher:home:dishwasher:elapsed"}
-DateTime Dishwasher_FinishTime "Remaining time" <time>      {channel="miele:dishwasher:home:dishwasher:finish"}
-Number:Energy Dishwasher_PowerConsumption                   {channel="miele:dishwasher:home:dishwasher:powerConsumption"}
-Number:Volume Dishwasher_WaterConsumption                   {channel="miele:dishwasher:home:dishwasher:waterConsumption"}
-
-String Fridge_State                                         {channel="miele:fridge:home:fridge:state"}
-Contact Fridge_Door                                         {channel="miele:fridge:home:fridge:door"}
-Switch Fridge_SuperCool                                     {channel="miele:fridge:home:fridge:supercool"}
-Number:Temperature Fridge_CurrentTemperature <temperature>  {channel="miele:fridge:home:fridge:current"}
-Number:Temperature Fridge_TargetTemperature  <temperature>  {channel="miele:fridge:home:fridge:target"}
-Switch Fridge_Start                                         {channel="miele:fridge:home:fridge:start"}
-
-String Oven_State                                           {channel="miele:oven:home:oven:state"}
-Number Oven_RawState                                        {channel="miele:oven:home:oven:rawState"}
-String Oven_Program "Program [%s]"                          {channel="miele:oven:home:oven:program"}
-String Oven_Phase "Phase [%s]"                              {channel="miele:oven:home:oven:phase"}
-DateTime Oven_ElapsedTime "Elapsed time" <time>             {channel="miele:oven:home:oven:elapsed"}
-DateTime Oven_FinishTime "Remaining time" <time>            {channel="miele:oven:home:oven:finish"}
-Number:Temperature Oven_CurrentTemperature <temperature>    {channel="miele:oven:home:oven:measured"}
-Number:Temperature Oven_TargetTemperature <temperature>     {channel="miele:oven:home:oven:target"}
-Switch Oven_Stop                                            {channel="miele:oven:home:oven:stop"}
-
-String WashingMachine_State                                 {channel="miele:washingmachine:home:washingmachine:state"}
-Number WashingMachine_RawState                              {channel="miele:washingmachine:home:washingmachine:rawState"}
-String WashingMachine_Program "Program [%s]"                {channel="miele:washingmachine:home:washingmachine:program"}
-String WashingMachine_Phase "Phase [%s]"                    {channel="miele:washingmachine:home:washingmachine:phase"}
-Number:Temperature WashingMachine_Temperature <temperature> {channel="miele:washingmachine:home:washingmachine:target"}
-String WashingMachine_SpinningSpeed                         {channel="miele:washingmachine:home:washingmachine:spinningspeed"}
-DateTime WashingMachine_ElapsedTime "Elapsed time" <time>   {channel="miele:washingmachine:home:washingmachine:elapsed"}
-DateTime WashingMachine_FinishTime "Remaining time" <time>  {channel="miele:washingmachine:home:washingmachine:finish"}
-Number:Energy WashingMachine_PowerConsumption               {channel="miele:washingmachine:home:washingmachine:powerConsumption"}
-Number:Volume WashingMachine_WaterConsumption               {channel="miele:washingmachine:home:washingmachine:waterConsumption"}
-
-String TumbleDryer_State                                    {channel="miele:tumbledryer:home:tumbledryer:state"}
-Number TumbleDryer_RawState                                 {channel="miele:tumbledryer:home:tumbledryer:rawState"}
-String TumbleDryer_Program "Program [%s]"                   {channel="miele:tumbledryer:home:tumbledryer:program"}
-String TumbleDryer_Phase "Phase [%s]"                       {channel="miele:tumbledryer:home:tumbledryer:phase"}
-DateTime TumbleDryer_ElapsedTime "Elapsed time" <time>      {channel="miele:tumbledryer:home:tumbledryer:elapsed"}
-DateTime TumbleDryer_FinishTime "Remaining time" <time>     {channel="miele:tumbledryer:home:tumbledryer:finish"}
+String Dishwasher_State                                       {channel="miele:dishwasher:home:dishwasher:state"}
+Number Dishwasher_RawState                                    {channel="miele:dishwasher:home:dishwasher:rawState"}
+String Dishwasher_Program "Program [%s]"                      {channel="miele:dishwasher:home:dishwasher:program"}
+String Dishwasher_Phase "Phase [%s]"                          {channel="miele:dishwasher:home:dishwasher:phase"}
+Number:Time Dishwasher_ElapsedTime "Elapsed time" <time>      {channel="miele:dishwasher:home:dishwasher:elapsed"}
+Number:Time Dishwasher_FinishTime "Remaining time" <time>     {channel="miele:dishwasher:home:dishwasher:finish"}
+Number:Energy Dishwasher_PowerConsumption                     {channel="miele:dishwasher:home:dishwasher:powerConsumption"}
+Number:Volume Dishwasher_WaterConsumption                     {channel="miele:dishwasher:home:dishwasher:waterConsumption"}
+
+String Fridge_State                                           {channel="miele:fridge:home:fridge:state"}
+Contact Fridge_Door                                           {channel="miele:fridge:home:fridge:door"}
+Switch Fridge_SuperCool                                       {channel="miele:fridge:home:fridge:supercool"}
+Number:Temperature Fridge_CurrentTemperature <temperature>    {channel="miele:fridge:home:fridge:current"}
+Number:Temperature Fridge_TargetTemperature  <temperature>    {channel="miele:fridge:home:fridge:target"}
+Switch Fridge_Start                                           {channel="miele:fridge:home:fridge:start"}
+
+String Oven_State                                             {channel="miele:oven:home:oven:state"}
+Number Oven_RawState                                          {channel="miele:oven:home:oven:rawState"}
+String Oven_Program "Program [%s]"                            {channel="miele:oven:home:oven:program"}
+String Oven_Phase "Phase [%s]"                                {channel="miele:oven:home:oven:phase"}
+Number:Time Oven_ElapsedTime "Elapsed time" <time>            {channel="miele:oven:home:oven:elapsed"}
+Number:Time Oven_FinishTime "Remaining time" <time>           {channel="miele:oven:home:oven:finish"}
+Number:Temperature Oven_CurrentTemperature <temperature>      {channel="miele:oven:home:oven:measured"}
+Number:Temperature Oven_TargetTemperature <temperature>       {channel="miele:oven:home:oven:target"}
+Switch Oven_Stop                                              {channel="miele:oven:home:oven:stop"}
+
+String WashingMachine_State                                   {channel="miele:washingmachine:home:washingmachine:state"}
+Number WashingMachine_RawState                                {channel="miele:washingmachine:home:washingmachine:rawState"}
+String WashingMachine_Program "Program [%s]"                  {channel="miele:washingmachine:home:washingmachine:program"}
+String WashingMachine_Phase "Phase [%s]"                      {channel="miele:washingmachine:home:washingmachine:phase"}
+Number:Temperature WashingMachine_Temperature <temperature>   {channel="miele:washingmachine:home:washingmachine:target"}
+String WashingMachine_SpinningSpeed                           {channel="miele:washingmachine:home:washingmachine:spinningspeed"}
+Number:Time WashingMachine_ElapsedTime "Elapsed time" <time>  {channel="miele:washingmachine:home:washingmachine:elapsed"}
+Number:Time WashingMachine_FinishTime "Remaining time" <time> {channel="miele:washingmachine:home:washingmachine:finish"}
+Number:Energy WashingMachine_PowerConsumption                 {channel="miele:washingmachine:home:washingmachine:powerConsumption"}
+Number:Volume WashingMachine_WaterConsumption                 {channel="miele:washingmachine:home:washingmachine:waterConsumption"}
+
+String TumbleDryer_State                                      {channel="miele:tumbledryer:home:tumbledryer:state"}
+Number TumbleDryer_RawState                                   {channel="miele:tumbledryer:home:tumbledryer:rawState"}
+String TumbleDryer_Program "Program [%s]"                     {channel="miele:tumbledryer:home:tumbledryer:program"}
+String TumbleDryer_Phase "Phase [%s]"                         {channel="miele:tumbledryer:home:tumbledryer:phase"}
+Number:Time TumbleDryer_ElapsedTime "Elapsed time" <time>     {channel="miele:tumbledryer:home:tumbledryer:elapsed"}
+Number:Time TumbleDryer_FinishTime "Remaining time" <time>    {channel="miele:tumbledryer:home:tumbledryer:finish"}
 ```
 
 ## sitemaps/miele.sitemap

From 9c3ec387e5be204ad71ff829f772b04aa402fadd Mon Sep 17 00:00:00 2001
From: openhab-bot <bot@openhab.org>
Date: Tue, 13 Dec 2022 07:27:26 +0100
Subject: [PATCH 46/48] New Crowdin updates (#13932)

* New translations boschshc.properties (Italian)

* New translations ecowatt.properties (French)

* New translations nikohomecontrol.properties (Dutch)

* New translations systeminfo.properties (Dutch)

* New translations upnpcontrol.properties (Dutch)
---
 .../OH-INF/i18n/nikohomecontrol_nl.properties |   2 +-
 .../OH-INF/i18n/systeminfo_nl.properties      | 161 ++++++++++++++++++
 .../OH-INF/i18n/upnpcontrol_nl.properties     | 116 +++++++++++++
 3 files changed, 278 insertions(+), 1 deletion(-)
 create mode 100644 bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_nl.properties

diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_nl.properties b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_nl.properties
index a18e06ceecdeb..2735bd2005628 100644
--- a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_nl.properties
+++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_nl.properties
@@ -118,7 +118,7 @@ offline.configuration-error.actionRemoved = Actie is verwijderd van de controlle
 offline.configuration-error.energyMeterId = Geconfigureerde energiemeter-ID komt niet overeen met een energiemeter in de controller
 offline.configuration-error.energyMeterRemoved = Energiemeter is verwijderd van controller
 
-offline.configuration-error.thermostatId = Geconfigureerde thermostaat-ID komt niet overeen met een energiemeter in de controller
+offline.configuration-error.thermostatId = Geconfigureerde thermostaat-ID komt niet overeen met een thermostaat in de controller
 offline.configuration-error.thermostatRemoved = Thermostaat is verwijderd van de controller
 
 offline.configuration-error.invalid-bridge-handler = Ongeldige bridge handler
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_nl.properties b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_nl.properties
new file mode 100644
index 0000000000000..e92d1ad1722be
--- /dev/null
+++ b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_nl.properties
@@ -0,0 +1,161 @@
+# binding
+
+binding.systeminfo.name = Systeminfo Binding
+binding.systeminfo.description = Deze binding biedt informatie over het besturingssysteem en de hardware.
+
+# thing types
+
+thing-type.systeminfo.computer.label = Systeminfo
+thing-type.systeminfo.computer.description = De besturingssysteem- en hardware-informatie van de computer
+
+# thing types config
+
+thing-type.config.systeminfo.computerConfig.interval_high.label = Interval voor Taken met Hoge Prioriteit
+thing-type.config.systeminfo.computerConfig.interval_high.description = Verversingsinterval in seconden.
+thing-type.config.systeminfo.computerConfig.interval_medium.label = Interval voor Taken met Gemiddelde Prioriteit
+thing-type.config.systeminfo.computerConfig.interval_medium.description = Verversingsinterval in seconden.
+
+# channel group types
+
+channel-group-type.systeminfo.batteryGroup.label = Batterij
+channel-group-type.systeminfo.batteryGroup.description = Batterij-parameters
+channel-group-type.systeminfo.cpuGroup.label = Processor
+channel-group-type.systeminfo.cpuGroup.description = Processor parameters
+channel-group-type.systeminfo.displayGroup.label = Scherm
+channel-group-type.systeminfo.displayGroup.description = Scherm parameters
+channel-group-type.systeminfo.driveGroup.label = Schijf
+channel-group-type.systeminfo.driveGroup.description = Schijf informatie
+channel-group-type.systeminfo.memoryGroup.label = Fysiek Geheugen
+channel-group-type.systeminfo.memoryGroup.description = Fysiek geheugen informatie
+channel-group-type.systeminfo.networkGroup.label = Netwerk
+channel-group-type.systeminfo.networkGroup.description = Netwerk parameters
+channel-group-type.systeminfo.currentProcessGroup.label = Huidige Proces
+channel-group-type.systeminfo.currentProcessGroup.description = Huidige proces informatie
+channel-group-type.systeminfo.processGroup.label = Proces
+channel-group-type.systeminfo.processGroup.description = Systeem proces informatie
+channel-group-type.systeminfo.sensorsGroup.label = Sensor
+channel-group-type.systeminfo.sensorsGroup.description = Sensor parameters
+channel-group-type.systeminfo.storageGroup.label = Opslag
+channel-group-type.systeminfo.storageGroup.description = Informatie over logische opslag
+channel-group-type.systeminfo.swapGroup.label = Swap geheugen
+channel-group-type.systeminfo.swapGroup.description = Informatie over swap geheugen
+
+# channel types
+
+channel-type.systeminfo.available.label = Beschikbaar
+channel-type.systeminfo.available.description = Beschikbare grootte
+channel-type.systeminfo.availableHeap.label = Beschikbare Heap
+channel-type.systeminfo.availableHeap.description = Hoeveel data is beschikbaar in de Java heap.
+channel-type.systeminfo.availablePercent.label = Beschikbaar (%)
+channel-type.systeminfo.availablePercent.description = Beschikbare grootte in procent
+channel-type.systeminfo.cpuTemp.label = Processor Temperatuur
+channel-type.systeminfo.cpuTemp.description = Processor Temperatuur
+channel-type.systeminfo.cpuVoltage.label = Processor Spanning
+channel-type.systeminfo.cpuVoltage.description = Processor Spanning
+channel-type.systeminfo.dataReceived.label = Gegevens ontvangen
+channel-type.systeminfo.dataReceived.description = Volume van de ontvangen gegevens
+channel-type.systeminfo.dataSent.label = Gegevens verzonden
+channel-type.systeminfo.dataSent.description = Volume van de verzonden gegevens
+channel-type.systeminfo.description.label = Omschrijving
+channel-type.systeminfo.description.description = Omschrijving van het apparaat
+channel-type.systeminfo.fanSpeed.label = Ventilatorsnelheid
+channel-type.systeminfo.fanSpeed.description = Ventilatorsnelheid in rotaties per minuut
+channel-type.systeminfo.information.label = Scherm Informatie
+channel-type.systeminfo.information.description = Product, fabrikant, SN, breedte en hoogte van het scherm in cm
+channel-type.systeminfo.ip.label = IP-Adres
+channel-type.systeminfo.ip.description = Host IP-adres van het netwerk
+channel-type.systeminfo.load.label = Belasting
+channel-type.systeminfo.load.description = Belasting in procent
+channel-type.systeminfo.loadAverage.label = Gemiddelde belasting
+channel-type.systeminfo.loadAverage.description = Belasting als aantal processen in de laatste 1,5 of 15 minuten
+channel-type.systeminfo.load_process.label = Belasting
+channel-type.systeminfo.load_process.description = Belasting in procent
+channel-type.systeminfo.mac.label = Mac-Adres
+channel-type.systeminfo.mac.description = Mac-adres van het netwerk
+channel-type.systeminfo.model.label = Model
+channel-type.systeminfo.model.description = Het model van het apparaat
+channel-type.systeminfo.name.label = Naam
+channel-type.systeminfo.name.description = Naam van het apparaat (proces)
+channel-type.systeminfo.name_process.label = Naam
+channel-type.systeminfo.name_process.description = Naam van het apparaat (proces)
+channel-type.systeminfo.networkDisplayName.label = Netwerk weergavenaam
+channel-type.systeminfo.networkDisplayName.description = De weergavenaam van het netwerk
+channel-type.systeminfo.networkName.label = Netwerknaam
+channel-type.systeminfo.networkName.description = De naam van het netwerk.
+channel-type.systeminfo.packetsReceived.label = Pakketten ontvangen
+channel-type.systeminfo.packetsReceived.description = Aantal ontvangen pakketten
+channel-type.systeminfo.packetsSent.label = Pakketten verzonden
+channel-type.systeminfo.packetsSent.description = Aantal verzonden pakketten
+channel-type.systeminfo.path.label = Pad
+channel-type.systeminfo.path.description = Het volledige pad
+channel-type.systeminfo.path_process.label = Pad
+channel-type.systeminfo.path_process.description = Het volledige pad
+channel-type.systeminfo.remainingCapacity.label = Resterende capaciteit
+channel-type.systeminfo.remainingCapacity.description = Resterende capaciteit in procent
+channel-type.systeminfo.remainingTime.label = Resterende tijd
+channel-type.systeminfo.remainingTime.description = Resterende tijd
+channel-type.systeminfo.serial.label = Serienummer
+channel-type.systeminfo.serial.description = Het serienummer van het apparaat
+channel-type.systeminfo.threads.label = Aantal Threads
+channel-type.systeminfo.threads.description = Totaal aantal actieve threads
+channel-type.systeminfo.threads_process.label = Aantal Threads
+channel-type.systeminfo.threads_process.description = Aantal threads voor proces dat momenteel wordt uitgevoerd
+channel-type.systeminfo.total.label = Totaal
+channel-type.systeminfo.total.description = Totale grootte
+channel-type.systeminfo.type.label = Type
+channel-type.systeminfo.type.description = Opslagtype
+channel-type.systeminfo.uptime.label = Systeem Uptime
+channel-type.systeminfo.uptime.description = Systeem uptime (tijd na starten)
+channel-type.systeminfo.used.label = Gebruikt
+channel-type.systeminfo.used.description = Gebruikte grootte
+channel-type.systeminfo.usedHeapPercent.label = Gebruikte Heap Percentage
+channel-type.systeminfo.usedHeapPercent.description = Hoeveel data in procent is gebruikt van de max grootte waar de Java heap naar kan groeien.
+channel-type.systeminfo.usedPercent.label = Gebruikt (%)
+channel-type.systeminfo.usedPercent.description = Gebruikte grootte in procent
+channel-type.systeminfo.used_process.label = Gebruikt
+channel-type.systeminfo.used_process.description = Gebruikte grootte
+
+# channel types config
+
+channel-type.config.systeminfo.highpriority.priority.label = Interval
+channel-type.config.systeminfo.highpriority.priority.description = Verversingsinterval in seconden.
+channel-type.config.systeminfo.highpriority.priority.option.High = Hoog
+channel-type.config.systeminfo.highpriority.priority.option.Medium = Gemiddeld
+channel-type.config.systeminfo.highpriority.priority.option.Low = Laag
+channel-type.config.systeminfo.highpriority_process.pid.label = PID
+channel-type.config.systeminfo.highpriority_process.pid.description = De proces-id van het proces.
+channel-type.config.systeminfo.highpriority_process.priority.label = Interval
+channel-type.config.systeminfo.highpriority_process.priority.description = Verversingsinterval in seconden.
+channel-type.config.systeminfo.highpriority_process.priority.option.High = Hoog
+channel-type.config.systeminfo.highpriority_process.priority.option.Medium = Gemiddeld
+channel-type.config.systeminfo.highpriority_process.priority.option.Low = Laag
+channel-type.config.systeminfo.lowpriority.group.priorityGroup.label = Tekst
+channel-type.config.systeminfo.lowpriority.group.priorityGroup.description = Tekst
+channel-type.config.systeminfo.lowpriority.priority.label = Interval
+channel-type.config.systeminfo.lowpriority.priority.description = Verversingsinterval in seconden.
+channel-type.config.systeminfo.lowpriority.priority.option.High = Hoog
+channel-type.config.systeminfo.lowpriority.priority.option.Medium = Gemiddeld
+channel-type.config.systeminfo.lowpriority.priority.option.Low = Laag
+channel-type.config.systeminfo.lowpriority_process.pid.label = PID
+channel-type.config.systeminfo.lowpriority_process.pid.description = De proces-id van het proces.
+channel-type.config.systeminfo.lowpriority_process.priority.label = Interval
+channel-type.config.systeminfo.lowpriority_process.priority.description = Verversingsinterval in seconden.
+channel-type.config.systeminfo.lowpriority_process.priority.option.High = Hoog
+channel-type.config.systeminfo.lowpriority_process.priority.option.Medium = Gemiddeld
+channel-type.config.systeminfo.lowpriority_process.priority.option.Low = Laag
+channel-type.config.systeminfo.mediumpriority.priority.label = Interval
+channel-type.config.systeminfo.mediumpriority.priority.description = Verversingsinterval in seconden.
+channel-type.config.systeminfo.mediumpriority.priority.option.High = Hoog
+channel-type.config.systeminfo.mediumpriority.priority.option.Medium = Gemiddeld
+channel-type.config.systeminfo.mediumpriority.priority.option.Low = Laag
+channel-type.config.systeminfo.mediumpriority_process.pid.label = PID
+channel-type.config.systeminfo.mediumpriority_process.pid.description = De proces-id van het proces.
+channel-type.config.systeminfo.mediumpriority_process.priority.label = Interval
+channel-type.config.systeminfo.mediumpriority_process.priority.description = Verversingsinterval in seconden.
+channel-type.config.systeminfo.mediumpriority_process.priority.option.High = Hoog
+channel-type.config.systeminfo.mediumpriority_process.priority.option.Medium = Gemiddeld
+channel-type.config.systeminfo.mediumpriority_process.priority.option.Low = Laag
+
+# thing status messages
+offline.cannot-initialize = Het thing kan niet worden geïnitialiseerd\!
+offline.unexpected-error = Kan systeem informatie niet ophalen als gevolg van onverwachte fout. Probeer de binding opnieuw te starten (verwijder en voeg thing opnieuw toe)\!
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol_nl.properties b/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol_nl.properties
index 6e969d096677a..1038317c54faf 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol_nl.properties
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol_nl.properties
@@ -44,6 +44,113 @@ thing-type.config.upnpcontrol.upnpserver.sortCriteria.description = Sorteer crit
 thing-type.config.upnpcontrol.upnpserver.udn.label = Unieke apparaatnaam
 thing-type.config.upnpcontrol.upnpserver.udn.description = De UDN identificeert de UPnP Renderer
 
+# dynamic channels
+
+channel.upnpcontrol.lfvolume.label = Volume Links Voor
+channel.upnpcontrol.lfvolume.description = Volume links voor, is volume links bij stereo geluid
+channel.upnpcontrol.rfvolume.label = Volume Rechts Voor
+channel.upnpcontrol.rfvolume.description = Volume rechts voor, is volume rechts bij stereo geluid
+channel.upnpcontrol.cfvolume.label = Volume Midden Voor
+channel.upnpcontrol.cfvolume.description = Volume midden voor
+channel.upnpcontrol.lfevolume.label = Volume Lage Frequentie Verbetering
+channel.upnpcontrol.lfevolume.description = Volume lage frequentie verbetering (subwoofer)
+channel.upnpcontrol.lsvolume.label = Volume Links Surround
+channel.upnpcontrol.lsvolume.description = Volume rechts surround
+channel.upnpcontrol.rsvolume.label = Volume Rechts Surround
+channel.upnpcontrol.rsvolume.description = Volume rechts surround
+channel.upnpcontrol.lfcvolume.label = Volume Links van Midden
+channel.upnpcontrol.lfcvolume.description = Volume links van het midden (voor)
+channel.upnpcontrol.rfcvolume.label = Volume Rechts van Midden
+channel.upnpcontrol.rfcvolume.description = Volume rechts van het midden (voor)
+channel.upnpcontrol.sdvolume.label = Surround Volume
+channel.upnpcontrol.sdvolume.description = Surround (achter) volume
+channel.upnpcontrol.slvolume.label = Volume Zijde Links
+channel.upnpcontrol.slvolume.description = Volume zijde links (linkermuur)
+channel.upnpcontrol.srvolume.label = Volume Zijde Rechts
+channel.upnpcontrol.srvolume.description = Volume zijde rechts (rechtermuur)
+channel.upnpcontrol.tvolume.label = Volume Boven
+channel.upnpcontrol.tvolume.description = Volume boven (plafond)
+channel.upnpcontrol.bvolume.label = Volume Bodem
+channel.upnpcontrol.bvolume.description = Volume bodem
+channel.upnpcontrol.bcvolume.label = Volume Midden Achter
+channel.upnpcontrol.bcvolume.description = Volume midden achter
+channel.upnpcontrol.blvolume.label = Volume Links Achter
+channel.upnpcontrol.blvolume.description = Volume links achter
+channel.upnpcontrol.brvolume.label = Volume Rechts Achter
+channel.upnpcontrol.brvolume.description = Volume rechts achter
+channel.upnpcontrol.vendorvolume.label = Volume {0}
+channel.upnpcontrol.vendorvolume.description = Leverancier specifiek UPnP volume kanaal
+
+channel.upnpcontrol.lfmute.label = Dempen Links Voor
+channel.upnpcontrol.lfmute.description = Dempen links voor, is dempen links bij stereo geluid
+channel.upnpcontrol.rfmute.label = Dempen Rechts Voor
+channel.upnpcontrol.rfmute.description = Dempen rechts voor, is dempen rechts bij stereo geluid
+channel.upnpcontrol.cfmute.label = Dempen Midden Voor
+channel.upnpcontrol.cfmute.description = Dempen midden voor
+channel.upnpcontrol.lfemute.label = Dempen Lage Frequentie Verbetering
+channel.upnpcontrol.lfemute.description = Dempen lage frequentie verbetering (subwoofer)
+channel.upnpcontrol.lsmute.label = Dempen Links Surround
+channel.upnpcontrol.lsmute.description = Dempen rechts surround
+channel.upnpcontrol.rsmute.label = Dempen Rechts Surround
+channel.upnpcontrol.rsmute.description = Dempen rechts surround
+channel.upnpcontrol.lfcmute.label = Dempen Links van Midden
+channel.upnpcontrol.lfcmute.description = Dempen links van het midden (voor)
+channel.upnpcontrol.rfcmute.label = Dempen Rechts van Midden
+channel.upnpcontrol.rfcmute.description = Dempen rechts van het midden (voor)
+channel.upnpcontrol.sdmute.label = Surround Dempen
+channel.upnpcontrol.sdmute.description = Surround (achter) dempen
+channel.upnpcontrol.slmute.label = Dempen Zijde Links
+channel.upnpcontrol.slmute.description = Dempen zijde links (linkermuur)
+channel.upnpcontrol.srmute.label = Dempen Zijde Rechts
+channel.upnpcontrol.srmute.description = Dempen zijde rechts (rechtermuur)
+channel.upnpcontrol.tmute.label = Dempen Boven
+channel.upnpcontrol.tmute.description = Dempen boven (plafond)
+channel.upnpcontrol.bmute.label = Dempen Bodem
+channel.upnpcontrol.bmute.description = Dempen bodem
+channel.upnpcontrol.bcmute.label = Dempen Midden Achter
+channel.upnpcontrol.bcmute.description = Dempen midden achter
+channel.upnpcontrol.blmute.label = Dempen Links Achter
+channel.upnpcontrol.blmute.description = Dempen links achter
+channel.upnpcontrol.brmute.label = Dempen Rechts Achter
+channel.upnpcontrol.brmute.description = Dempen rechts achter
+channel.upnpcontrol.vendormute.label = Dempen {0}
+channel.upnpcontrol.vendormute.description = Leverancier specifiek UPnP dempen kanaal
+
+channel.upnpcontrol.lfloudness.label = Loudness Links Voor
+channel.upnpcontrol.lfloudness.description = Loudness links voor, is loudness links bij stereo geluid
+channel.upnpcontrol.rfloudness.label = Loudness Rechts Voor
+channel.upnpcontrol.rfloudness.description = Loudness rechts voor, is loudness rechts bij stereo geluid
+channel.upnpcontrol.cfloudness.label = Loudness Midden Voor
+channel.upnpcontrol.cfloudness.description = Loudness midden voor
+channel.upnpcontrol.lfeloudness.label = Loudness Lage Frequentie Verbetering
+channel.upnpcontrol.lfeloudness.description = Loudness lage frequentie verbetering (subwoofer)
+channel.upnpcontrol.lsloudness.label = Loudness Links Surround
+channel.upnpcontrol.lsloudness.description = Loudness links surround
+channel.upnpcontrol.rsloudness.label = Loudness Rechts Surround
+channel.upnpcontrol.rsloudness.description = Loudness rechts surround
+channel.upnpcontrol.lfcloudness.label = Loudness Links van Midden
+channel.upnpcontrol.lfcloudness.description = Loudness links van het midden (voor)
+channel.upnpcontrol.rfcloudness.label = Loudness Rechts van Midden
+channel.upnpcontrol.rfcloudness.description = Loudness rechts van het midden (voor)
+channel.upnpcontrol.sdloudness.label = Surround Loudness
+channel.upnpcontrol.sdloudness.description = Surround (achter) loudness
+channel.upnpcontrol.slloudness.label = Loudness Zijde Links
+channel.upnpcontrol.slloudness.description = Loudness zijde links (linkermuur)
+channel.upnpcontrol.srloudness.label = Loudness Zijde Rechts
+channel.upnpcontrol.srloudness.description = Loudness zijde rechts (rechtermuur)
+channel.upnpcontrol.tloudness.label = Loudness Boven
+channel.upnpcontrol.tloudness.description = Loudness boven (plafond)
+channel.upnpcontrol.bloudness.label = Loudness Bodem
+channel.upnpcontrol.bloudness.description = Loudness bodem
+channel.upnpcontrol.bcloudness.label = Loudness Midden Achter
+channel.upnpcontrol.bcloudness.description = Loudness midden achter
+channel.upnpcontrol.blloudness.label = Loudness Links Achter
+channel.upnpcontrol.blloudness.description = Loudness links achter
+channel.upnpcontrol.brloudness.label = Loudness Rechts Achter
+channel.upnpcontrol.brloudness.description = Loudness rechts achter
+channel.upnpcontrol.vendorloudness.label = {0} Loudness
+channel.upnpcontrol.vendorloudness.description = Leverancier specifiek UPnP loudness kanaal
+
 # channel types
 
 channel-type.upnpcontrol.album.label = Album
@@ -100,3 +207,12 @@ channel-type.upnpcontrol.upnprenderer.label = Renderer
 channel-type.upnpcontrol.upnprenderer.description = Selecteer speler
 channel-type.upnpcontrol.uri.label = URI
 channel-type.upnpcontrol.uri.description = Speelt nu URI
+
+# thing status messages
+
+offline.no-udn = Geen UDN geconfigureerd voor {0}
+offline.subscription-failed = Kan niet abonneren op service {0} voor {1}
+offline.communication-lost = Communicatie verloren met {0}
+offline.channel-undefined = Channel {0} niet gedefinieerd
+offline.device-not-registered = UPnP apparaat met UDN {0} nog niet geregistreerd
+offline.no-connection-ids = Geen verbinding Id''s ingesteld voor UPnP apparaat met UDN {0}

From e9473caebc324a464d1d28a73a4372ac01e41a21 Mon Sep 17 00:00:00 2001
From: Hilbrand Bouwkamp <hilbrand@h72.nl>
Date: Tue, 13 Dec 2022 08:40:10 +0100
Subject: [PATCH 47/48] [airq] fix table in readme that broke rendering markup
 (#13937)

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
---
 bundles/org.openhab.binding.airq/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.airq/README.md b/bundles/org.openhab.binding.airq/README.md
index 060b3398e1a3e..2659ed9e0f31f 100644
--- a/bundles/org.openhab.binding.airq/README.md
+++ b/bundles/org.openhab.binding.airq/README.md
@@ -44,7 +44,7 @@ For the Maximum Error channels just add `_maxerr` to the channel names.
 The rw column is empty if the channel is only readable, w if the channel can be written and rw if it allows both to be read and written.
 
 | channel                   | type                 | rw | description                                                         |
-|---------------------------|----------------------|--------------------------------------------------------------------------|
+|---------------------------|----------------------|----|---------------------------------------------------------------------|
 | status                    | String               |    | Status of the sensors (usually "OK")                                |
 | avgFineDustSize           | Number:Length        |    | Average size of Fine Dust [experimental]                            |
 | fineDustCnt00_3           | Number:Dimensionless |    | Fine Dust >0,3 µm                                                   |

From 831443334e72ce1f12d517f0816ca8a165dfe8f6 Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Tue, 13 Dec 2022 09:04:16 +0100
Subject: [PATCH 48/48] [mielecloud] Fix integration tests (#13935)

Code change provided by @BjoernLange

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../internal/config/servlet/ForwardToLoginServletTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/ForwardToLoginServletTest.java b/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/ForwardToLoginServletTest.java
index 96ab71588e828..6baa353d1cde4 100644
--- a/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/ForwardToLoginServletTest.java
+++ b/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/ForwardToLoginServletTest.java
@@ -57,7 +57,7 @@ public void whenAuthorizationCannotBeBegunThenTheBrowserIsRedirectedToThePairSit
         assertTrue(maybePairAccountSite.contains(
                 "Go to <a href=\"https://www.miele.com/f/com/en/register_api.aspx\">the Miele developer portal</a> to obtain your"));
         assertTrue(maybePairAccountSite.contains(
-                "There is an authorization ongoing at the moment. Please complete that authorization prior to starting a new one or try again in 3 minutes."));
+                "There is an authorization ongoing at the moment. Please complete that authorization prior to starting a new one or try again"));
     }
 
     @Test