diff --git a/.github/workflows/Development.yml b/.github/workflows/Development.yml
index 48aeb095..e18cd734 100644
--- a/.github/workflows/Development.yml
+++ b/.github/workflows/Development.yml
@@ -103,7 +103,7 @@ jobs:
         pip install --upgrade platformio
 
     - name: Perform static checks on ${{ matrix.environment }}
-      run: platformio check --environment ${{ matrix.environment }}
+      run: platformio check --environment ${{ matrix.environment }} --fail-on-defect=medium --fail-on-defect=high
 
   # Perform tests
   test:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 395ac5bb..c3580862 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -121,7 +121,7 @@ jobs:
         pip install --upgrade platformio
 
     - name: Perform static checks on ${{ matrix.environment }}
-      run: platformio check --environment ${{ matrix.environment }}
+      run: platformio check --environment ${{ matrix.environment }} --fail-on-defect=medium --fail-on-defect=high
 
   # Perform tests
   test:
diff --git a/README.md b/README.md
index 3602048a..d1f6780c 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Full RGB LED matrix, based on an ESP32 and WS2812B LEDs.
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://choosealicense.com/licenses/mit/)
 [![Repo Status](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip)
 [![Release](https://img.shields.io/github/release/BlueAndi/esp-rgb-led-matrix.svg)](https://github.com/BlueAndi/esp-rgb-led-matrix/releases)
-[![Build Status](https://github.com/BlueAndi/esp-rgb-led-matrix/workflows/PlatformIO%20CI/badge.svg?branch=master)](https://github.com/BlueAndi/esp-rgb-led-matrix/actions?query=workflow%3A%22PlatformIO+CI%22)
+[![Build Status](https://github.com/BlueAndi/esp-rgb-led-matrix/actions/workflows/main.yml/badge.svg)](https://github.com/BlueAndi/esp-rgb-led-matrix/actions/workflows/main.yml)
 
 [![pixelix](https://img.youtube.com/vi/dik8Rm6f3o0/0.jpg)](https://www.youtube.com/watch?v=dik8Rm6f3o0 "Pixelix")
 [![pixelix](https://img.youtube.com/vi/UCjJCI5JShY/0.jpg)](https://www.youtube.com/watch?v=UCjJCI5JShY "Pixelix - Remote Button")
@@ -37,6 +37,7 @@ Full RGB LED matrix, based on an ESP32 and WS2812B LEDs.
   * [Is it possible to use a font with 8px height?](#is-it-possible-to-use-a-font-with-8px-height)
   * [How to configure the date/time format?](#how-to-configure-the-datetime-format)
   * [How to configure my own list of plugins?](#how-to-configure-my-own-list-of-plugins)
+  * [Is there an easy way to rotate the display by 180° ? I need to turn the display when putting it into a housing.](#is-there-an-easy-way-to-rotate-the-display-by-180--i-need-to-turn-the-display-when-putting-it-into-a-housing)
 * [Used Libraries](#used-libraries)
 * [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
 * [License](#license)
@@ -55,7 +56,7 @@ The PIXELIX firmware is for ESP32 boards that controls a RGB LED matrix. It can
 * Supports REST API and MQTT for remote control and integration with other systems, like [Home Assistant](https://www.home-assistant.io/).
 * Can be extended with custom effects and animations. See list of [plugins](./doc/PLUGINS.md).
 
-Please note, that not every feature might be available for all kind of development boards. E.g. for MQTT support you need 8 a development board with 8 MB flash or more. See the `config<variant>.ini` configuration files in [./config](./config) folder.
+Please note, that not every feature might be available for all kind of development boards. E.g. for MQTT support you need a development board with 8 MB flash or more. See the `config<variant>.ini` configuration files in [./config](./config) folder.
 
 | Some impressions |   |
 | - | - |
@@ -115,7 +116,7 @@ If the device starts the very first time, the wifi station SSID and passphrase s
 2. Using a terminal connecting via usb.
 
 ## Variant 1: Configure wifi station SSID and passphrase with the browser
-Restart the device and keep the button pressed until it shows the SSID of the wifi access point, spawned by PIXELIX. Search for it with your mobile device and connect.
+Restart the device and **keep the button pressed** until it shows the SSID of the wifi access point, spawned by PIXELIX. Search for it with your mobile device and connect.
 * SSID: **pixelix-&lt;DEVICE-ID&gt;**
 * Passphrase: **Luke, I am your father.**
 
@@ -127,9 +128,11 @@ Use the following default credentials to get access to the PIXELIX web interface
 
 ## Variant 2: Configure wifi station SSID and passphrase with the terminal
 Connect PIXELIX with your PC via usb and start a terminal. Use the following commands to set the wifi SSID and passphrase of your home wifi network:
+* Test: ```ping```
 * Write wifi passphrase: ```write wifi passphrase <your-passphrase>```
 * Write wifi SSID: ```write wifi ssid <your-ssid>```
 * Restart PIXELIX: ```reset```
+* Get IP-address: ```get ip```
 
 ## PIXELIX Is Ready
 After configuration, restart again and voila, PIXELIX will be available in your wifi network.
@@ -137,18 +140,18 @@ After configuration, restart again and voila, PIXELIX will be available in your
 For changing whats displayed, go to its web interface. Use the same credentials than for the captive portal in variant 1. In the "Display" page you can change it according to your needs.
 
 # User Interface
-* Pixelix can be controlled with buttons. Most of the development are supported with just one user button.
+* Pixelix can be controlled with buttons. Most of the development boards are supported with just one user button.
   * One button control:
     * 1 short pulse: Activates the next slot.
     * 2 short pulses: Activates the previous slot.
     * 3 short pulses: Activates next fade effect.
     * 4 short pulses: IP address is shown.
-    * 5 short pulses: Switch device off.
+    * 5 short pulses: Toggle display power on/off.
     * Long pressed: Increases the display brightness until maximum and then decreases until minimum. After that it will again increases it and so on.
   * Two button control (LILYGO&reg; T-Display ESP32-S3):
     * Left button:
       * 1 short pulses: Activates the previous slot.
-      * 2 short pulses: Switch device off.
+      * 2 short pulses: Toggle display power on/off.
       * Long pressed: Decreases the display brightness until minimum. 
     * Right button
       * 1 short pulse: Activates the next slot.
@@ -162,7 +165,7 @@ For changing whats displayed, go to its web interface. Use the same credentials
     * Ok button:
       * 1 short pulses: Activates next fade effect.
       * 2 short pulses: IP address is shown.
-      * Long pressed: Switch device off.
+      * Long pressed: Toggle display power on/off.
     * Right button
       * 1 short pulse: Activates the next slot.
       * Long pressed: Increases the display brightness until maximum. 
@@ -281,6 +284,16 @@ To handle there are several .ini files in the ```./config``` folder:
 
 Update the one you use for your needs by commenting in or out.
 
+## Is there an easy way to rotate the display by 180° ? I need to turn the display when putting it into a housing.
+Change option CONFIG_DISPLAY_ROTATE180 in ```config/display.ini``` to 1 as shown below and rebuild.
+
+Example:
+```ini
+[display:common]
+build_flags =
+    -D CONFIG_DISPLAY_ROTATE180=1
+```
+
 # Used Libraries
 
 | Library | Description | License |
diff --git a/config/board.ini b/config/board.ini
index c07f47c8..c0686a52 100644
--- a/config/board.ini
+++ b/config/board.ini
@@ -30,6 +30,7 @@ build_flags =
     -D CONFIG_BUTTON_CTRL=1
     -D CONFIG_LED_TOPO=ColumnMajorAlternatingLayout
     -D CONFIG_SUPPLY_CURRENT=3500U
+    -D CONFIG_RTC=0
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
@@ -77,6 +78,7 @@ build_flags =
     -D CONFIG_BUTTON_CTRL=1
     -D CONFIG_LED_TOPO=ColumnMajorAlternatingLayout
     -D CONFIG_SUPPLY_CURRENT=3500U
+    -D CONFIG_RTC=0
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
@@ -124,6 +126,7 @@ build_flags =
     -D CONFIG_BUTTON_CTRL=1
     -D CONFIG_LED_TOPO=ColumnMajorAlternatingLayout
     -D CONFIG_SUPPLY_CURRENT=3500U
+    -D CONFIG_RTC=0
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
@@ -171,6 +174,7 @@ build_flags =
     -D CONFIG_BUTTON_CTRL=1
     -D CONFIG_LED_TOPO=ColumnMajorAlternatingLayout
     -D CONFIG_SUPPLY_CURRENT=3500U
+    -D CONFIG_RTC=0
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
@@ -218,6 +222,7 @@ build_flags =
     -D CONFIG_SENSOR_LDR=SensorLdr::LDR_TYPE_GL5528
     -D CONFIG_SENSOR_LDR_SERIES_RESISTANCE=1000.0F
     -D CONFIG_BUTTON_CTRL=1
+    -D CONFIG_RTC=0
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
@@ -266,6 +271,7 @@ build_flags =
     -D CONFIG_SENSOR_LDR=SensorLdr::LDR_TYPE_GL5528
     -D CONFIG_SENSOR_LDR_SERIES_RESISTANCE=1000.0F
     -D CONFIG_BUTTON_CTRL=2
+    -D CONFIG_RTC=0
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
@@ -311,6 +317,7 @@ build_flags =
     -D CONFIG_BUTTON_CTRL=1
     -D CONFIG_LED_TOPO=ColumnMajorAlternatingLayout
     -D CONFIG_SUPPLY_CURRENT=3500U
+    -D CONFIG_RTC=0
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
@@ -357,6 +364,7 @@ build_flags =
     -D CONFIG_SENSOR_LDR_SERIES_RESISTANCE=10000.0f
     -D CONFIG_BUTTON_CTRL=3
     -D CONFIG_SUPPLY_CURRENT=800U
+    -D CONFIG_RTC=1
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
@@ -406,6 +414,7 @@ build_flags =
     -D CONFIG_BUTTON_CTRL=1
     -D CONFIG_LED_TOPO=ColumnMajorAlternatingLayout
     -D CONFIG_SUPPLY_CURRENT=3500U
+    -D CONFIG_RTC=0
 lib_deps =
     ${mcu:esp32.lib_deps_builtin}
     ${mcu:esp32.lib_deps_external}
diff --git a/config/configNormal.ini b/config/configNormal.ini
index e96bf216..b6f3ecea 100644
--- a/config/configNormal.ini
+++ b/config/configNormal.ini
@@ -12,7 +12,7 @@ lib_deps =
     MqttService @ ~0.1.0
     # ********** Topic handlers **********
     RestApiTopicHandler @ ~0.1.0 # Mandatory, can not be removed. Used by webinterface.
-    MqttApiTopicHandler @ ~0.1.0
+    MqttApiTopicHandler @ ~0.1.0 # Requires MqttService
     # ********** Plugins **********
     ;BatteryPlugin @ ~0.1.0
     BTCQuotePlugin @ ~0.1.0
@@ -21,7 +21,8 @@ lib_deps =
     DDPPlugin @ ~0.1.0
     FirePlugin @ ~0.1.0
     GameOfLifePlugin @ ~0.1.0
-    GithubPlugin @ ~0.1.0
+    GrabViaMqttPlugin @ ~0.1.0 # Requires MqttService
+    GrabViaRestPlugin @ ~0.1.0
     GruenbeckPlugin @ ~0.1.0
     IconTextLampPlugin @ ~0.1.0
     IconTextPlugin @ ~0.1.0
@@ -30,7 +31,6 @@ lib_deps =
     OpenWeatherPlugin @ ~0.1.0
     RainbowPlugin @ ~0.1.0
     SensorPlugin @ ~0.1.0
-    ShellyPlugSPlugin @ ~0.1.0
     SignalDetectorPlugin @ ~0.1.0 # Requires AudioService
     SoundReactivePlugin @ ~0.1.0 # Requires AudioService
     SunrisePlugin @ ~0.1.0
diff --git a/config/configSmall.ini b/config/configSmall.ini
index b844f118..44942e92 100644
--- a/config/configSmall.ini
+++ b/config/configSmall.ini
@@ -12,7 +12,7 @@ lib_deps =
     ;MqttService @ ~0.1.0
     # ********** Topic handlers **********
     RestApiTopicHandler @ ~0.1.0 # Mandatory, can not be removed. Used by webinterface.
-    ;MqttApiTopicHandler @ ~0.1.0
+    ;MqttApiTopicHandler @ ~0.1.0 # Requires MqttService
     # ********** Plugins **********
     ;BatteryPlugin @ ~0.1.0
     BTCQuotePlugin @ ~0.1.0
@@ -21,16 +21,16 @@ lib_deps =
     ;DDPPlugin @ ~0.1.0
     FirePlugin @ ~0.1.0
     ;GameOfLifePlugin @ ~0.1.0
-    GithubPlugin @ ~0.1.0
+    ;GrabViaMqttPlugin @ ~0.1.0 # Requires MqttService
+    GrabViaRestPlugin @ ~0.1.0
     ;GruenbeckPlugin @ ~0.1.0
-    IconTextLampPlugin @ ~0.1.0
+    ;IconTextLampPlugin @ ~0.1.0
     IconTextPlugin @ ~0.1.0
     JustTextPlugin @ ~0.1.0
     MatrixPlugin @ ~0.1.0
     OpenWeatherPlugin @ ~0.1.0
     ;RainbowPlugin @ ~0.1.0
     SensorPlugin @ ~0.1.0
-    ShellyPlugSPlugin @ ~0.1.0
     ;SignalDetectorPlugin @ ~0.1.0 # Requires AudioService
     ;SoundReactivePlugin @ ~0.1.0 # Requires AudioService
     SunrisePlugin @ ~0.1.0
diff --git a/config/configSmallNoI2s.ini b/config/configSmallNoI2s.ini
index d2ad23ff..5cb124db 100644
--- a/config/configSmallNoI2s.ini
+++ b/config/configSmallNoI2s.ini
@@ -12,7 +12,7 @@ lib_deps =
     ;MqttService @ ~0.1.0
     # ********** Topic handlers **********
     RestApiTopicHandler @ ~0.1.0 # Mandatory, can not be removed. Used by webinterface.
-    ;MqttApiTopicHandler @ ~0.1.0
+    ;MqttApiTopicHandler @ ~0.1.0 # Requires MqttService
     # ********** Plugins **********
     ;BatteryPlugin @ ~0.1.0
     BTCQuotePlugin @ ~0.1.0
@@ -21,7 +21,8 @@ lib_deps =
     ;DDPPlugin @ ~0.1.0
     FirePlugin @ ~0.1.0
     GameOfLifePlugin @ ~0.1.0
-    GithubPlugin @ ~0.1.0
+    ;GrabViaMqttPlugin @ ~0.1.0 # Requires MqttService
+    GrabViaRestPlugin @ ~0.1.0
     ;GruenbeckPlugin @ ~0.1.0
     IconTextLampPlugin @ ~0.1.0
     IconTextPlugin @ ~0.1.0
@@ -30,7 +31,6 @@ lib_deps =
     OpenWeatherPlugin @ ~0.1.0
     ;RainbowPlugin @ ~0.1.0
     SensorPlugin @ ~0.1.0
-    ;ShellyPlugSPlugin @ ~0.1.0
     ;SignalDetectorPlugin @ ~0.1.0 # Requires AudioService
     ;SoundReactivePlugin @ ~0.1.0 # Requires AudioService
     SunrisePlugin @ ~0.1.0
diff --git a/config/configSmallUlanzi.ini b/config/configSmallUlanzi.ini
index 0edc695e..7b326c9f 100644
--- a/config/configSmallUlanzi.ini
+++ b/config/configSmallUlanzi.ini
@@ -9,19 +9,20 @@ lib_deps =
     TopicHandlerService @ ~0.1.0 # Mandatory, can not be removed.
     SettingsService @ ~0.1.0 # Mandatory, can not be removed.
     ;AudioService @ ~0.1.0 # No I2S interface available
-    ;MqttService @ ~0.1.0
+    MqttService @ ~0.1.0
     # ********** Topic handlers **********
     RestApiTopicHandler @ ~0.1.0 # Mandatory, can not be removed. Used by webinterface.
-    MqttApiTopicHandler @ ~0.1.0
+    MqttApiTopicHandler @ ~0.1.0 # Requires MqttService
     # ********** Plugins **********
     BatteryPlugin @ ~0.1.0
     ;BTCQuotePlugin @ ~0.1.0
-    CountdownPlugin @ ~0.1.0
+    ;CountdownPlugin @ ~0.1.0
     DateTimePlugin @ ~0.1.0
     ;DDPPlugin @ ~0.1.0
-    FirePlugin @ ~0.1.0
+    ;FirePlugin @ ~0.1.0
     GameOfLifePlugin @ ~0.1.0
-    GithubPlugin @ ~0.1.0
+    GrabViaMqttPlugin @ ~0.1.0 # Requires MqttService
+    GrabViaRestPlugin @ ~0.1.0
     ;GruenbeckPlugin @ ~0.1.0
     ;IconTextLampPlugin @ ~0.1.0
     IconTextPlugin @ ~0.1.0
@@ -29,16 +30,15 @@ lib_deps =
     MatrixPlugin @ ~0.1.0
     OpenWeatherPlugin @ ~0.1.0
     ;RainbowPlugin @ ~0.1.0
-    SensorPlugin @ ~0.1.0
-    ;ShellyPlugSPlugin @ ~0.1.0
+    ;SensorPlugin @ ~0.1.0
     ;SignalDetectorPlugin @ ~0.1.0 # Requires AudioService
     ;SoundReactivePlugin @ ~0.1.0 # Requires AudioService
     SunrisePlugin @ ~0.1.0
     SysMsgPlugin @ ~0.1.0 # Mandatory, can not be removed.
     TempHumidPlugin @ ~0.1.0
-    ThreeIconPlugin @ ~0.1.0
+    ;ThreeIconPlugin @ ~0.1.0
     ;VolumioPlugin @ ~0.1.0
     ;WifiStatusPlugin @ ~0.1.0
-    WormPlugin @ ~0.1.0
+    ;WormPlugin @ ~0.1.0
 extra_scripts =
     pre:./scripts/configure_small_ulanzi.py
diff --git a/config/display.ini b/config/display.ini
index 386c35df..43e76018 100644
--- a/config/display.ini
+++ b/config/display.ini
@@ -1,8 +1,16 @@
+; ********************************************************************************
+; generic display config settings
+; ********************************************************************************
+[display:common]
+build_flags =
+    -D CONFIG_DISPLAY_ROTATE180=0         ; set to 1 to rotate display 180°
+
 ; ********************************************************************************
 ; LED matrix based on WS2812B (neopixels)
 ; ********************************************************************************
 [display:led_matrix_column_major_alternating]
 build_flags =
+    ${display:common.build_flags}
     -D CONFIG_LED_MATRIX_WIDTH=32U
     -D CONFIG_LED_MATRIX_HEIGHT=8U
     -D CONFIG_LED_TOPO=ColumnMajorAlternatingLayout
@@ -19,6 +27,7 @@ lib_ignore_external =
 ; ********************************************************************************
 [display:led_matrix_row_major_alternating]
 build_flags =
+    ${display:common.build_flags}
     -D CONFIG_LED_MATRIX_WIDTH=32U
     -D CONFIG_LED_MATRIX_HEIGHT=8U
     -D CONFIG_LED_TOPO=RowMajorAlternatingLayout
@@ -37,6 +46,7 @@ lib_ignore_external =
 ; ********************************************************************************
 [display:lilygo_ttgo_tdisplay]
 build_flags =
+    ${display:common.build_flags}
     -D USER_SETUP_LOADED=1
     -D ST7789_DRIVER
     -D TFT_WIDTH=135
@@ -62,7 +72,7 @@ build_flags =
 lib_deps_builtin =
     HalTftDisplay
 lib_deps_external =
-    bodmer/TFT_eSPI @ ~2.5.30
+    bodmer/TFT_eSPI @ ~2.5.31
 lib_ignore_builtin =
     HalLedMatrix
 lib_ignore_external =
@@ -73,6 +83,7 @@ lib_ignore_external =
 ; ********************************************************************************
 [display:lilygo_tdisplay-s3]
 build_flags =
+    ${display:common.build_flags}
     -D USER_SETUP_LOADED=1
     -D ST7789_DRIVER
     -D TFT_PARALLEL_8_BIT
@@ -88,6 +99,7 @@ build_flags =
     -D TFT_RD=9
     -D TFT_DATA_PIN_OFFSET_EN
     -D TFT_BL=38
+    -D TFT_BACKLIGHT_ON=HIGH
     -D TFT_D0=39
     -D TFT_D1=40
     -D TFT_D2=41
@@ -109,12 +121,11 @@ build_flags =
 lib_deps_builtin =
     HalTftDisplay
 lib_deps_external =
-    https://github.com/nhjschulz/TFT_eSPI
+    bodmer/TFT_eSPI @ ~2.5.31
 lib_ignore_builtin =
     HalLedMatrix
 lib_ignore_external =
 
-
 ; ********************************************************************************
 ; M5Stack 
 ; https://shop.m5stack.com/collections/m5-controllers/CORE
@@ -122,6 +133,7 @@ lib_ignore_external =
 ; ********************************************************************************
 [display:m5stack_core]
 build_flags =
+    ${display:common.build_flags}
     -D USER_SETUP_LOADED=1
     -D ILI9341_DRIVER
     -D M5STACK
@@ -149,8 +161,7 @@ build_flags =
 lib_deps_builtin =
     HalTftDisplay
 lib_deps_external =
-    bodmer/TFT_eSPI @ ~2.5.30
-    
+    bodmer/TFT_eSPI @ ~2.5.31
 lib_ignore_builtin =
     HalLedMatrix
-lib_ignore_external =
\ No newline at end of file
+lib_ignore_external =
diff --git a/config/mcu.ini b/config/mcu.ini
index 95afebc2..bab3b3ea 100644
--- a/config/mcu.ini
+++ b/config/mcu.ini
@@ -2,7 +2,7 @@
 ; MCU ESP32 configuration
 ; ********************************************************************************
 [mcu:esp32]
-platform = espressif32 @ ~6.3.0
+platform = espressif32 @ ~6.4.0
 framework = arduino
 build_flags =
     -I./src/Common
@@ -21,7 +21,7 @@ build_flags =
     -D PIO_ENV="$PIOENV"
     -Wl,-Map,firmware.map
 lib_deps_external =
-    bblanchon/ArduinoJson @ ~6.21.2
+    bblanchon/ArduinoJson @ ~6.21.3
     bblanchon/StreamUtils @ ~1.7.3
     muwerk/mufonts @ ~0.2.0
     https://github.com/BlueAndi/AsyncTCPSock
diff --git a/data/about.html b/data/about.html
index b40c26af..091c5198 100644
--- a/data/about.html
+++ b/data/about.html
@@ -73,7 +73,7 @@ <h1 class="mt-5">About</h1>
                 </ul>
             </div>
         </main>
-  
+
         <!-- Footer -->
         <footer class="footer mt-auto py-3">
             <div class="container">
diff --git a/data/configuration/bumblebee.bmp b/data/configuration/bumblebee.bmp
new file mode 100644
index 00000000..b04e2f10
Binary files /dev/null and b/data/configuration/bumblebee.bmp differ
diff --git a/data/configuration/earth.bmp b/data/configuration/earth.bmp
new file mode 100644
index 00000000..9d88452d
Binary files /dev/null and b/data/configuration/earth.bmp differ
diff --git a/lib/GithubPlugin/web/github.bmp b/data/configuration/github.bmp
similarity index 100%
rename from lib/GithubPlugin/web/github.bmp
rename to data/configuration/github.bmp
diff --git a/data/configuration/hacker.bmp b/data/configuration/hacker.bmp
new file mode 100644
index 00000000..e63d593f
Binary files /dev/null and b/data/configuration/hacker.bmp differ
diff --git a/data/configuration/lightning.bmp b/data/configuration/lightning.bmp
new file mode 100644
index 00000000..2fd726bc
Binary files /dev/null and b/data/configuration/lightning.bmp differ
diff --git a/lib/ShellyPlugSPlugin/web/plug.bmp b/data/configuration/plug.bmp
similarity index 100%
rename from lib/ShellyPlugSPlugin/web/plug.bmp
rename to data/configuration/plug.bmp
diff --git a/data/configuration/santaclaus.bmp b/data/configuration/santaclaus.bmp
new file mode 100644
index 00000000..7cfc3958
Binary files /dev/null and b/data/configuration/santaclaus.bmp differ
diff --git a/data/configuration/sun.bmp b/data/configuration/sun.bmp
new file mode 100644
index 00000000..aa54ce18
Binary files /dev/null and b/data/configuration/sun.bmp differ
diff --git a/data/debug.html b/data/debug.html
index a77c2ec1..afccda79 100644
--- a/data/debug.html
+++ b/data/debug.html
@@ -103,7 +103,7 @@ <h1 class="mt-5">Debug</h1>
                 </div>
             </div>
         </main>
-  
+
         <!-- Footer -->
         <footer class="footer mt-auto py-3">
             <div class="container">
@@ -137,7 +137,7 @@ <h1 class="mt-5">Debug</h1>
 
             function toggleLogLevel(logLevel) {
                 var index = filter.indexOf(logLevel);
-                                
+
                 if (0 > index) {
                     filter.push(logLevel);
                 } else {
@@ -186,7 +186,7 @@ <h1 class="mt-5">Debug</h1>
                 case 5:
                     color = "#0004FF";
                     break;
-                
+
                 default:
                     color = "#0EFF00";
                     break;
@@ -378,7 +378,7 @@ <h1 class="mt-5">Debug</h1>
                     /* Enable measurement button too. */
                     isIperfAvailable = true;
                     enableUI();
-                    
+
                 }).catch(function(err) {
                     if ("undefined" !== typeof err) {
                         console.error(err);
diff --git a/data/display.html b/data/display.html
index 943c916d..1707aeb4 100644
--- a/data/display.html
+++ b/data/display.html
@@ -60,7 +60,9 @@ <h1 class="mt-5">Display</h1>
                     <li>Red/Yellow shaded: Slot is sticky and locked.</li>
                 </ul>
                 <p>
+                    <button class="btn btn-light" type="button" onclick="prevSlot()" disabled>Previous slot</button>
                     <button class="btn btn-light" type="button" onclick="nextSlot()" disabled>Next slot</button>
+                    <button id="updateDisplayButton" class="btn btn-light" type="button" onclick="updateDisplay()" disabled>Enable auto. display update</button>
                 </p>
                 <p>Currently active fade effect: <span id="lableFadeEffect"> Linear</span></p>
                 <p><button class="btn btn-light" type="button" onclick="nextEffect()" disabled>Next fade effect</button></p>
@@ -78,7 +80,7 @@ <h1 class="mt-5">Display</h1>
                 </p>
             </div>
         </main>
-  
+
         <!-- Footer -->
         <footer class="footer mt-auto py-3">
             <div class="container">
@@ -131,7 +133,7 @@ <h1 class="mt-5">Display</h1>
             /* If websocket connection is unexpectedly closed, clean up. */
             function wsOnClosed() {
                 disableUI();
-                
+
                 window.clearTimeout(timerId);
 
                 if (false === isPageUnload) {
@@ -157,11 +159,22 @@ <h1 class="mt-5">Display</h1>
 
                     $("#slotId").text(rsp.slotId);
 
+                    /* If necessary, resize the canvas. */
+                    var $canvas = $("#canvas");
+                    var ctx = $canvas[0].getContext('2d');
+                    var width = rsp.width * pixelWidth + rsp.width + 1;
+                    var height = rsp.height * pixelWidth + rsp.height + 1;
+
+                    if ((ctx.canvas.width != width) || (ctx.canvas.height != height)) {
+                        ctx.canvas.width = width;
+                        ctx.canvas.height = height;
+                    }
+
                     /* Handle display data */
                     for(y = 0; y < rsp.height; ++y) {
                         for(x = 0; x < rsp.width; ++x) {
                             if (rsp.data.length > index) {
-                                color   = parseInt(rsp.data[index]);
+                                color   = rsp.data[index];
                                 red     = (color & 0xff0000) >> 16;
                                 green   = (color & 0x00ff00) >> 8;
                                 blue    = (color & 0x0000ff) >> 0;
@@ -233,7 +246,7 @@ <h1 class="mt-5">Display</h1>
                 }).finally(function() {
                 });
             }
-            
+
             function updateFadeEffect() {
                 /* Update label accordingly. */
                 if (1 === currentFadeEffect) {
@@ -250,10 +263,27 @@ <h1 class="mt-5">Display</h1>
                 }
             }
 
+            function prevSlot() {
+                var buttonActionIdPrevSlot = 2; /* See ButtonActionId */
+                disableUI();
+
+                return wsClient.triggerButton({"actionId": buttonActionIdPrevSlot}).then(function(rsp) {
+                    /* Nothing to do */
+                }).catch(function(err) {
+                    if ("undefined" !== typeof err) {
+                        console.error(err);
+                    }
+                    return dialog.showError("<p>Failed.</p>");
+                }).finally(function() {
+                    enableUI();
+                });
+            }
+
             function nextSlot() {
+                var buttonActionIdNextSlot = 1; /* See ButtonActionId */
                 disableUI();
 
-                return wsClient.triggerButton().then(function(rsp) {
+                return wsClient.triggerButton({"actionId": buttonActionIdNextSlot}).then(function(rsp) {
                     /* Nothing to do */
                 }).catch(function(err) {
                     if ("undefined" !== typeof err) {
@@ -265,6 +295,22 @@ <h1 class="mt-5">Display</h1>
                 });
             }
 
+            function updateDisplay() {
+                disableUI();
+
+                /* Currently off? */
+                if (0 === timerId) {
+                    timerId = window.setTimeout(getDisplayContent, period);
+                    $("#updateDisplayButton").text("Disable auto. display update");
+                } else {
+                    window.clearTimeout(timerId);
+                    timerId = 0;
+                    $("#updateDisplayButton").text("Enable auto. display update");
+                }
+
+                enableUI();
+            }
+
             function move(uid, slotId) {
                 return wsClient.move({
                     uid: uid,
@@ -371,7 +417,7 @@ <h1 class="mt-5">Display</h1>
                             } else {
                                 $divSlot.attr("class", "divSlot sticky");
                             }
-                            
+
                             $divSlot.attr("ondragover", "allowDrop(event)");
                             $divSlot.attr("ondrop", "drop(event)");
                         } else {
@@ -384,7 +430,7 @@ <h1 class="mt-5">Display</h1>
                         }
 
                         $divSlot.attr("id", index);
-                        
+
                         $header = $("<header>");
                         $header.append("Slot " + index + "<br />");
 
@@ -395,7 +441,7 @@ <h1 class="mt-5">Display</h1>
                             .attr("min", "1")
                             .attr("max", "3600")
                             .attr("onchange", "setDuration(" + index + ")");
-                        
+
                         $header.append($inputDuration);
                         $header.append("[s]");
 
@@ -446,12 +492,12 @@ <h1 class="mt-5">Display</h1>
                         .attr("ondragover", "allowDrop(event)")
                         .attr("ondrop", "drop(event)")
                         .attr("id", "uninstall");
-                    
+
                     $header = $("<header>")
                         .text("Uninstall");
-                    
+
                     $divSlot.append($header);
-                    
+
                     $divSlots.append($divSlot);
                 });
             }
@@ -555,9 +601,6 @@ <h1 class="mt-5">Display</h1>
                     currentFadeEffect = rsp.fadeEffect;
                     updateFadeEffect();
                 }).then(function(rsp) {
-                    /* Request display content periodically. */
-                    timerId = window.setTimeout(getDisplayContent, period);
-
                     /* UI is enabled at least. */
                     enableUI();
                 }).catch(function(err) {
diff --git a/data/edit.html b/data/edit.html
index 34c2721a..7b40eb97 100644
--- a/data/edit.html
+++ b/data/edit.html
@@ -68,7 +68,7 @@ <h4 id="fileName" class="text-secondary"></h4>
                             </div>
                             <div class="input-group-append" style="padding-left: 10px">
                                 <label for="directory">Directory:</label>
-                                <input type="text" id="directory" name="directory" value="/configuration" size="40" />                            
+                                <input type="text" id="directory" name="directory" value="/configuration" size="40" />
                             </div>
                             <div class="input-group-append">
                                 <button class="btn btn-light" type="button" onclick="upload();">Upload</button>
@@ -285,7 +285,7 @@ <h2 class="mt-1">Files</h2>
                 $("#editor").collapse("show");
                 $("#preview").collapse("hide");
                 $("#fileName").text(loadedFile);
-                
+
                 return dialog.show("Loading file", "<p>Please wait, its loading.</p>")
                 .then(function() {
                     return restClient.readFile(filename);
@@ -398,7 +398,7 @@ <h2 class="mt-1">Files</h2>
 
                 $.fn.extend({
                     treed: function (o) {
-                    
+
                         //initialize each of the top levels
                         var tree = $(this);
                         tree.addClass("tree");
@@ -415,7 +415,7 @@ <h2 class="mt-1">Files</h2>
                             });
                             branch.children().not("i").children().toggle();
                         });
-                        
+
                         //fire event from the dynamically added icon
                         tree.find('.branch .indicator').each(function(){
                             $(this).on('click', function () {
diff --git a/data/error.html b/data/error.html
index 39513bee..575bd5f3 100644
--- a/data/error.html
+++ b/data/error.html
@@ -38,7 +38,7 @@ <h1 class="mt-5">Error</h1>
                 </div>
             </div>
         </main>
-  
+
         <!-- Footer -->
         <footer class="footer mt-auto py-3">
             <div class="container">
diff --git a/data/index.html b/data/index.html
index fe302e44..8d39c377 100644
--- a/data/index.html
+++ b/data/index.html
@@ -37,9 +37,10 @@ <h1 class="mt-5">Welcome to</h1>
                 <p>~SW_VERSION~</p>
                 <p>~SW_REVISION~</p>
                 <p>~SW_BRANCH~</p>
+                <p>~TARGET~</p>
             </div>
         </main>
-  
+
         <!-- Footer -->
         <footer class="footer mt-auto py-3">
             <div class="container">
diff --git a/data/info.html b/data/info.html
index 55346024..71284991 100644
--- a/data/info.html
+++ b/data/info.html
@@ -55,6 +55,10 @@ <h2 class="mt-1">Software</h2>
                                 <td>Branch</td>
                                 <td>~SW_BRANCH~</td>
                             </tr>
+                            <tr>
+                                <td>Target</td>
+                                <td>~TARGET~</td>
+                            </tr>
                             <tr>
                                 <td>ESP SDK Version</td>
                                 <td>~ESP_SDK_VERSION~</td>
@@ -67,6 +71,10 @@ <h2 class="mt-1">Software</h2>
                                 <td>LwIP Version</td>
                                 <td>~LWIP_VERSION~</td>
                             </tr>
+                            <tr>
+                                <td>mbed TLS Version</td>
+                                <td><a href="https://github.com/espressif/mbedtls/tree/mbedtls-~MBED_TLS_VERSION~-idf">~MBED_TLS_VERSION~</a></td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
diff --git a/data/js/dialog.js b/data/js/dialog.js
index 056f95e0..0de60d39 100644
--- a/data/js/dialog.js
+++ b/data/js/dialog.js
@@ -6,7 +6,7 @@ dialog._show = function(title, message) {
         $("#dialogTitle").text(title);
         $("#dialogBody").html(message);
 
-        $("#modalDialog").on("shown.bs.modal", function() { 
+        $("#modalDialog").on("shown.bs.modal", function() {
             $("#modalDialog").off("shown.bs.modal");
             resolve();
         });
@@ -18,7 +18,7 @@ dialog._show = function(title, message) {
 dialog.hide = function() {
     return new Promise(function(resolve, reject) {
 
-        $("#modalDialog").on("hidden.bs.modal", function() { 
+        $("#modalDialog").on("hidden.bs.modal", function() {
             $("#modalDialog").off("hidden.bs.modal");
             resolve();
         });
diff --git a/data/js/menu.js b/data/js/menu.js
index e11583b1..413ed4a5 100644
--- a/data/js/menu.js
+++ b/data/js/menu.js
@@ -72,7 +72,7 @@ menu._createMenuItem = function(ulId, menuItem) {
                     .attr("class", "nav-link")
                     .attr("href", menuItem.hyperRef)
                     .text(menuItem.title);
-    
+
     if (location.pathname === menuItem.hyperRef) {
         $(anchor).addClass("active");
     }
@@ -114,7 +114,7 @@ menu._createSubMenuItem = function($div, subMenuItem) {
                     .attr("href", subMenuItem.hyperRef)
                     .text(subMenuItem.title);
     var isActive    = false;
-    
+
     $($div).append(anchor);
 
     if (location.pathname === subMenuItem.hyperRef) {
diff --git a/data/js/utils.js b/data/js/utils.js
index aaba88c5..3d709ef2 100644
--- a/data/js/utils.js
+++ b/data/js/utils.js
@@ -33,6 +33,7 @@ utils.makeRequest = function(options) {
             var urlEncodedPar   = "";
             var isJsonResponse  = false;
             var isFirst         = true;
+            var key;
 
             if ("object" === typeof options.formData) {
                 formData = options.formData;
@@ -41,7 +42,7 @@ utils.makeRequest = function(options) {
                 if ("get" === options.method.toLowerCase()) {
                     urlEncodedPar += "?";
 
-                    for(var key in options.parameter) {
+                    for(key in options.parameter) {
                         if (true === isFirst) {
                             isFirst = false;
                         } else {
@@ -54,7 +55,7 @@ utils.makeRequest = function(options) {
                 } else {
                     formData = new FormData();
 
-                    for(var key in options.parameter) {
+                    for(key in options.parameter) {
                         formData.append(key, options.parameter[key]);
                     }
                 }
@@ -71,11 +72,11 @@ utils.makeRequest = function(options) {
                     xhr.setRequestHeader(key, options.headers[key]);
                 });
             }
-            
+
             if ("function" === typeof options.onProgress) {
                 xhr.upload.onprogress = options.onProgress;
             }
-            
+
             xhr.onload = function() {
                 var jsonRsp = null;
 
@@ -127,4 +128,40 @@ utils.readJsonFile = function(file) {
         }
         rawFile.send(null);
     });
-};
\ No newline at end of file
+};
+
+utils.checkBMPFile = function(file) {
+    return new Promise(function(resolve, reject) {
+        var reader = new FileReader();
+
+        reader.onload = function(e) {
+            resolve(e.target.result);
+        };
+
+        reader.readAsArrayBuffer(file);
+    }).then(function(buffer) {
+        var bitmapHeaderSize = 54;
+        var header = new Uint8Array(buffer, 0, bitmapHeaderSize);
+        var planes = (header[27] << 8) | (header[26] << 0);
+        var bitsPerPixel = (header[29] << 8) | (header[28] << 0);
+        var compression = (header[33] << 24) | (header[32] << 16) | (header[31] << 8) | (header[30] << 0);
+        var paletteColors = (header[49] << 24) | (header[48] << 16) | (header[47] << 8) | (header[46] << 0);
+        var promise = null;
+
+        if ("BM" !== String.fromCharCode.apply(null, header.subarray(0, 2))) {
+            promise = Promise.reject("No bitmap file.");
+        } else if (1 !== planes) {
+            promise = Promise.reject("Only 1 plane is supported.");
+        } else if ((24 !== bitsPerPixel) && (32 !== bitsPerPixel)) {
+            promise = Promise.reject("Only 24 or 32 bpp are supported.");
+        } else if (0 !== compression) {
+            promise = Promise.reject("No compression is supported.");
+        } else if (0 !== paletteColors) {
+            promise = Promise.reject("Color palette not supported.");
+        } else {
+            promise = Promise.resolve();
+        }
+
+        return promise;
+    });
+};
diff --git a/data/js/ws.js b/data/js/ws.js
index a01aa369..0ad93201 100644
--- a/data/js/ws.js
+++ b/data/js/ws.js
@@ -30,7 +30,7 @@ pixelix.ws.getLogLevelStr = function(logLevel) {
     case 5:
         str = "TRACE";
         break;
-    
+
     default:
         str = "UNKNWON";
         break;
@@ -170,9 +170,9 @@ pixelix.ws.Client.prototype._onMessage = function(msg) {
                 rsp.name = data[0];
                 this._pendingCmd.resolve(rsp);
             } else if ("GETDISP" === this._pendingCmd.name) {
-                rsp.slotId = data.shift();
-                rsp.width = data.shift();
-                rsp.height = data.shift();
+                rsp.slotId = parseInt(data.shift());
+                rsp.width = parseInt(data.shift());
+                rsp.height = parseInt(data.shift());
                 rsp.data = [];
                 for(index = 0; index < data.length; ++index) {
                     rsp.data.push(parseInt(data[index], 16));
@@ -557,14 +557,21 @@ pixelix.ws.Client.prototype.stopIperf = function(options) {
     }.bind(this));
 };
 
-pixelix.ws.Client.prototype.triggerButton = function() {
+pixelix.ws.Client.prototype.triggerButton = function(options) {
     return new Promise(function(resolve, reject) {
+        var par = null;
+
         if (null === this._socket) {
             reject();
         } else {
+
+            if ("number" === typeof options.actionId) {
+                par = options.actionId.toString();
+            }
+
             this._sendCmd({
                 name: "BUTTON",
-                par: null,
+                par: par,
                 resolve: resolve,
                 reject: reject
             });
diff --git a/data/settings.html b/data/settings.html
index 194085c0..abefc0e2 100644
--- a/data/settings.html
+++ b/data/settings.html
@@ -52,7 +52,7 @@ <h1 class="mt-5">Settings</h1>
                 <p id="settings"></p>
             </div>
         </main>
-  
+
         <!-- Footer -->
         <footer class="footer mt-auto py-3">
             <div class="container">
@@ -129,7 +129,7 @@ <h1 class="mt-5">Settings</h1>
                                     .attr("for", "for-" + index)
                                     .attr("class", "form-label")
                                     .text(data[index].name);
-                        
+
                         if ("string" === typeof data[index].value) {
                             inputFieldType = "text"
                             if ("boolean" === typeof data[index].isSecret) {
diff --git a/data/update.html b/data/update.html
index 2833e3d9..8e2e5ea3 100644
--- a/data/update.html
+++ b/data/update.html
@@ -72,7 +72,7 @@ <h1 class="mt-5">Update</h1>
                         </div>
                         <div class="progress">
                             <div id="progressBar" class="progress-bar" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
-                        </div>    
+                        </div>
                     </div>
 
                     <div class="tab-pane fade" id="backup" role="tabpanel" aria-labelledby="backup-tab">
@@ -99,7 +99,7 @@ <h1 class="mt-5">Update</h1>
 
             </div>
         </main>
-  
+
         <!-- Footer -->
         <footer class="footer mt-auto py-3">
             <div class="container">
@@ -160,7 +160,7 @@ <h1 class="mt-5">Update</h1>
                 var files       = [];
                 var fileParameters  = {};
                 var fileHeaders     = {};
-                
+
                 if (2 < fileCnt) {
                     fileCnt = 2;
                 }
@@ -170,7 +170,7 @@ <h1 class="mt-5">Update</h1>
 
                     if (("~FIRMWARE_FILENAME~" === file.name) ||
                         ("~FILESYSTEM_FILENAME~" === file.name)) {
-                    
+
                         files.push(file);
                     }
                 }
@@ -337,7 +337,7 @@ <h1 class="mt-5">Update</h1>
             $(document).ready(function() {
                 menu.addSubMenu(menu.data, "Plugins", pluginSubMenu);
                 menu.create("menu", menu.data);
-                
+
                 $("#inputFile").on("change", function() {
                     var fileName = $(this).val().split("\\").pop();
                     $(this).next(".custom-file-label").addClass("selected").html(fileName);
diff --git a/data/version.json b/data/version.json
index 5040b4b7..7c559750 100644
--- a/data/version.json
+++ b/data/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "v7.1.1"
+    "version": "v7.2.0"
 }
\ No newline at end of file
diff --git a/doc/CUSTOM-IDF-LIBRARIES.md b/doc/CUSTOM-IDF-LIBRARIES.md
index b095eb3d..945daaf8 100644
--- a/doc/CUSTOM-IDF-LIBRARIES.md
+++ b/doc/CUSTOM-IDF-LIBRARIES.md
@@ -5,12 +5,12 @@
 
 # Building ESP-IDF Libraries for Arduino using custom sdkconfig options
 
-- [Building ESP-IDF Libraries](#Building-ESP-ID-Libraries)
-- [Purpose](#purpose)
-- [Instructions](#instructions)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Building ESP-IDF Libraries for Arduino using custom sdkconfig options](#building-esp-idf-libraries-for-arduino-using-custom-sdkconfig-options)
+* [Purpose](#purpose)
+* [Instructions](#instructions)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Purpose
 
diff --git a/doc/HOMEASSISTANT.md b/doc/HOMEASSISTANT.md
index e67f01c9..06c69b06 100644
--- a/doc/HOMEASSISTANT.md
+++ b/doc/HOMEASSISTANT.md
@@ -4,18 +4,18 @@
 
 # Home Assistant <!-- omit in toc -->
 
-- [Purpose](#purpose)
-- [REST API](#rest-api)
-  - [Installation](#installation)
-  - [Setting up REST command](#setting-up-rest-command)
-  - [Import Blueprint](#import-blueprint)
-  - [Generate an automation](#generate-an-automation)
-- [MQTT](#mqtt)
-  - [Installation](#installation-1)
-  - [MQTT Discovery](#mqtt-discovery)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Purpose](#purpose)
+* [REST API](#rest-api)
+  * [Installation](#installation)
+  * [Setting up REST command](#setting-up-rest-command)
+  * [Import Blueprint](#import-blueprint)
+  * [Generate an automation](#generate-an-automation)
+* [MQTT](#mqtt)
+  * [Installation](#installation-1)
+  * [MQTT Discovery](#mqtt-discovery)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Purpose
 To display e.g. sensor data from your [Home Assistant](https://www.home-assistant.io/) instance, there are two possibilitis. Using the REST API or MQTT.
diff --git a/doc/ICONS.md b/doc/ICONS.md
index ed71d38c..81eb407c 100644
--- a/doc/ICONS.md
+++ b/doc/ICONS.md
@@ -5,15 +5,15 @@
 
 # Alternative Icons
 
-- [Alternative Icons](#alternative-icons)
-- [Purpose](#purpose)
-- [OpenWeatherPlugin](#openweatherplugin)
-  - [Color Intense](#color-intense)
-  - [Animated](#animated)
-- [BTCQuotePlugin](#btcquoteplugin)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Alternative Icons](#alternative-icons)
+* [Purpose](#purpose)
+* [OpenWeatherPlugin](#openweatherplugin)
+  * [Color Intense](#color-intense)
+  * [Animated](#animated)
+* [BTCQuotePlugin](#btcquoteplugin)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Purpose
 
diff --git a/doc/MQTT.md b/doc/MQTT.md
index 4d928163..e35b269f 100644
--- a/doc/MQTT.md
+++ b/doc/MQTT.md
@@ -9,9 +9,10 @@
 * [Overview Mindmap](#overview-mindmap)
 * [MQTT Topics](#mqtt-topics)
   * [Birth and last will](#birth-and-last-will)
-  * [Plugin base URI](#plugin-base-uri)
+  * [Plugin topic path](#plugin-topic-path)
   * [Topic name](#topic-name)
   * [Sending a bitmap](#sending-a-bitmap)
+  * [Sensors](#sensors)
 * [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
 * [License](#license)
 * [Contribution](#contribution)
@@ -40,10 +41,10 @@ Pixelix supports birth and last will messages.
 
 After the successful connection establishment to the MQTT broker, Pixelix will send "online" to the &lt;HOSTNAME&gt;/status topic. In any disconnect case, "offline" will be sent to the &lt;HOSTNAME&gt;/status topic.
 
-## Plugin base URI
-The base URI to access plugin related topics can be setup with the plugin UID or the plugin alias:
-* &lt;HOSTNAME&gt;/uid/&lt;PLUGIN-UID&gt;/...
-* &lt;HOSTNAME&gt;/alias/&lt;PLUGIN-ALIAS&gt;/...
+## Plugin topic path
+The base topic path to access plugin related topics can be setup with the plugin UID or the plugin alias:
+* &lt;HOSTNAME&gt;/display/uid/&lt;PLUGIN-UID&gt;/...
+* &lt;HOSTNAME&gt;/display/alias/&lt;PLUGIN-ALIAS&gt;/...
 
 ## Topic name
 The complete topic name can be derived from the REST API documentation.
@@ -51,7 +52,7 @@ The complete topic name can be derived from the REST API documentation.
 Example: JustTextPlugin
 
 The REST API URL looks like the following: http://&lt;HOSTNAME&gt;/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/text?text=&lt;TEXT&gt;
-1. Replace the http://&lt;HOSTNAME&gt;/rest/api/v1/display part with &lt;HOSTNAME&gt; --> &lt;HOSTNAME&gt;/uid/&lt;PLUGIN-UID&gt;/text?text=&lt;TEXT&gt;
+1. Replace the http://&lt;HOSTNAME&gt;/rest/api/v1/ part with &lt;HOSTNAME&gt; --> &lt;HOSTNAME&gt;/display/uid/&lt;PLUGIN-UID&gt;/text?text=&lt;TEXT&gt;
 2. Every URL parameter, which is in this case show=&lt;TEXT&gt; must be sent in JSON format.
 
 ```json
@@ -75,6 +76,14 @@ Example: IconTextPlugin
 }
 ```
 
+## Sensors
+The sensor topic path is valid if the sensor is available!
+
+* Temperature in °C: &lt;HOSTNAME&gt;/sensors/0/temperature/state
+* Humidity in %: &lt;HOSTNAME&gt;/sensors/1/humidity/state
+* Illuminance in lx: &lt;HOSTNAME&gt;/sensors/2/illuminance/state
+* Battery SOC in %: &lt;HOSTNAME&gt;/sensors/3/soc/state
+
 # Issues, Ideas And Bugs
 If you have further ideas or you found some bugs, great! Create a [issue](https://github.com/BlueAndi/esp-rgb-led-matrix/issues) or if you are able and willing to fix it by yourself, clone the repository and create a pull request.
 
diff --git a/doc/PLUGIN-DEV.md b/doc/PLUGIN-DEV.md
index 0531fe54..45fbec8d 100644
--- a/doc/PLUGIN-DEV.md
+++ b/doc/PLUGIN-DEV.md
@@ -5,21 +5,21 @@
 
 # Plugin development <!-- omit in toc -->
 
-- [What must be done?](#what-must-be-done)
-- [Rules](#rules)
-- [Recommendations](#recommendations)
-- [Typical use cases](#typical-use-cases)
-  - [Initial configuration in filesystem](#initial-configuration-in-filesystem)
-  - [Reload configuration from filesystem periodically](#reload-configuration-from-filesystem-periodically)
-  - [Request information from URL periodically](#request-information-from-url-periodically)
-- [Traps and pitfalls](#traps-and-pitfalls)
-  - [active/inactive](#activeinactive)
-- [SW Architecture](#sw-architecture)
-  - [Static View](#static-view)
-  - [Dynamic View](#dynamic-view)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [What must be done?](#what-must-be-done)
+* [Rules](#rules)
+* [Recommendations](#recommendations)
+* [Typical use cases](#typical-use-cases)
+  * [Initial configuration in filesystem](#initial-configuration-in-filesystem)
+  * [Reload configuration from filesystem periodically](#reload-configuration-from-filesystem-periodically)
+  * [Request information from URL periodically](#request-information-from-url-periodically)
+* [Traps and pitfalls](#traps-and-pitfalls)
+  * [active/inactive](#activeinactive)
+* [SW Architecture](#sw-architecture)
+  * [Static View](#static-view)
+  * [Dynamic View](#dynamic-view)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # What must be done?
 1. Create the plugin as library:
diff --git a/doc/PLUGINS.md b/doc/PLUGINS.md
index e7a635cb..23d2c8e2 100644
--- a/doc/PLUGINS.md
+++ b/doc/PLUGINS.md
@@ -8,6 +8,8 @@ The content of the display can be configured by installing an individual set of
 Each plugin is identified by its unique UID.
 
 * [Generic plugins](#generic-plugins)
+  * [GrabViaMqttPlugin](#grabviamqttplugin)
+  * [GrabViaRestPlugin](#grabviarestplugin)
   * [IconTextPlugin](#icontextplugin)
   * [IconTextLampPlugin](#icontextlampplugin)
   * [JustTextPlugin](#justtextplugin)
@@ -21,13 +23,11 @@ Each plugin is identified by its unique UID.
     * [xlights Configuration](#xlights-configuration)
   * [FirePlugin](#fireplugin)
   * [GameOfLifePlugin](#gameoflifeplugin)
-  * [GithubPlugin](#githubplugin)
   * [GruenbeckPlugin](#gruenbeckplugin)
   * [MatrixPlugin](#matrixplugin)
   * [OpenWeatherPlugin](#openweatherplugin)
   * [RainbowPlugin](#rainbowplugin)
   * [SensorPlugin](#sensorplugin)
-  * [ShellyPlugSPlugin](#shellyplugsplugin)
   * [SignalDetectorPlugin](#signaldetectorplugin)
   * [SoundReactivePlugin](#soundreactiveplugin)
   * [SunrisePlugin](#sunriseplugin)
@@ -42,29 +42,38 @@ Each plugin is identified by its unique UID.
 * [Contribution](#contribution)
 
 # Generic plugins
-The generic plugins allow the user to control the different UI elements described in the plugin name via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0).
+The generic plugins allow the user to control the different UI elements described in the plugin name via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0).
+
+## GrabViaMqttPlugin
+The plugin can grab information in JSON format via MQTT and shows it on the display.
+[Configuration examples](./grabConfigs/mqtt/) may help to configure.
+
+## GrabViaRestPlugin
+The plugin can grab information in JSON format via REST API and shows it on the display.
+Each part can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/GrabViaRestPlugin).
+[Configuration examples](./grabConfigs/rest/) may help to configure.
 
 ## IconTextPlugin
 The IconTextPlugin shows an icon on left side, text on right side. If no text is set, the plugin will be skipped in the slot.\
-Each part can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/IconTextPlugin).
+Each part can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/IconTextPlugin).
 
 If MQTT is built in and enabled, it will support Home Assistant MQTT discovery.
 
 ## IconTextLampPlugin
 The IconTextLampPlugin shows an icon on left side, text on right side and lamps at the bottom.\
-Each part can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/IconTextLampPlugin).
+Each part can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/IconTextLampPlugin).
 
 If MQTT is built in and enabled, it will support Home Assistant MQTT discovery.
 
 ## JustTextPlugin
 The JustTextPlugin shows only text on the whole display. If no text is set, the plugin will be skipped in the slot.\
-The text to be displayed can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/JustTextPlugin).
+The text to be displayed can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/JustTextPlugin).
 
 If MQTT is built in and enabled, it will support Home Assistant MQTT discovery.
 
 ## ThreeIconPlugin
 The ThreeIconPlugin shows three icons on the display.\
-Each icon can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/ThreeIconPlugin).
+Each icon can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/ThreeIconPlugin).
 
 # Dedicated plugins
 Dedicated plugins are plugins which only serves one single purpose thy are only internally configurable.
@@ -78,7 +87,7 @@ Powered by [CoinDesk](https://www.coindesk.com/price/bitcoin).
 
 ## CountdownPlugin
 The CountdownPlugin shows the remaining days until a configured target date.\
-Target date and the description of the target day (plural/singular form) can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/CountdownPlugin).
+Target date and the description of the target day (plural/singular form) can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/CountdownPlugin).
 
 ## DateTimePlugin
 The plugin shows the current time and/or date.
@@ -91,7 +100,7 @@ Configure the date and time format in the plugin configuration JSON file. The fo
 
 By default the local time (see timezone in the settings) is used. It can be overwritten by the plugin configuration.
 
-It can be set what shall be shown via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/DateTimePlugin).
+It can be set what shall be shown via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/DateTimePlugin).
 
 ## DDPPlugin
 The plugin setup a server supporting the Distributed Display Protocol (DDP), which is used e.g. by [xlights](https://www.xlights.org) or [LedFx](https://www.ledfx.app).
@@ -128,12 +137,9 @@ The FirePlugin shows a animated fire on the display.
 ## GameOfLifePlugin
 The GameOfLifePlugin shows the game of life game on the display.
 
-## GithubPlugin
-The plugin shows the stargazers count of a github repository.
-
 ## GruenbeckPlugin
 The GruenbeckPlugin shows the remaining system capacity (parameter = D_Y_10_1 ) of the Gruenbeck softliQ SC18 via the system's RESTful webservice.\
-The IP address of the Gruenbeck webserver can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/GruenbeckPlugin).
+The IP address of the Gruenbeck webserver can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/GruenbeckPlugin).
 
 ## MatrixPlugin
 The plugin shows the effect from the film "Matrix" over the whole display.
@@ -142,7 +148,7 @@ The plugin shows the effect from the film "Matrix" over the whole display.
 The OpenWeatherPlugin shows the current weather condition (icon and temperature) and one additional information (uvIndex, humidity or windspeed) .\
 Information provided by [OpenWeather](https://openweathermap.org/).\
 In order to use the plugin an API key is necessary, see https://openweathermap.org/appid for further information.\
-The coordinates (latitude & longitude) of your location, your API key and the desired additional information to be displayed can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/OpenWeatherPlugin).
+The coordinates (latitude & longitude) of your location, your API key and the desired additional information to be displayed can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/OpenWeatherPlugin).
 
 ## RainbowPlugin
 The RainbowPlugin shows an animated rainbow on the display.
@@ -150,26 +156,22 @@ The RainbowPlugin shows an animated rainbow on the display.
 ## SensorPlugin
 The plugin shows sensor values of the selected sensor channel.
 
-## ShellyPlugSPlugin
-The ShellyPlugSPlugin shows the current AC power being drawn via a Shelly PlugS, in watts.\
-The IP address of the Shelly PlugS webserver can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/ShellyPlugSPlugin).
-
 ## SignalDetectorPlugin
 The plugin is able to detect a signal, which can be combined with up to 2 frequencies.\
 Each frequency must be detected for a specific configureable time.\
 As long as nothing is detected, the plugin will disable itself.\
 If a signal is detected, it will be shown on the display for the configured slot duration. After slot duration timeout or user changed the slot, the plugin will be disabled until next signal detection. \
 Additional a push notification can be configured. By default a GET is triggered. Using "GET" or "POST" as prefix its configureable. Example: "POST http://..."
-Each part can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/SignalDetectorPlugin).
+Each part can be set separately via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/SignalDetectorPlugin).
 
 ## SoundReactivePlugin
 The plugin shows octave frequency bands, depended on the environment sound.
 Required: A digital microphone (INMP441) is required, connected to the I2S port.
-The number of shown frequency bands can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/SoundReactivePlugin).
+The number of shown frequency bands can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/SoundReactivePlugin).
 
 ## SunrisePlugin
 The SunrisePlugin shows the current sunrise / sunset times for a configured location.\
-The coordinates (latitude & longitude) of your location can be set via the [REST API]([REST.md#endpoint-base-uridisplayuidplugin-uidlocation](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/SunrisePlugin)).\
+The coordinates (latitude & longitude) of your location can be set via the [REST API]([REST.md#endpoint-base-uridisplayuidplugin-uidlocation](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/SunrisePlugin)).\
 Powered by sunrise-sunset.org
 
 Configure the time format in the plugin configuration JSON file. The format itself is according to strftime(). For colorization text properties can be added.
@@ -186,7 +188,7 @@ The TestPlugin can be used to check whether the LED matrix topology (layout) is
 ## VolumioPlugin
 The VolumioPlugin shows the current VOLUMIO state as icon and the played artist/title.\
 If the VOLUMIO server is offline, the plugin gets automatically disabled, otherwise enabled.\
-The host address of the Volumio webserver can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0#/VolumioPlugin).
+The host address of the Volumio webserver can be set via the [REST API](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0#/VolumioPlugin).
 
 ## WifiStatusPlugin
 The WifiStatusPlugin shows the current wireless signal strength.
diff --git a/doc/README.md b/doc/README.md
index bc4f7020..e8a1aa54 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -5,16 +5,11 @@
 
 # Documentation  <!-- omit in toc -->
 
-- [Requirements](#requirements)
-- [Hardware](#hardware)
-- [Software](#software)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
-
-# Requirements
-
-* [Requirements](REQUIREMENTS.md)
+* [Hardware](#hardware)
+* [Software](#software)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Hardware
 
@@ -30,12 +25,13 @@
     * [Software update](./config/SW-UPDATE.md)
 * [Plugins](PLUGINS.md)
 * [Plugin Development](PLUGIN-DEV.md)
-* [REST API description](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.3.0)
+* [REST API description](https://app.swaggerhub.com/apis/BlueAndi/Pixelix/1.4.0)
 * [MQTT](MQTT.md)
 * [Home Assistant REST Wrapper](HOMEASSISTANT.md)
 * [Websocket API description](WEBSOCKET.md)
 * [Sprite sheet](SPRITESHEET.md)
 * [Alternative icons](ICONS.md)
+* [Configuration examples for GrabViaMqttPlugin and GrabViaRestPlugin.](./grabConfigs/README.md)
 
 # Issues, Ideas And Bugs
 If you have further ideas or you found some bugs, great! Create a [issue](https://github.com/BlueAndi/esp-rgb-led-matrix/issues) or if you are able and willing to fix it by yourself, clone the repository and create a pull request.
diff --git a/doc/REQUIREMENTS.md b/doc/REQUIREMENTS.md
deleted file mode 100644
index c4d5de95..00000000
--- a/doc/REQUIREMENTS.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# PIXELIX <!-- omit in toc -->
-![PIXELIX](./images/LogoBlack.png)
-
-[![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://choosealicense.com/licenses/mit/)
-
-# Requirements <!-- omit in toc -->
-
-- [General](#general)
-- [Communication](#communication)
-- [User Interaction](#user-interaction)
-  - [Wifi](#wifi)
-  - [REST](#rest)
-  - [Websocket](#websocket)
-- [Firmware update](#firmware-update)
-- [TCP/IP Server](#tcpip-server)
-- [Brightness Control](#brightness-control)
-- [Real Time Clock](#real-time-clock)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
-
-Next available REQ id: 21
-
-# General
-* REQ-01: The display shall be able to show bitmaps and text.
-* REQ-02: The display shall be able to show animations.
-
-# Communication
-* REQ-03: The communication with the display shall be via wifi.
-* REQ-04: The display shall provide a [REST](https://en.wikipedia.org/wiki/Representational_state_transfer) API to exchange [JSON](https://en.wikipedia.org/wiki/JSON).
-* REQ-05: The display shall provide a [websocket](https://en.wikipedia.org/wiki/WebSocket) interface.
-
-# User Interaction
-* REQ-10: The display shall provide a user button for user interaction.
-* REQ-17: The display shall provide a reset button.
-
-## Wifi
-
-* REQ-07: The display shall setting up an wifi access point on user demand (via user button) after a power-cycle.
-* REQ-08: The wifi access point shall have the following default configuration:
-    * SSID: pixelix
-    * Security: WPA
-    * Password: "Luke, I am your father."
-* REQ-09: If a remote wifi network is configured, the display shall automatically connect after a power-cycle.
-
-## REST
-
-* REQ-19: A REST interface shall be provided to control the display or retrieve information.
-
-## Websocket
-
-* REQ-20: A websocket interface shall be provided to control the display or retrieve information.
-
-# Firmware update
-* REQ-06: The firmware shall be updated over the air.
-* REQ-14: The firmware update shall be protected against malicious access via authorization.
-
-# TCP/IP Server
-
-* REQ-11: The display shall provide a [HTTP](https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol)/[HTTPS](https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol_Secure) webserver.
-* REQ-12: The user shall be able to configure a remote wifi network, if a access point is spawned.
-* REQ-12: The webserver shall be protected against malicious access via authorization.
-* REQ-13: The webserver shall not run during an firmware update.
-
-# Brightness Control
-* REQ-15: The display brightness shall be automatically adapted to the environment.
-* REQ-16: The max. display brightness shall be limited to avoid a high LED matrix current, which destroys electronic parts.
-
-# Real Time Clock
-* REQ-18: The display shall contain a real time clock, used for power modes or a clock.
-
-# Issues, Ideas And Bugs
-If you have further ideas or you found some bugs, great! Create a [issue](https://github.com/BlueAndi/esp-rgb-led-matrix/issues) or if you are able and willing to fix it by yourself, clone the repository and create a pull request.
-
-# License
-The whole source code is published under the [MIT license](http://choosealicense.com/licenses/mit/).
-Consider the different licenses of the used third party libraries too!
-
-# Contribution
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, shall be licensed as above, without any
-additional terms or conditions.
diff --git a/doc/SPRITESHEET.md b/doc/SPRITESHEET.md
index 3e27958c..b7c7dd8f 100644
--- a/doc/SPRITESHEET.md
+++ b/doc/SPRITESHEET.md
@@ -5,12 +5,12 @@
 
 # Sprite Sheet <!-- omit in toc -->
 
-- [Purpose](#purpose)
-- [Tools And Scripts](#tools-and-scripts)
-- [Limitations](#limitations)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Purpose](#purpose)
+* [Tools And Scripts](#tools-and-scripts)
+* [Limitations](#limitations)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Purpose
 Use a sprite sheet for 2d animations.
diff --git a/doc/WEBSOCKET.md b/doc/WEBSOCKET.md
index 61633ae6..27079ae9 100644
--- a/doc/WEBSOCKET.md
+++ b/doc/WEBSOCKET.md
@@ -5,29 +5,29 @@
 
 # Websocket API <!-- omit in toc -->
 
-- [Get display pixel colors](#get-display-pixel-colors)
-- [Get slots information](#get-slots-information)
-- [Reset](#reset)
-- [Brightness](#brightness)
-  - [Get brightness information](#get-brightness-information)
-  - [Set brightness](#set-brightness)
-  - [Set brightness and enable/enable automatic brightness adjustment](#set-brightness-and-enableenable-automatic-brightness-adjustment)
-  - [Response](#response)
-  - [Get plugins information](#get-plugins-information)
-- [Install a plugin](#install-a-plugin)
-- [Uninstall a plugin](#uninstall-a-plugin)
-- [Move a plugin](#move-a-plugin)
-- [Enable/Disable logging](#enabledisable-logging)
-  - [Is logging enabled?](#is-logging-enabled)
-  - [Enable/Disable logging to websocket](#enabledisable-logging-to-websocket)
-- [Enable/Disable iperf](#enabledisable-iperf)
-  - [Is iperf enabled?](#is-iperf-enabled)
-  - [Start/Stop iperf server](#startstop-iperf-server)
-- [Trigger virtual user button](#trigger-virtual-user-button)
-- [Switch to next fade effect](#switch-to-next-fade-effect)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Get display pixel colors](#get-display-pixel-colors)
+* [Get slots information](#get-slots-information)
+* [Reset](#reset)
+* [Brightness](#brightness)
+  * [Get brightness information](#get-brightness-information)
+  * [Set brightness](#set-brightness)
+  * [Set brightness and enable/enable automatic brightness adjustment](#set-brightness-and-enableenable-automatic-brightness-adjustment)
+  * [Response](#response)
+  * [Get plugins information](#get-plugins-information)
+* [Install a plugin](#install-a-plugin)
+* [Uninstall a plugin](#uninstall-a-plugin)
+* [Move a plugin](#move-a-plugin)
+* [Enable/Disable logging](#enabledisable-logging)
+  * [Is logging enabled?](#is-logging-enabled)
+  * [Enable/Disable logging to websocket](#enabledisable-logging-to-websocket)
+* [Enable/Disable iperf](#enabledisable-iperf)
+  * [Is iperf enabled?](#is-iperf-enabled)
+  * [Start/Stop iperf server](#startstop-iperf-server)
+* [Trigger virtual user button](#trigger-virtual-user-button)
+* [Switch to next fade effect](#switch-to-next-fade-effect)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Get display pixel colors
 Command: ```GETDISP```
diff --git a/doc/architecture/README.md b/doc/architecture/README.md
index 87b6fc08..aa05cb8e 100644
--- a/doc/architecture/README.md
+++ b/doc/architecture/README.md
@@ -5,32 +5,32 @@
 
 # SW Architecture  <!-- omit in toc -->
 
-- [Purpose](#purpose)
-- [Scope](#scope)
-- [Context](#context)
-- [Deployment](#deployment)
-- [Layers](#layers)
-  - [Application](#application)
-  - [Services](#services)
-  - [Hardware Abstraction Layer (HAL)](#hardware-abstraction-layer-hal)
-- [System Startup](#system-startup)
-  - [High Level](#high-level)
-- [System States](#system-states)
-- [Details](#details)
-  - [Hardware Abstraction Layer (HAL)](#hardware-abstraction-layer-hal-1)
-  - [Graphic Base Functionality](#graphic-base-functionality)
-  - [Widgets](#widgets)
-  - [User Button Handling](#user-button-handling)
-  - [Audio Service](#audio-service)
-  - [Topic Handler Service](#topic-handler-service)
-  - [Plugin Handling](#plugin-handling)
-    - [Static View](#static-view)
-    - [Dynamic View](#dynamic-view)
-  - [Spectrum Analyzer](#spectrum-analyzer)
-  - [Slot Handling](#slot-handling)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Purpose](#purpose)
+* [Scope](#scope)
+* [Context](#context)
+* [Deployment](#deployment)
+* [Layers](#layers)
+  * [Application](#application)
+  * [Services](#services)
+  * [Hardware Abstraction Layer (HAL)](#hardware-abstraction-layer-hal)
+* [System Startup](#system-startup)
+  * [High Level](#high-level)
+* [System States](#system-states)
+* [Details](#details)
+  * [Hardware Abstraction Layer (HAL)](#hardware-abstraction-layer-hal-1)
+  * [Graphic Base Functionality](#graphic-base-functionality)
+  * [Widgets](#widgets)
+  * [User Button Handling](#user-button-handling)
+  * [Audio Service](#audio-service)
+  * [Topic Handler Service](#topic-handler-service)
+  * [Plugin Handling](#plugin-handling)
+    * [Static View](#static-view)
+    * [Dynamic View](#dynamic-view)
+  * [Spectrum Analyzer](#spectrum-analyzer)
+  * [Slot Handling](#slot-handling)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Purpose
 The SW architecture provides an overview regarding the relationships of different classes and components. It serves for understanding, maintaining, fixing and extending the software.
diff --git a/doc/architecture/uml/system_state_machine.wsd b/doc/architecture/uml/system_state_machine.wsd
index 2187da21..ba04fb1b 100644
--- a/doc/architecture/uml/system_state_machine.wsd
+++ b/doc/architecture/uml/system_state_machine.wsd
@@ -29,34 +29,23 @@ ErrorState: /do: Wait for manual reset.
 RestartState: /entry: Unmount filesystem
 RestartState: /do: Restart
 
-OffState: /entry: Set user button as wakeup source
-OffState: /do: Clear display
-OffState: /do: Enter sleep mode
-
 [*] --> InitState: Power up
 InitState --> APState: [Button pressed]\nSet wifi access point mode
 InitState -> ConnectingState: [Button released]\nSet wifi station mode
 
 APState --> ErrorState: [Failed to start\nwifi access point]
 APState --> RestartState: [Update received]
-APState --> OffState: [Switch off requested]
 
 ConnectingState --> IdleState: [Remote wifi SSID or\npassword missing]
 ConnectingState --> ConnectedState: [Connection successful established]
-ConnectingState --> OffState: [Switch off requested]
 
 ConnectedState --> ConnectingState: [Connection lost]
 ConnectedState --> RestartState: [Update finished]
-ConnectedState --> OffState: [Switch off requested]
 
 ErrorState --> [*]: [Restart]
-ErrorState --> OffState: [Switch off requested]
 
 IdleState --> [*]: [Restart]
-IdleState --> OffState: [Switch off requested]
 
 RestartState --> [*]: [Restart]
 
-OffState --> RestartState: [Wakeup]
-
 @enduml
\ No newline at end of file
diff --git a/doc/architecture/uml/topic_handler_service.wsd b/doc/architecture/uml/topic_handler_service.wsd
index f65e22ed..10789523 100644
--- a/doc/architecture/uml/topic_handler_service.wsd
+++ b/doc/architecture/uml/topic_handler_service.wsd
@@ -18,7 +18,7 @@ end note
 -> pluginMgr
 
 loop for every plugin
-    pluginMgr -> topicHandlerService: register plugin topics
+    pluginMgr -> topicHandlerService: register plugin topics with <DEVICE-ID>
 
         topicHandlerService -> plugin: get topics
         topicHandlerService <-- plugin: topics
@@ -30,29 +30,45 @@ loop for every plugin
 
             loop for every topic handler
 
-                topicHandlerService -> restApiTopicHandler: register plugin topic (plugin, topic, accessiblity, extra parameters)
+                note over topicHandlerService
+                    <ENTITY-ID> by plugin UID = "display/uid/<PLUGIN-UID>"
+                end note
+
+                topicHandlerService -> restApiTopicHandler: register topic (device id, entity id, topic, accessiblity, extra parameters)
 
                     note over restApiTopicHandler,httpServer
-                        URL: <BASE-URI>/display/uid/<PLUGIN-UID>/<TOPIC>
+                        URL: <BASE-URI>/<ENTITY-ID>/<TOPIC>
                     end note
 
-                    restApiTopicHandler -> httpServer: register REST URL by plugin UID
+                    restApiTopicHandler -> httpServer: register REST URL
                     restApiTopicHandler <-- httpServer
 
-                    alt If plugin alias available
+                topicHandlerService <-- restApiTopicHandler
+
+                alt If plugin alias available
+
+                    note over topicHandlerService
+                        <ENTITY-ID> by plugin alias = "display/alias/<PLUGIN-ALIAS>"
+                    end note
+
+                    topicHandlerService -> restApiTopicHandler: register topic (device id, entity id, topic, accessiblity, extra parameters)
 
                         note over restApiTopicHandler,httpServer
-                            URL: <BASE-URI>/display/alias/<PLUGIN-ALIAS>/<TOPIC>
+                            URL: <BASE-URI>/<ENTITY-ID>/<TOPIC>
                         end note
 
-                        restApiTopicHandler -> httpServer: register REST URL by plugin alias
+                        restApiTopicHandler -> httpServer: register REST URL
                         restApiTopicHandler <-- httpServer
 
-                    end alt
+                    topicHandlerService <-- restApiTopicHandler
 
-                topicHandlerService <-- restApiTopicHandler
+                end alt
+
+                note over topicHandlerService
+                    <ENTITY-ID> by plugin UID = "display/uid/<PLUGIN-UID>"
+                end note
 
-                topicHandlerService -> mqttApiTopicHandler: register plugin topic (plugin, topic, accessiblity, extra parameters)
+                topicHandlerService -> mqttApiTopicHandler: register topic (device id, entity id, topic, accessiblity, extra parameters)
 
                     note over mqttApiTopicHandler
                         Readable topics will be published during processing:
@@ -64,8 +80,8 @@ loop for every plugin
                     alt If topic is readable
 
                         note over mqttApiTopicHandler,mqttClient
-                            path: <HOSTNAME>/display/uid/<PLUGIN-UID>/<TOPIC>/state
-                            path: <HOSTNAME>/display/alias/<PLUGIN-ALIAS>/<TOPIC>/state
+                            path: <DEVICE-ID>/<ENTITY-ID>/<TOPIC>/state
+                            path: <DEVICE-ID>/<ENTITY-ID>/<TOPIC>/state
                         end note
 
                         mqttApiTopicHandler -> mqttApiTopicHandler: Store plugin topic in publisher queue
@@ -76,7 +92,7 @@ loop for every plugin
                     alt If topic is writeable
 
                         note over mqttApiTopicHandler,mqttClient
-                            path: <HOSTNAME>/display/uid/<PLUGIN-UID>/<TOPIC>/set
+                            path: <DEVICE-ID>/<ENTITY-ID>/<TOPIC>/set
                         end note
 
                         mqttApiTopicHandler -> mqttClient: Subscribe plugin topic path by plugin UID
@@ -85,7 +101,7 @@ loop for every plugin
                         alt If plugin alias available
 
                             note over mqttApiTopicHandler,mqttClient
-                                path: <HOSTNAME>/display/alias/<PLUGIN-ALIAS>/<TOPIC>/set
+                                path: <DEVICE-ID>/<ENTITY-ID>/<TOPIC>/set
                             end note
 
                             mqttApiTopicHandler -> mqttClient: Subscribe plugin topic path by plugin alias
@@ -97,6 +113,17 @@ loop for every plugin
 
                 topicHandlerService <-- mqttApiTopicHandler
 
+                alt If plugin alias available
+
+                    note over topicHandlerService
+                        <ENTITY-ID> by plugin alias = "display/alias/<PLUGIN-ALIAS>"
+                    end note
+
+                    topicHandlerService -> mqttApiTopicHandler: ...
+                    topicHandlerService <-- mqttApiTopicHandler
+
+                end alt
+
             end loop
 
         end loop
diff --git a/doc/architecture/uml/topic_handling_mindmap.wsd b/doc/architecture/uml/topic_handling_mindmap.wsd
index c51e4c9a..d8b19b7c 100644
--- a/doc/architecture/uml/topic_handling_mindmap.wsd
+++ b/doc/architecture/uml/topic_handling_mindmap.wsd
@@ -1,6 +1,7 @@
 @startmindmap
 
 +[#lightgreen] Topic
+
 ++ Access
 
 +++ REST API
@@ -8,12 +9,16 @@
 ++++ Base URI: http://<HOSTNAME>/rest/api/v1
 
 ++++ GET
-+++++ URL: <BASE-URI>/display/uid/<PLUGIN-UID>/<PLUGIN-TOPIC>
-+++++ URL: <BASE-URI>/display/alias/<PLUGIN-ALIAS>/<PLUGIN-TOPIC>
++++++ URL: <BASE-URI>/<ENTITY-ID>/<TOPIC>
+++++++ Examples
++++++++ <BASE-URI>/display/uid/1234/text
++++++++ <BASE-URI>/display/alias/myPlugin/text
 
 ++++ POST
-+++++ URL: <BASE-URI>/display/uid/<PLUGIN-UID>/<PLUGIN-TOPIC>
-+++++ URL: <BASE-URI>/display/alias/<PLUGIN-ALIAS>/<PLUGIN-TOPIC>
++++++ URL: <BASE-URI>/<ENTITY-ID>/<TOPIC>
+++++++ Examples
++++++++ <BASE-URI>/display/uid/1234/text
++++++++ <BASE-URI>/display/alias/myPlugin/text
 
 +++++ Parameters via HTTP arguments
 ******: key=value __converts to__
@@ -73,13 +78,15 @@
 +++ MQTT API
 
 ++++ Homeassistant auto discovery
-+++++ Topic with plugin UID: <HOMEASSISTANT-DISCOVERY-PREFIX>/<HOMEASSISTANT-COMPONENT>/<HOSTNAME>/<PLUGIN-UID>/config
++++++ General path
+++++++ <HOMEASSISTANT-DISCOVERY-PREFIX>/<HOMEASSISTANT-COMPONENT>/<DEVICE-ID>/<ENTITY-ID>/config
++++++ Topic with plugin UID: <HOMEASSISTANT-DISCOVERY-PREFIX>/<HOMEASSISTANT-COMPONENT>/<HOSTNAME>/display/uid/<PLUGIN-UID>/config
 *****:
 <code>
 {
   "name": "MQTT text",
-  "object_id": "19583",
-  "unique_id": "pixelix-facfc834/19583",
+  "object_id": "display/uid/19583",
+  "unique_id": "pixelix-facfc834/display/uid/19583",
   "device": {
     "identifiers": "F4:12:FA:CF:C8:34",
     "configuration_url": "http://192.168.2.62",
@@ -88,19 +95,19 @@
     "manufacturer": "BlueAndi & Friends",
     "sw_version": "v7.0.0"
   },
-  "state_topic": "pixelix-facfc834/uid/19583/text/state",
+  "state_topic": "pixelix-facfc834/display/uid/19583/text/state",
   "value_template": "{{ value_json.text }}",
-  "command_topic": "pixelix-facfc834/uid/19583/text/set",
+  "command_topic": "pixelix-facfc834/display/uid/19583/text/set",
   "command_template": "{\"text\": \"{{ value }}\" }"
 }
 </code>;
-+++++ Topic with plugin alias: <HOMEASSISTANT-DISCOVERY-PREFIX>/<HOMEASSISTANT-COMPONENT>/<HOSTNAME>/<PLUGIN-ALIAS>/config
++++++ Topic with plugin alias: <HOMEASSISTANT-DISCOVERY-PREFIX>/<HOMEASSISTANT-COMPONENT>/<HOSTNAME>/display/alias/<PLUGIN-ALIAS>/config
 *****:
 <code>
 {
   "name": "MQTT text",
-  "object_id": "display",
-  "unique_id": "pixelix-facfc834/display",
+  "object_id": "display/alias/myPlugin",
+  "unique_id": "pixelix-facfc834/display/alias/myPlugin",
   "device": {
     "identifiers": "F4:12:FA:CF:C8:34",
     "configuration_url": "http://192.168.2.62",
@@ -109,9 +116,9 @@
     "manufacturer": "BlueAndi & Friends",
     "sw_version": "v7.0.0"
   },
-  "state_topic": "pixelix-facfc834/alias/display/text/state",
+  "state_topic": "pixelix-facfc834/display/alias/myPlugin/text/state",
   "value_template": "{{ value_json.text }}",
-  "command_topic": "pixelix-facfc834/alias/display/text/set",
+  "command_topic": "pixelix-facfc834/display/alias/myPlugin/text/set",
   "command_template": "{\"text\": \"{{ value }}\" }"
 }
 </code>;
@@ -127,25 +134,34 @@
 ++++++ https://www.home-assistant.io/integrations/sensor.mqtt/
 
 ++++ Status
-+++++ MQTT topic: <HOSTNAME>/uid/<PLUGIN-UID>/<PLUGIN-TOPIC>/state
-+++++ MQTT topic: <HOSTNAME>/alias/<PLUGIN-ALIAS>/<PLUGIN-TOPIC>/state
++++++ MQTT topic by plugin UID: <HOSTNAME>/display/uid/<PLUGIN-UID>/<PLUGIN-TOPIC>/state
++++++ MQTT topic by plugin alias: <HOSTNAME>/display/alias/<PLUGIN-ALIAS>/<PLUGIN-TOPIC>/state
++++++ MQTT topic by sensor: <HOSTNAME>/sensors/<SENSOR-CHANNEL-ID>/<TOPIC>/state
 +++++ Direction: Pixelix --> Client(s)
 ++++ Command
-+++++ MQTT topic: <HOSTNAME>/uid/<PLUGIN-UID>/<PLUGIN-TOPIC>/set
-+++++ MQTT topic: <HOSTNAME>/alias/<PLUGIN-ALIAS>/<PLUGIN-TOPIC>/set
++++++ MQTT topic: <HOSTNAME>/display/uid/<PLUGIN-UID>/<PLUGIN-TOPIC>/set
++++++ MQTT topic: <HOSTNAME>/display/alias/<PLUGIN-ALIAS>/<PLUGIN-TOPIC>/set
 +++++ Direction: Client(s) --> Pixelix
 ++++ Availability
-+++++ MQTT topic: <HOSTNAME>/uid/<PLUGIN-UID>/<PLUGIN-TOPIC>/available
-+++++ MQTT topic: <HOSTNAME>/alias/<PLUGIN-ALIAS>/<PLUGIN-TOPIC>/available
++++++ MQTT topic: <HOSTNAME>/display/uid/<PLUGIN-UID>/<PLUGIN-TOPIC>/available
++++++ MQTT topic: <HOSTNAME>/display/alias/<PLUGIN-ALIAS>/<PLUGIN-TOPIC>/available
 +++++ Direction: Pixelix --> Client(s)
 +++++ "online"/"offline"
 +++++ Skipped for the moment. May be supported in future.
 
 -- A plugin deals only with topics\nand doesn't know about REST or MQTT.
--- Device identification
+-- Device identification\n(DEVICE-ID)
 --- Unique hostname (HOSTNAME)
+-- Entity identification\n(ENTITY-ID)
+--- Plugins
+---- display/uid/<PLUGIN-UID>
+---- display/alias/<PLUGIN-ALIAS>
+--- Sensors
+---- sensors/<SENSOR-CHANNEL-ID>
 -- Plugin identification
 --- Unique plugin ID (PLUGIN-UID) assigned at instance creation
 --- Unique plugin alias (PLUGIN-ALIAS) assigned by user
+-- Sensor/Channel identification
+--- The provided sensor/channel information is part of a array.\nThe array index is the <SENSOR-CHANNEL-ID>.
 
 @endmindmap
diff --git a/doc/config/README.md b/doc/config/README.md
index cb06a32a..76430f35 100644
--- a/doc/config/README.md
+++ b/doc/config/README.md
@@ -5,17 +5,17 @@
 
 # SW Configuration Management  <!-- omit in toc -->
 
-- [Purpose](#purpose)
-- [Scope](#scope)
-- [PlatformIO](#platformio)
-  - [Logical Configuration Hierarchy And Dependencies](#logical-configuration-hierarchy-and-dependencies)
-- [Version Numbers](#version-numbers)
-- [Development Strategy](#development-strategy)
-- [Work Instructions](#work-instructions)
-  - [How to release?](#how-to-release)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Purpose](#purpose)
+* [Scope](#scope)
+* [PlatformIO](#platformio)
+  * [Logical Configuration Hierarchy And Dependencies](#logical-configuration-hierarchy-and-dependencies)
+* [Version Numbers](#version-numbers)
+* [Development Strategy](#development-strategy)
+* [Work Instructions](#work-instructions)
+  * [How to release?](#how-to-release)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Purpose
 The SW configuration management document provides a general overview about what is configured and how it is done.
diff --git a/doc/config/SW-BUILD.md b/doc/config/SW-BUILD.md
index 046f3d30..dad2fa78 100644
--- a/doc/config/SW-BUILD.md
+++ b/doc/config/SW-BUILD.md
@@ -5,12 +5,12 @@
 
 # Build The Software <!-- omit in toc -->
 
-- [Retrieve The Project](#retrieve-the-project)
-- [Build Project](#build-project)
-- [Next Step](#next-step)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Retrieve The Project](#retrieve-the-project)
+* [Build Project](#build-project)
+* [Next Step](#next-step)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Retrieve The Project
 
diff --git a/doc/config/SW-UPDATE.md b/doc/config/SW-UPDATE.md
index f8aacd27..415fda10 100644
--- a/doc/config/SW-UPDATE.md
+++ b/doc/config/SW-UPDATE.md
@@ -5,23 +5,23 @@
 
 # Update The Software <!-- omit in toc -->
 
-- [Purpose](#purpose)
-- [Recommendations](#recommendations)
-  - [Non-Developer](#non-developer)
-  - [Developer](#developer)
-- [Update possibilities](#update-possibilities)
-  - [Use Espressif Flash Download Tool (Windows only)](#use-espressif-flash-download-tool-windows-only)
-  - [Use esptool](#use-esptool)
-    - [Debian Linux](#debian-linux)
-    - [Windows](#windows)
-    - [Common after python and esptool are installed](#common-after-python-and-esptool-are-installed)
-  - [Use VSCode and Platformio](#use-vscode-and-platformio)
-- [Update via USB](#update-via-usb)
-- [Use the browser](#use-the-browser)
-- [Flash Layout Information](#flash-layout-information)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Purpose](#purpose)
+* [Recommendations](#recommendations)
+  * [Non-Developer](#non-developer)
+  * [Developer](#developer)
+* [Update possibilities](#update-possibilities)
+  * [Use Espressif Flash Download Tool (Windows only)](#use-espressif-flash-download-tool-windows-only)
+  * [Use esptool](#use-esptool)
+    * [Debian Linux](#debian-linux)
+    * [Windows](#windows)
+    * [Common after python and esptool are installed](#common-after-python-and-esptool-are-installed)
+  * [Use VSCode and Platformio](#use-vscode-and-platformio)
+* [Update via USB](#update-via-usb)
+* [Use the browser](#use-the-browser)
+* [Flash Layout Information](#flash-layout-information)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Purpose
 The software can be uploaded/updated to the development board in 4 different ways. Not all of them can be used in any case. Take a look to the recommendations which variant might be the best for you.
@@ -115,6 +115,8 @@ Example:
 
 ![VSCodeUpdate](../images/VSCodeUpdate.png)
 
+Note: Sometimes it happens that the _Platform_ sub-menu in the PlatformIO Project Tasks is missing. In this case restart VSCode and it should appear.
+
 # Use the browser
 Preconditions:
 * PIXELIX runs already on the target.
diff --git a/doc/config/TOOLCHAIN-INSTALLATION.md b/doc/config/TOOLCHAIN-INSTALLATION.md
index 5d8b1ed3..64c494df 100644
--- a/doc/config/TOOLCHAIN-INSTALLATION.md
+++ b/doc/config/TOOLCHAIN-INSTALLATION.md
@@ -5,18 +5,18 @@
 
 # Toolchain Installation <!-- omit in toc -->
 
-- [Purpose](#purpose)
-- [Installation Of VSCode](#installation-of-vscode)
-- [Installation Of git](#installation-of-git)
-  - [Linux (Debian, Ubuntu)](#linux-debian-ubuntu)
-  - [Windows](#windows)
-- [Installation Of Test Environment](#installation-of-test-environment)
-  - [Linux (Debian, Ubuntu)](#linux-debian-ubuntu-1)
-  - [Windows](#windows-1)
-- [Next Step](#next-step)
-- [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
-- [License](#license)
-- [Contribution](#contribution)
+* [Purpose](#purpose)
+* [Installation Of VSCode](#installation-of-vscode)
+* [Installation Of git](#installation-of-git)
+  * [Linux (Debian, Ubuntu)](#linux-debian-ubuntu)
+  * [Windows](#windows)
+* [Installation Of Test Environment](#installation-of-test-environment)
+  * [Linux (Debian, Ubuntu)](#linux-debian-ubuntu-1)
+  * [Windows](#windows-1)
+* [Next Step](#next-step)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
 
 # Purpose
 
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 154edbc9..77e89fbe 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.3
+# Doxyfile 1.9.5
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -12,6 +12,16 @@
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -38,7 +48,7 @@ PROJECT_NAME           = Pixelix
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v7.1.1
+PROJECT_NUMBER         = v7.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -60,16 +70,28 @@ PROJECT_LOGO           =
 
 OUTPUT_DIRECTORY       = .
 
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
 # The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# numer of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
 # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
@@ -81,14 +103,14 @@ ALLOW_UNICODE_NAMES    = NO
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
@@ -452,7 +474,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
-# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
 # during processing. When set to 0 doxygen will based this on the number of
 # cores available in the system. You can set it explicitly to a value larger
 # than 0 to get more control over the balance between CPU load and processing
@@ -577,14 +599,15 @@ INTERNAL_DOCS          = NO
 # filesystem is case sensitive (i.e. it supports files in the same directory
 # whose names only differ in casing), the option must be set to YES to properly
 # deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be be set to NO to properly deal with
+# are not case sensitive the option should be set to NO to properly deal with
 # output files written for symbols that only differ in casing, such as for two
 # classes, one named CLASS and the other named Class, and to also support
 # references to files without having to specify the exact matching casing. On
 # Windows (including Cygwin) and MacOS, users should typically set this option
 # to NO, whereas on Linux or other Unix flavors it should typically be set to
 # YES.
-# The default value is: system dependent.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
 
 CASE_SENSE_NAMES       = NO
 
@@ -851,10 +874,21 @@ WARN_AS_ERROR          = NO
 # and the warning text. Optionally the format may contain $version, which will
 # be replaced by the version of the file (if it could be obtained via
 # FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
 # error (stderr). In case the file specified cannot be opened for writing the
@@ -895,10 +929,21 @@ INPUT                  = . \
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
 # documentation (see:
 # https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
 # *.h) to filter out the source-files in the directories.
@@ -1045,6 +1090,11 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 #
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
@@ -1086,6 +1136,15 @@ FILTER_SOURCE_PATTERNS =
 
 USE_MDFILE_AS_MAINPAGE =
 
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -1320,6 +1379,23 @@ HTML_EXTRA_STYLESHEET  =
 
 HTML_EXTRA_FILES       =
 
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme. Default setting AUTO_LIGHT
+# enables light output unless the user preference is dark output. Other options
+# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to
+# default to dark mode unless the user prefers light mode, and TOGGLE to let the
+# user toggle between dark and light mode via a button.
+# Possible values are: LIGHT Always generate light output., DARK Always generate
+# dark output., AUTO_LIGHT Automatically set the mode according to the user
+# preference, use light mode if no preference is set (the default)., AUTO_DARK
+# Automatically set the mode according to the user preference, use dark mode if
+# no preference is set. and TOGGLE Allow to user to switch between light and
+# dark mode via a button..
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a color-wheel, see
@@ -1683,17 +1759,6 @@ HTML_FORMULA_FORMAT    = png
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
 # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
 # to create new LaTeX commands to be used in formulas as building blocks. See
 # the section "Including formulas" for details.
@@ -2284,7 +2349,8 @@ SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
-# preprocessor.
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
@@ -2408,26 +2474,38 @@ HAVE_DOT               = YES
 
 DOT_NUM_THREADS        = 0
 
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = Helvetica
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
 
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTSIZE           = 10
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
 
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
@@ -2453,7 +2531,8 @@ CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
+# groups, showing the direct groups dependencies. See also the chapter Grouping
+# in the manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2669,18 +2748,6 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
diff --git a/doc/grabConfigs/README.md b/doc/grabConfigs/README.md
new file mode 100644
index 00000000..0ed1d05e
--- /dev/null
+++ b/doc/grabConfigs/README.md
@@ -0,0 +1,34 @@
+# PIXELIX <!-- omit in toc -->
+![PIXELIX](../images/LogoBlack.png)
+
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://choosealicense.com/licenses/mit/)
+
+# Configurations for the GrabViaMqttPlugin and GrabViaRestPlugin <!-- omit in toc -->
+
+* [General](#general)
+* [GrabViaMqttPlugin examples](#grabviamqttplugin-examples)
+* [GrabViaRestPlugin examples](#grabviarestplugin-examples)
+* [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
+* [License](#license)
+* [Contribution](#contribution)
+
+# General
+Please share your configuration for others by pull request or you can open an issue with your example. It will be added here to the list.
+
+# GrabViaMqttPlugin examples
+* [Grodans Paradis AB outdoor temperature](./mqtt/grodansparadisOutdoorTemperature.json) on Ake's house south side.
+
+# GrabViaRestPlugin examples
+* [Github repository stargazers](./rest/githubStargazers.json)
+* [Shelly Plug S - power consumption](./rest/shellyPlugSPower.json)
+
+# Issues, Ideas And Bugs
+If you have further ideas or you found some bugs, great! Create a [issue](https://github.com/BlueAndi/esp-rgb-led-matrix/issues) or if you are able and willing to fix it by yourself, clone the repository and create a pull request.
+
+# License
+The whole source code is published under the [MIT license](http://choosealicense.com/licenses/mit/).
+Consider the different licenses of the used third party libraries too!
+
+# Contribution
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, shall be licensed as above, without any
+additional terms or conditions.
diff --git a/doc/grabConfigs/mqtt/grodansparadisOutdoorTemperature.json b/doc/grabConfigs/mqtt/grodansparadisOutdoorTemperature.json
new file mode 100644
index 00000000..a06ff2d3
--- /dev/null
+++ b/doc/grabConfigs/mqtt/grodansparadisOutdoorTemperature.json
@@ -0,0 +1,12 @@
+{
+  "path": "vscp/FF:FF:FF:FF:FF:FF:FF:FF:61:00:08:01:92:AF:A8:10/10/6/16/0",
+  "filter": {
+    "measurement": {
+      "value": true
+    }
+  },
+  "iconPath": "/configuration/bumblebee.bmp",
+  "format": "\\calign%0.1f\\x8EC",
+  "multiplier": 1,
+  "offset": 0
+}
\ No newline at end of file
diff --git a/doc/grabConfigs/rest/bitcoin.json b/doc/grabConfigs/rest/bitcoin.json
new file mode 100644
index 00000000..5cdc5556
--- /dev/null
+++ b/doc/grabConfigs/rest/bitcoin.json
@@ -0,0 +1,15 @@
+{
+    "method": "GET",
+    "url": "http://api.coindesk.com/v1/bpi/currentprice/USD.json",
+    "filter": {
+      "bpi": {
+        "USD": {
+          "rate_float": true
+        }
+      }
+    },
+    "iconPath": "",
+    "format": "%0.2f $/BTC",
+    "multiplier": 1,
+    "offset": 0
+}
\ No newline at end of file
diff --git a/doc/grabConfigs/rest/githubStargazers.json b/doc/grabConfigs/rest/githubStargazers.json
new file mode 100644
index 00000000..e7090df8
--- /dev/null
+++ b/doc/grabConfigs/rest/githubStargazers.json
@@ -0,0 +1,11 @@
+{
+    "method": "GET",
+    "url": "https://api.github.com/repos/BlueAndi/esp-rgb-led-matrix",
+    "filter": {
+      "stargazers_count": true
+    },
+    "iconPath": "/configuration/github.bmp",
+    "format": "\\calign%.0f",
+    "multiplier": 1,
+    "offset": 0
+  }
\ No newline at end of file
diff --git a/doc/grabConfigs/rest/shellyPlugSPower.json b/doc/grabConfigs/rest/shellyPlugSPower.json
new file mode 100644
index 00000000..af3eae9e
--- /dev/null
+++ b/doc/grabConfigs/rest/shellyPlugSPower.json
@@ -0,0 +1,11 @@
+{
+    "method": "GET",
+    "url": "http://192.168.1.123/meter/0/",
+    "filter": {
+      "power": true
+    },
+    "iconPath": "/configuration/plug.bmp",
+    "format": "\\calign%0.1f W",
+    "multiplier": 1,
+    "offset": 0
+  }
\ No newline at end of file
diff --git a/doc/images/icons/bumblebee.bmp b/doc/images/icons/bumblebee.bmp
new file mode 100644
index 00000000..b04e2f10
Binary files /dev/null and b/doc/images/icons/bumblebee.bmp differ
diff --git a/doc/images/icons/github.bmp b/doc/images/icons/github.bmp
new file mode 100644
index 00000000..15e7077e
Binary files /dev/null and b/doc/images/icons/github.bmp differ
diff --git a/doc/images/icons/plug.bmp b/doc/images/icons/plug.bmp
new file mode 100644
index 00000000..9d40fbb4
Binary files /dev/null and b/doc/images/icons/plug.bmp differ
diff --git a/doc/images/icons/santa2.bmp b/doc/images/icons/santa2.bmp
new file mode 100644
index 00000000..58b3d749
Binary files /dev/null and b/doc/images/icons/santa2.bmp differ
diff --git a/doc/images/icons/santa2.xcf b/doc/images/icons/santa2.xcf
new file mode 100644
index 00000000..d9727f39
Binary files /dev/null and b/doc/images/icons/santa2.xcf differ
diff --git a/doc/images/icons/snowman.bmp b/doc/images/icons/snowman.bmp
new file mode 100644
index 00000000..f9155f81
Binary files /dev/null and b/doc/images/icons/snowman.bmp differ
diff --git a/doc/images/icons/snowman.xcf b/doc/images/icons/snowman.xcf
new file mode 100644
index 00000000..260730e2
Binary files /dev/null and b/doc/images/icons/snowman.xcf differ
diff --git a/doc/images/spritesheets/santa2/santa2.bmp b/doc/images/spritesheets/santa2/santa2.bmp
new file mode 100644
index 00000000..79ab6c51
Binary files /dev/null and b/doc/images/spritesheets/santa2/santa2.bmp differ
diff --git a/doc/images/spritesheets/santa2/santa2.sprite b/doc/images/spritesheets/santa2/santa2.sprite
new file mode 100644
index 00000000..75502284
--- /dev/null
+++ b/doc/images/spritesheets/santa2/santa2.sprite
@@ -0,0 +1,13 @@
+{
+    "texture": {
+        "width": 32,
+        "height": 8,
+        "frames": 8,
+        "frame": {
+            "width": 8,
+            "height": 8
+        },
+        "fps": 2,
+        "repeat": true
+    }
+}
\ No newline at end of file
diff --git a/doc/images/spritesheets/santa2/santa2.xcf b/doc/images/spritesheets/santa2/santa2.xcf
new file mode 100644
index 00000000..8f9ced79
Binary files /dev/null and b/doc/images/spritesheets/santa2/santa2.xcf differ
diff --git a/doc/images/spritesheets/snowman/snowman.bmp b/doc/images/spritesheets/snowman/snowman.bmp
new file mode 100644
index 00000000..bb628449
Binary files /dev/null and b/doc/images/spritesheets/snowman/snowman.bmp differ
diff --git a/doc/images/spritesheets/snowman/snowman.sprite b/doc/images/spritesheets/snowman/snowman.sprite
new file mode 100644
index 00000000..0cbdb625
--- /dev/null
+++ b/doc/images/spritesheets/snowman/snowman.sprite
@@ -0,0 +1,13 @@
+{
+    "texture": {
+        "width": 40,
+        "height": 8,
+        "frames": 8,
+        "frame": {
+            "width": 8,
+            "height": 8
+        },
+        "fps": 5,
+        "repeat": true
+    }
+}
\ No newline at end of file
diff --git a/scripts/PluginList.hpp b/include/PluginList.h
similarity index 83%
rename from scripts/PluginList.hpp
rename to include/PluginList.h
index 6b3078a0..069f550c 100644
--- a/scripts/PluginList.hpp
+++ b/include/PluginList.h
@@ -43,9 +43,11 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
-#include "PluginMgr.h"
+#include "IPluginMaintenance.hpp"
 
-$INCLUDES
+/** List with all compiled-in plugins. */
+namespace PluginList
+{
 
 /******************************************************************************
  * Macros
@@ -55,25 +57,28 @@
  * Types and Classes
  *****************************************************************************/
 
+/**
+ * Plugin list element.
+ */
+typedef struct
+{
+    const char*                     name;       /**< Name of plugin type. */
+    IPluginMaintenance::CreateFunc  createFunc; /**< Plugin creation function */
+
+} Element;
+
 /******************************************************************************
  * Functions
  *****************************************************************************/
 
-/** List with all compiled-in plugins. */
-namespace PluginList
-{
-
 /**
- * Registers all plugins by the plugin manager.
+ * Get list of provided plugins and their creation function.
  * 
+ * @param[out] length   Length of list.
+ * 
+ * @return List of plugins.
  */
-static void registerAll()
-{
-    PluginMgr&  pluginMgr = PluginMgr::getInstance();
-
-$REGISTER
-
-}
+const Element* getList(uint8_t& length);
 
 };
 
diff --git a/lib/ArduinoNative/src/FS.h b/lib/ArduinoNative/src/FS.h
index 69bc4e1d..83d48874 100644
--- a/lib/ArduinoNative/src/FS.h
+++ b/lib/ArduinoNative/src/FS.h
@@ -123,7 +123,11 @@ class File
         return seek(pos, SeekSet);
     }
 
-    size_t position() const;
+    size_t position() const
+    {
+        return ftell(m_fd);
+    }
+
     size_t size() const;
 
     void close()
diff --git a/lib/AsyncHttpClient/src/AsyncHttpClient.cpp b/lib/AsyncHttpClient/src/AsyncHttpClient.cpp
index a6b6abb4..cd032009 100644
--- a/lib/AsyncHttpClient/src/AsyncHttpClient.cpp
+++ b/lib/AsyncHttpClient/src/AsyncHttpClient.cpp
@@ -58,6 +58,15 @@
  * Local Variables
  *****************************************************************************/
 
+/** Mutex buffer required for counting semaphore. */
+static StaticSemaphore_t    gxMutexBuffer;
+
+/**
+ * Counting semaphore to serialize all asynchronous HTTP client requests.
+ *  This is necessary, because a secure connection needs about 50k of heap.
+ */
+static SemaphoreHandle_t    ghMutex         = xSemaphoreCreateMutexStatic(&gxMutexBuffer);
+
 /******************************************************************************
  * Public Methods
  *****************************************************************************/
@@ -70,6 +79,7 @@ AsyncHttpClient::AsyncHttpClient() :
     m_cmdQueue(),
     m_evtQueue(),
     m_mutex(),
+    m_hasGlobalMutex(false),
     m_isConnected(false),
     m_isReqOpen(false),
     m_onRspCallback(nullptr),
@@ -150,10 +160,12 @@ AsyncHttpClient::AsyncHttpClient() :
 
                             memset(&evt, 0, sizeof(evt));
                             evt.id          = EVENT_ID_DATA;
-                            evt.u.data.data = new uint8_t[len];
+                            evt.u.data.data = new(std::nothrow) uint8_t[len];
 
                             if (nullptr == evt.u.data.data)
                             {
+                                LOG_ERROR("Couldn't allocate %u memory.", len);
+
                                 evt.u.data.size = 0U;
                             }
                             else
@@ -189,9 +201,10 @@ AsyncHttpClient::~AsyncHttpClient()
     m_tcpClient.onError(nullptr);
     m_tcpClient.onData(nullptr);
     m_tcpClient.onTimeout(nullptr);
+    end();
+
+    /* Destroy at the end. */
     m_mutex.destroy();
-    clearEvtQueue();
-    clearCmdQueue();
     m_evtQueue.destroy();
     m_cmdQueue.destroy();
 }
@@ -355,6 +368,7 @@ void AsyncHttpClient::end()
     clearCmdQueue();
     clearEvtQueue();
     clear();
+    giveGlobalMutex();
 }
 
 bool AsyncHttpClient::isConnected()
@@ -362,7 +376,7 @@ bool AsyncHttpClient::isConnected()
     MutexGuard<Mutex>   guard(m_mutex);
     bool                isConnected = m_isConnected;
 
-    return m_isConnected;
+    return isConnected;
 }
 
 void AsyncHttpClient::setHttpVersion(bool useHttp10)
@@ -562,7 +576,7 @@ void AsyncHttpClient::clearEvtQueue()
 
 void AsyncHttpClient::processTask(void* parameters)
 {
-    AsyncHttpClient* tthis = reinterpret_cast<AsyncHttpClient*>(parameters);
+    AsyncHttpClient* tthis = static_cast<AsyncHttpClient*>(parameters);
 
     if ((nullptr != tthis) &&
         (nullptr != tthis->m_processTaskSemaphore))
@@ -588,23 +602,36 @@ void AsyncHttpClient::processTask(void* parameters)
 
 void AsyncHttpClient::processCmdQueue()
 {
-    Cmd cmd;
-
-    while(true == m_cmdQueue.receive(&cmd, 0U))
+    if (true == takeGlobalMutex())
     {
-        switch(cmd.id)
+        Cmd cmd;
+
+        if (true == m_cmdQueue.receive(&cmd, 0U))
         {
-        case CMD_ID_GET:
-            (void)getRequest();
-            break;
+            switch(cmd.id)
+            {
+            case CMD_ID_GET:
+                if (false == getRequest())
+                {
+                    giveGlobalMutex();
+                }
+                break;
 
-        case CMD_ID_POST:
-            (void)postRequest(cmd.u.data.data, cmd.u.data.size);
-            break;
+            case CMD_ID_POST:
+                if (false == postRequest(cmd.u.data.data, cmd.u.data.size))
+                {
+                    giveGlobalMutex();
+                }
+                break;
 
-        default:
-            break;
-        };
+            default:
+                break;
+            };
+        }
+        else
+        {
+            giveGlobalMutex();
+        }
     }
 }
 
@@ -653,7 +680,8 @@ void AsyncHttpClient::onConnect()
 {
     bool isReqOpen = false;
 
-    LOG_INFO("Connected.");
+    LOG_INFO("Connected to %s:%u%s.", m_hostname.c_str(), m_port, m_uri.c_str());
+    LOG_DEBUG("Available heap: %u", ESP.getFreeHeap());
 
     /* Protect against concurrent access. */
     {
@@ -676,7 +704,8 @@ void AsyncHttpClient::onConnect()
 
 void AsyncHttpClient::onDisconnect()
 {
-    LOG_INFO("Disconnected.");
+    LOG_INFO("Disconnected from %s:%u%s.", m_hostname.c_str(), m_port, m_uri.c_str());
+    LOG_DEBUG("Available heap: %u", ESP.getFreeHeap());
 
     /* Protect against concurrent access. */
     {
@@ -687,6 +716,8 @@ void AsyncHttpClient::onDisconnect()
 
     clear();
     notifyClosed();
+
+    giveGlobalMutex();
 }
 
 void AsyncHttpClient::onError(int8_t error)
@@ -716,7 +747,8 @@ void AsyncHttpClient::onError(int8_t error)
 void AsyncHttpClient::onData(const uint8_t* data, size_t len)
 {
     size_t      index       = 0U;
-    const char* asciiData   = reinterpret_cast<const char*>(data);
+    const void* vData       = data;
+    const char* asciiData   = static_cast<const char*>(vData);
     bool        isError     = false;
 
     /* RFC2616 - Response = Status-Line
@@ -727,8 +759,6 @@ void AsyncHttpClient::onData(const uint8_t* data, size_t len)
      *                [ message-body ]
      */
 
-    LOG_DEBUG("onData(): len = %u", len);
-
     while((len > index) && (false == isError))
     {
         switch(m_rspPart)
@@ -827,13 +857,14 @@ void AsyncHttpClient::onTimeout(uint32_t timeout)
 {
     UTIL_NOT_USED(timeout);
 
-    LOG_WARNING("Timeout.");
+    LOG_WARNING("Connection timeout of %s:%u%s.", m_hostname.c_str(), m_port, m_uri.c_str());
     m_tcpClient.close();
 }
 
 bool AsyncHttpClient::connect()
 {
-    LOG_INFO("Connecting to %s:%u ...", m_hostname.c_str(), m_port);
+    LOG_INFO("Connecting to %s:%u%s.", m_hostname.c_str(), m_port, m_uri.c_str());
+    LOG_DEBUG("Available heap: %u", ESP.getFreeHeap());
 
     return m_tcpClient.connect(m_hostname.c_str(), m_port, m_isSecure);
 }
@@ -842,7 +873,7 @@ void AsyncHttpClient::disconnect()
 {
     if (true == m_tcpClient.connected())
     {
-        LOG_INFO("Disconnecting ...");
+        LOG_INFO("Disconnecting from %s:%u%s.", m_hostname.c_str(), m_port, m_uri.c_str());
         m_tcpClient.close();
     }
 }
@@ -851,7 +882,7 @@ void AsyncHttpClient::abort()
 {
     if (true == m_tcpClient.connected())
     {
-        LOG_INFO("Aborting ...");
+        LOG_INFO("Aborting connection to %s:%u%s.", m_hostname.c_str(), m_port, m_uri.c_str());
         m_tcpClient.abort();
     }
 }
@@ -1313,7 +1344,8 @@ bool AsyncHttpClient::parseChunkedResponseTrailer(const char* data, size_t len,
 
 bool AsyncHttpClient::parseChunkedResponse(const uint8_t* data, size_t len, size_t& index)
 {
-    const char* asciiData   = reinterpret_cast<const char*>(data);
+    const void* vData       = data;
+    const char* asciiData   = static_cast<const char*>(vData);
     bool        isChunkEOF  = false;
 
     /*
@@ -1606,6 +1638,34 @@ const char* AsyncHttpClient::errorToStr(int8_t error)
     return errorDescription;
 }
 
+bool AsyncHttpClient::takeGlobalMutex()
+{
+    bool isTaken = false;
+
+    if (false == m_hasGlobalMutex)
+    {
+        const uint32_t MAX_WAIT_TIME = 100U; /* ms */
+
+        if (pdTRUE == xSemaphoreTake(ghMutex, MAX_WAIT_TIME * portTICK_PERIOD_MS))
+        {
+            m_hasGlobalMutex = true;
+
+            isTaken = true;
+        }
+    }
+    
+    return isTaken;
+}
+
+void AsyncHttpClient::giveGlobalMutex()
+{
+    if (true == m_hasGlobalMutex)
+    {
+        (void)xSemaphoreGive(ghMutex);
+        m_hasGlobalMutex = false;
+    }
+}
+
 /******************************************************************************
  * External Functions
  *****************************************************************************/
diff --git a/lib/AsyncHttpClient/src/AsyncHttpClient.h b/lib/AsyncHttpClient/src/AsyncHttpClient.h
index 49e7c321..e975f10a 100644
--- a/lib/AsyncHttpClient/src/AsyncHttpClient.h
+++ b/lib/AsyncHttpClient/src/AsyncHttpClient.h
@@ -350,6 +350,7 @@ class AsyncHttpClient
     Queue<Cmd>      m_cmdQueue;             /**< Command queue */
     Queue<Event>    m_evtQueue;             /**< Event queue */
     Mutex           m_mutex;                /**< Used to protect against concurrent access. */
+    bool            m_hasGlobalMutex;       /**< Has the task the global mutex? */
 
     /* Protected data */
     bool            m_isConnected;          /**< Is a connection established? */
@@ -635,6 +636,18 @@ class AsyncHttpClient
      * @return User friendly error information. May be nullptr in case of unknown error id.
      */
     const char* errorToStr(int8_t error);
+
+    /**
+     * Take global mutex to serialize all AsyncHttpClient's.
+     * 
+     * @return If taken, it will return true otherwise false. If already taken, it will return false.
+     */
+    bool takeGlobalMutex();
+
+    /**
+     * Give global mutex back for the next one.
+     */
+    void giveGlobalMutex();
 };
 
 /******************************************************************************
diff --git a/src/Web/HttpHeader.cpp b/lib/AsyncHttpClient/src/HttpHeader.cpp
similarity index 100%
rename from src/Web/HttpHeader.cpp
rename to lib/AsyncHttpClient/src/HttpHeader.cpp
diff --git a/src/Web/HttpHeader.h b/lib/AsyncHttpClient/src/HttpHeader.h
similarity index 100%
rename from src/Web/HttpHeader.h
rename to lib/AsyncHttpClient/src/HttpHeader.h
diff --git a/src/Web/HttpResponse.cpp b/lib/AsyncHttpClient/src/HttpResponse.cpp
similarity index 95%
rename from src/Web/HttpResponse.cpp
rename to lib/AsyncHttpClient/src/HttpResponse.cpp
index 0125a0ec..4e1925b2 100644
--- a/src/Web/HttpResponse.cpp
+++ b/lib/AsyncHttpClient/src/HttpResponse.cpp
@@ -69,10 +69,7 @@ HttpResponse& HttpResponse::operator=(const HttpResponse& rsp)
         m_statusCode    = rsp.m_statusCode;
         m_reasonPhrase  = rsp.m_reasonPhrase;
 
-        if (nullptr != m_payload)
-        {
-            delete[] m_payload;
-        }
+        clearPayload();
 
         if (nullptr != rsp.m_payload)
         {
@@ -91,6 +88,8 @@ HttpResponse& HttpResponse::operator=(const HttpResponse& rsp)
             }
         }
 
+        clearHeaders();
+
         if (true == it.first())
         {
             do
diff --git a/src/Web/HttpResponse.h b/lib/AsyncHttpClient/src/HttpResponse.h
similarity index 100%
rename from src/Web/HttpResponse.h
rename to lib/AsyncHttpClient/src/HttpResponse.h
diff --git a/src/Web/HttpStatus.cpp b/lib/AsyncHttpClient/src/HttpStatus.cpp
similarity index 100%
rename from src/Web/HttpStatus.cpp
rename to lib/AsyncHttpClient/src/HttpStatus.cpp
diff --git a/src/Web/HttpStatus.h b/lib/AsyncHttpClient/src/HttpStatus.h
similarity index 100%
rename from src/Web/HttpStatus.h
rename to lib/AsyncHttpClient/src/HttpStatus.h
diff --git a/lib/AudioService/src/AudioDrv.cpp b/lib/AudioService/src/AudioDrv.cpp
index c1db8bf6..0b83b315 100644
--- a/lib/AudioService/src/AudioDrv.cpp
+++ b/lib/AudioService/src/AudioDrv.cpp
@@ -177,7 +177,7 @@ void AudioDrv::stop()
 
 void AudioDrv::processTask(void* parameters)
 {
-    AudioDrv* tthis = reinterpret_cast<AudioDrv*>(parameters);
+    AudioDrv* tthis = static_cast<AudioDrv*>(parameters);
 
     if ((nullptr != tthis) &&
         (nullptr != tthis->m_xSemaphore))
diff --git a/lib/BTCQuotePlugin/src/BTCQuotePlugin.cpp b/lib/BTCQuotePlugin/src/BTCQuotePlugin.cpp
index d2d9df12..0a6d1d3a 100644
--- a/lib/BTCQuotePlugin/src/BTCQuotePlugin.cpp
+++ b/lib/BTCQuotePlugin/src/BTCQuotePlugin.cpp
@@ -39,6 +39,7 @@
 #include <ArduinoJson.h>
 #include <Logging.h>
 #include <JsonFile.h>
+#include <HttpStatus.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -224,26 +225,41 @@ void BTCQuotePlugin::initHttpClient()
     m_client.regOnResponse(
         [this](const HttpResponse& rsp)
         {
-            const size_t            JSON_DOC_SIZE   = 512U;
-            DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
+            handleAsyncWebResponse(rsp);
+        }
+    );
+}
 
-            if (nullptr != jsonDoc)
-            {
-                size_t                          payloadSize = 0U;
-                const char*                     payload     = reinterpret_cast<const char*>(rsp.getPayload(payloadSize));
-                const size_t                    FILTER_SIZE = 128U;
-                StaticJsonDocument<FILTER_SIZE> filter;
-                DeserializationError            error;
+void BTCQuotePlugin::handleAsyncWebResponse(const HttpResponse& rsp)
+{
+    if (HttpStatus::STATUS_CODE_OK == rsp.getStatusCode())
+    {
+        const size_t            JSON_DOC_SIZE   = 512U;
+        DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
 
-                filter["bpi"]["USD"]["rate_float"]      = true;
-                filter["bpi"]["USD"]["rate"]            = true;
+        if (nullptr != jsonDoc)
+        {
+            size_t                          payloadSize = 0U;
+            const void*                     vPayload    = rsp.getPayload(payloadSize);
+            const char*                     payload     = static_cast<const char*>(vPayload);
+            const size_t                    FILTER_SIZE = 128U;
+            StaticJsonDocument<FILTER_SIZE> filter;
 
-                if (true == filter.overflowed())
-                {
-                    LOG_ERROR("Less memory for filter available.");
-                }
+            filter["bpi"]["USD"]["rate_float"]  = true;
+            filter["bpi"]["USD"]["rate"]        = true;
 
-                error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
+            if (true == filter.overflowed())
+            {
+                LOG_ERROR("Less memory for filter available.");
+            }
+            else if ((nullptr == payload) ||
+                     (0U == payloadSize))
+            {
+                LOG_ERROR("No payload.");
+            }
+            else
+            {
+                DeserializationError error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
 
                 if (DeserializationError::Ok != error.code())
                 {
@@ -264,17 +280,24 @@ void BTCQuotePlugin::initHttpClient()
                 }
             }
         }
-    );
+    }
 }
 
 void BTCQuotePlugin::handleWebResponse(DynamicJsonDocument& jsonDoc)
 {
-    m_relevantResponsePart = jsonDoc["bpi"]["USD"]["rate"].as<String>() + " $/BTC";
-    m_relevantResponsePart.replace(",", "'");               // beautify to european(?) standard formatting ' for 1000s
-    
-    LOG_INFO("BTC/USD to print %s", m_relevantResponsePart.c_str());
+    JsonVariantConst    jsonBpi     = jsonDoc["bpi"];
+    JsonVariantConst    jsonUsd     = jsonBpi["USD"];
+    JsonVariantConst    jsonRate    = jsonUsd["rate"];
 
-    m_textWidget.setFormatStr(m_relevantResponsePart);
+    if (false == jsonRate.isNull())
+    {
+        m_relevantResponsePart = jsonRate.as<String>() + " $/BTC";
+        m_relevantResponsePart.replace(",", "'");  /* Beautify to european(?) standard formatting ' for 1000s */
+        
+        LOG_INFO("BTC/USD to print %s", m_relevantResponsePart.c_str());
+
+        m_textWidget.setFormatStr(m_relevantResponsePart);
+    }
 }
 
 void BTCQuotePlugin::clearQueue()
diff --git a/lib/BTCQuotePlugin/src/BTCQuotePlugin.h b/lib/BTCQuotePlugin/src/BTCQuotePlugin.h
index 9e82931c..62649d13 100644
--- a/lib/BTCQuotePlugin/src/BTCQuotePlugin.h
+++ b/lib/BTCQuotePlugin/src/BTCQuotePlugin.h
@@ -122,7 +122,7 @@ class BTCQuotePlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new BTCQuotePlugin(name, uid);
+        return new(std::nothrow) BTCQuotePlugin(name, uid);
     }
 
     /**
@@ -273,6 +273,14 @@ class BTCQuotePlugin : public Plugin
      */
     void initHttpClient(void);
 
+    /**
+     * Handle asynchronous web response from the server.
+     * This will be called in LwIP context! Don't modify any member here directly!
+     * 
+     * @param[in] jsonDoc   Web response as JSON document
+     */
+    void handleAsyncWebResponse(const HttpResponse& rsp);
+
     /**
      * Handle a web response from the server.
      * 
diff --git a/lib/BaseGfx/src/BaseGfx.hpp b/lib/BaseGfx/src/BaseGfx.hpp
index 5c4380a9..becb8615 100644
--- a/lib/BaseGfx/src/BaseGfx.hpp
+++ b/lib/BaseGfx/src/BaseGfx.hpp
@@ -368,8 +368,6 @@ class BaseGfx
      * @param[in] x         x-coordinate of upper left point
      * @param[in] y         y-coordinate of upper left point
      * @param[in] bitmap    Bitmap pixel buffer
-     * @param[in] width     Bitmap width in pixel
-     * @param[in] height    Bitmap height in pixel
      */
     void drawBitmap(int16_t x, int16_t y, const BaseGfxBitmap<TColor>& bitmap)
     {
diff --git a/lib/BaseGfx/src/BaseGfxMap.hpp b/lib/BaseGfx/src/BaseGfxMap.hpp
index 8830d2b5..492d46aa 100644
--- a/lib/BaseGfx/src/BaseGfxMap.hpp
+++ b/lib/BaseGfx/src/BaseGfxMap.hpp
@@ -146,7 +146,7 @@ class BaseGfxMap : public BaseGfx<TColor>
     /**
      * Set canvas graphic operations.
      * 
-     * @param[in] bitmap    Bitmap which to set
+     * @param[in] gfx   Graphic functions
      */
     void setGfx(BaseGfx<TColor>& gfx)
     {
diff --git a/lib/BaseGfx/src/BaseGfxText.hpp b/lib/BaseGfx/src/BaseGfxText.hpp
index 285ab197..aa3fdd82 100644
--- a/lib/BaseGfx/src/BaseGfxText.hpp
+++ b/lib/BaseGfx/src/BaseGfxText.hpp
@@ -232,7 +232,7 @@ class BaseGfxText
     /**
      * Get font.
      *
-     * @return font
+     * @return Font which is used.
      */
     BaseFont<TColor>& getFont()
     {
@@ -240,9 +240,9 @@ class BaseGfxText
     }
 
     /**
-     * Set GFXfont.
+     * Set font.
      *
-     * @param[in] gfxFont   GFXfont
+     * @param[in] font  New font to set.
      */
     void setFont(const BaseFont<TColor>& font)
     {
diff --git a/lib/BatteryPlugin/src/BatteryPlugin.h b/lib/BatteryPlugin/src/BatteryPlugin.h
index c5f8ab06..767522d0 100644
--- a/lib/BatteryPlugin/src/BatteryPlugin.h
+++ b/lib/BatteryPlugin/src/BatteryPlugin.h
@@ -115,7 +115,7 @@ class BatteryPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new BatteryPlugin(name, uid);
+        return new(std::nothrow) BatteryPlugin(name, uid);
     }
 
     /**
diff --git a/lib/Common/src/IDisplay.hpp b/lib/Common/src/IDisplay.hpp
index 6e829634..9cd97168 100644
--- a/lib/Common/src/IDisplay.hpp
+++ b/lib/Common/src/IDisplay.hpp
@@ -101,6 +101,23 @@ class IDisplay : public YAGfx
      */
     virtual void clear() = 0;
 
+    /**
+     * Power display off.
+     */
+    virtual void off() = 0;
+
+    /**
+     * Power display on.
+     */
+    virtual void on() = 0;
+
+    /**
+     * Is display powered on?
+     * 
+     * @return If display is powered on, it will return true otherwise false.
+     */
+    virtual bool isOn() const = 0;
+
 protected:
 
     /**
diff --git a/lib/CountdownPlugin/library.json b/lib/CountdownPlugin/library.json
index bbae6984..8c2e84f8 100644
--- a/lib/CountdownPlugin/library.json
+++ b/lib/CountdownPlugin/library.json
@@ -13,6 +13,8 @@
         "name": "LittleFS"
     }, {
         "name": "Plugin"
+    }, {
+        "name": "IRtc"
     }],
     "frameworks": "*",
     "platforms": "*"
diff --git a/lib/CountdownPlugin/src/CountdownPlugin.cpp b/lib/CountdownPlugin/src/CountdownPlugin.cpp
index 09179b00..b67b07f9 100644
--- a/lib/CountdownPlugin/src/CountdownPlugin.cpp
+++ b/lib/CountdownPlugin/src/CountdownPlugin.cpp
@@ -87,7 +87,7 @@ bool CountdownPlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool CountdownPlugin::setTopic(const String& topic, const JsonObject& value)
+bool CountdownPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
@@ -221,7 +221,7 @@ void CountdownPlugin::start(uint16_t width, uint16_t height)
 
     m_cfgReloadTimer.start(CFG_RELOAD_PERIOD);
 
-    calculateDifferenceInDays();
+    calculateRemainingDays();
 }
 
 void CountdownPlugin::stop()
@@ -279,6 +279,8 @@ void CountdownPlugin::process(bool isConnected)
     {
         ;
     }
+
+    calculateRemainingDays();
 }
 
 void CountdownPlugin::update(YAGfx& gfx)
@@ -355,8 +357,6 @@ bool CountdownPlugin::setConfiguration(JsonObjectConst& jsonCfg)
         m_targetDateInformation.plural      = jsonDescPlural.as<String>();
         m_targetDateInformation.singular    = jsonDescSingular.as<String>();
 
-        calculateDifferenceInDays();
-
         m_hasTopicChanged = true;
 
         status = true;
@@ -365,11 +365,11 @@ bool CountdownPlugin::setConfiguration(JsonObjectConst& jsonCfg)
     return status;
 }
 
-void CountdownPlugin::calculateDifferenceInDays()
+void CountdownPlugin::calculateRemainingDays()
 {
     tm currentTime;
 
-    if (false != ClockDrv::getInstance().getTime(&currentTime))
+    if (true == ClockDrv::getInstance().getTime(currentTime))
     {
         uint32_t    currentDateInDays   = 0U;
         uint32_t    targetDateInDays    = 0U;
@@ -387,7 +387,7 @@ void CountdownPlugin::calculateDifferenceInDays()
 
         numberOfDays = targetDateInDays - currentDateInDays;
 
-        if( numberOfDays > 0)
+        if (0 < numberOfDays)
         {
             char remaining[10] = "";
 
diff --git a/lib/CountdownPlugin/src/CountdownPlugin.h b/lib/CountdownPlugin/src/CountdownPlugin.h
index e7eabb74..822a1a66 100644
--- a/lib/CountdownPlugin/src/CountdownPlugin.h
+++ b/lib/CountdownPlugin/src/CountdownPlugin.h
@@ -195,9 +195,9 @@ class CountdownPlugin : public Plugin, private PluginConfigFsHandler
         m_hasTopicChanged(false)
     {
         /* Example data, used to generate the very first configuration file. */
-        m_targetDate.day                    = 29;
-        m_targetDate.month                  = 8;
-        m_targetDate.year                   = 2019;
+        m_targetDate.day                    = 1U;
+        m_targetDate.month                  = 8U;
+        m_targetDate.year                   = 2023U;
         m_targetDateInformation.plural      = "DAYS";
         m_targetDateInformation.singular    = "DAY";
 
@@ -222,7 +222,7 @@ class CountdownPlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new CountdownPlugin(name, uid);
+        return new(std::nothrow) CountdownPlugin(name, uid);
     }
 
     /**
@@ -300,7 +300,7 @@ class CountdownPlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
@@ -432,9 +432,10 @@ class CountdownPlugin : public Plugin, private PluginConfigFsHandler
     bool setConfiguration(JsonObjectConst& cfg) final;
 
     /**
-     * Calculates the difference between m_targetTime and m_currentTime in days.
+     * Calculates the remaining days between m_targetTime and m_currentTime in days and
+     * update m_remainingDays.
      */
-    void calculateDifferenceInDays(void);
+    void calculateRemainingDays(void);
 
     /**
      * Counts the number of leap years.
diff --git a/lib/DDPPlugin/src/DDPPlugin.cpp b/lib/DDPPlugin/src/DDPPlugin.cpp
index 68a360bf..bbe16cef 100644
--- a/lib/DDPPlugin/src/DDPPlugin.cpp
+++ b/lib/DDPPlugin/src/DDPPlugin.cpp
@@ -131,29 +131,42 @@ void DDPPlugin::update(YAGfx& gfx)
  * Private Methods
  *****************************************************************************/
 
-void DDPPlugin::onData(DDPServer::Format format, uint32_t offset, uint8_t bitsPerPixel, uint8_t* payload, uint16_t payloadSize, bool isFinal)
+void DDPPlugin::onData(DDPServer::Format format, uint32_t offset, uint8_t bitsPerPixelElement, uint8_t* payload, uint16_t payloadSize, bool isFinal)
 {
     MutexGuard<Mutex> guard(m_mutex);
 
-    /* xlights <= v202301 sends FORMAT_UNDEFINED with 1-bit per pixel which is
-     * necessary to be interpreted as FORMAT_RGB with 24-bit per pixel.
+    /* xlights <= v202301 sends FORMAT_UNDEFINED with 1-bit per pixel element which is
+     * necessary to be interpreted as FORMAT_RGB with 8-bit per pixel element.
      */
     if ((DDPServer::FORMAT_UNDEFINED == format) &&
-        (1U == bitsPerPixel))
+        (1U == bitsPerPixelElement))
     {
         /* Workaround! */
-        format          = DDPServer::FORMAT_RGB;
-        bitsPerPixel    = 24U;
+        format              = DDPServer::FORMAT_RGB;
+        bitsPerPixelElement = 8U;
+    }
+    /* If the format is FORMAT_UNDEFINED and the bit per pixel element is undefined,
+     * we assume its 8-bit per pixel element.
+     */
+    else if ((DDPServer::FORMAT_UNDEFINED == format) &&
+             (0U == bitsPerPixelElement))
+    {
+        format              = DDPServer::FORMAT_RGB;
+        bitsPerPixelElement = 8U;
+    }
+    else
+    {
+        ;
     }
 
     if ((nullptr != payload) &&
         (DDPServer::FORMAT_RGB == format) &&
-        (24U == bitsPerPixel))
+        (8U == bitsPerPixelElement))
     {
         uint16_t    srcIdx          = 0U;
         int16_t     x               = (offset % m_framebuffer.getWidth());
         int16_t     y               = (offset / m_framebuffer.getWidth());
-        uint8_t     bytePerPixel    = bitsPerPixel / 8U;
+        uint8_t     bytePerPixel    = (bitsPerPixelElement * 3U) / 8U; /* RGB = 3 base colors */
 
         while((payloadSize > srcIdx) && (m_framebuffer.getHeight() > y))
         {
@@ -185,6 +198,10 @@ void DDPPlugin::onData(DDPServer::Format format, uint32_t offset, uint8_t bitsPe
 
         m_isUpdated = isFinal;
     }
+    else
+    {
+        LOG_WARNING("Unsupported DDP frame with format %d and bits per pixel element %u.", format, bitsPerPixelElement);
+    }
 }
 
 /******************************************************************************
diff --git a/lib/DDPPlugin/src/DDPPlugin.h b/lib/DDPPlugin/src/DDPPlugin.h
index b041cb46..fdae0093 100644
--- a/lib/DDPPlugin/src/DDPPlugin.h
+++ b/lib/DDPPlugin/src/DDPPlugin.h
@@ -98,7 +98,7 @@ class DDPPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new DDPPlugin(name, uid);
+        return new(std::nothrow) DDPPlugin(name, uid);
     }
 
     /**
@@ -149,7 +149,6 @@ class DDPPlugin : public Plugin
 private:
 
     DDPServer           m_server;       /**< DDP server */
-
     Mutex               m_mutex;        /**< Mutex to protect against concurrent access */
     YAGfxDynamicBitmap  m_framebuffer;  /**< Framebuffer used for synchronization */
     bool                m_isUpdated;    /**< Is framebuffer updated and ready to show? */
@@ -157,14 +156,14 @@ class DDPPlugin : public Plugin
     /**
      * On data reception, this method will be called from a different context.
      * 
-     * @param[in] format        Format of the payload data
-     * @param[in] offset        Byte offset in display framebuffer where to continue
-     * @param[in] bitsPerPixel  Bits per pixel in payload data
-     * @param[in] payload       Payload data
-     * @param[in] payloadSize   Payload data size in byte
-     * @param[in] isFinal       If final, its the last data and display shall show it. Otherwise more data will come.
+     * @param[in] format                Format of the payload data
+     * @param[in] offset                Byte offset in display framebuffer where to continue
+     * @param[in] bitsPerPixelElement   Bits per pixel in payload data
+     * @param[in] payload               Payload data
+     * @param[in] payloadSize           Payload data size in byte
+     * @param[in] isFinal               If final, its the last data and display shall show it. Otherwise more data will come.
      */
-    void onData(DDPServer::Format format, uint32_t offset, uint8_t bitsPerPixel, uint8_t* payload, uint16_t payloadSize, bool isFinal);
+    void onData(DDPServer::Format format, uint32_t offset, uint8_t bitsPerPixelElement, uint8_t* payload, uint16_t payloadSize, bool isFinal);
 };
 
 /******************************************************************************
diff --git a/lib/DDPPlugin/src/DDPServer.cpp b/lib/DDPPlugin/src/DDPServer.cpp
index 688b1183..73bffccf 100644
--- a/lib/DDPPlugin/src/DDPServer.cpp
+++ b/lib/DDPPlugin/src/DDPServer.cpp
@@ -43,127 +43,127 @@
  *****************************************************************************/
 
 /** Bit index for the version in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_VERSION_BIT    (6U)
+#define DDP_HEADER_FLAGS_VERSION_BIT            (6U)
 
 /** Bit mask for the version in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_VERSION_MASK   (0x03U)
+#define DDP_HEADER_FLAGS_VERSION_MASK           (0x03U)
 
 /** Bit index for the timecode flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_TIMECODE_BIT   (4U)
+#define DDP_HEADER_FLAGS_TIMECODE_BIT           (4U)
 
 /** Bit mask for the timecode flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_TIMECODE_MASK  (0x01U)
+#define DDP_HEADER_FLAGS_TIMECODE_MASK          (0x01U)
 
 /** Bit index for the storage flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_STORAGE_BIT    (3U)
+#define DDP_HEADER_FLAGS_STORAGE_BIT            (3U)
 
 /** Bit mask for the storage flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_STORAGE_MASK   (0x01U)
+#define DDP_HEADER_FLAGS_STORAGE_MASK           (0x01U)
 
 /** Bit index for the reply flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_REPLY_BIT      (2U)
+#define DDP_HEADER_FLAGS_REPLY_BIT              (2U)
 
 /** Bit mask for the reply flagn in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_REPLY_MASK     (0x01U)
+#define DDP_HEADER_FLAGS_REPLY_MASK             (0x01U)
 
 /** Bit index for the query flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_QUERY_BIT      (1U)
+#define DDP_HEADER_FLAGS_QUERY_BIT              (1U)
 
 /** Bit mask for the query flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_QUERY_MASK     (0x01U)
+#define DDP_HEADER_FLAGS_QUERY_MASK             (0x01U)
 
 /** Bit index for the push flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_PUSH_BIT       (0U)
+#define DDP_HEADER_FLAGS_PUSH_BIT               (0U)
 
 /** Bit mask for the push flag in the DDP header flags byte. */
-#define DDP_HEADER_FLAGS_PUSH_MASK      (0x01U)
+#define DDP_HEADER_FLAGS_PUSH_MASK              (0x01U)
 
 /** Bit index for the sequence number in the DDP header control byte. */
-#define DDP_HEADER_CONTROL_SEQ_NO_BIT   (0U)
+#define DDP_HEADER_CONTROL_SEQ_NO_BIT           (0U)
 
 /** Bit mask for the sequence number in the DDP header control byte. */
-#define DDP_HEADER_CONTROL_SEQ_NO_MASK  (0x0fU)
+#define DDP_HEADER_CONTROL_SEQ_NO_MASK          (0x0fU)
 
 /** Bit index for the customer bit in the DDP header data type byte. */
-#define DDP_HEADER_DT_CUSTOM_BIT        (7U)
+#define DDP_HEADER_DT_CUSTOM_BIT                (7U)
 
 /** Bit mask for the customer bit in the DDP header data type byte. */
-#define DDP_HEADER_DT_CUSTOM_MASK       (0x01U)
+#define DDP_HEADER_DT_CUSTOM_MASK               (0x01U)
 
 /** Bit index for the data type in the DDP header data type byte. */
-#define DDP_HEADER_DT_DATA_TYPE_BIT     (3U)
+#define DDP_HEADER_DT_DATA_TYPE_BIT             (3U)
 
 /** Bit mask for the data type in the DDP header data type byte. */
-#define DDP_HEADER_DT_DATA_TYPE_MASK    (0x07U)
+#define DDP_HEADER_DT_DATA_TYPE_MASK            (0x07U)
 
 /** Bit index for the pixel size in the DDP header data type byte. */
-#define DDP_HEADER_DT_PIXEL_SIZE_BIT    (0U)
+#define DDP_HEADER_DT_PIXEL_ELEMENT_SIZE_BIT    (0U)
 
 /** Bit mask for the pixel size in the DDP header data type byte. */
-#define DDP_HEADER_DT_PIXEL_SIZE_MASK   (0x07U)
+#define DDP_HEADER_DT_PIXEL_ELEMENT_SIZE_MASK   (0x07U)
 
 /** DDP data type - undefined */
-#define DDP_DATA_TYPE_UNDEFINED         (0U)
+#define DDP_DATA_TYPE_UNDEFINED                 (0U)
 
 /** DDP data type - RGB order */
-#define DDP_DATA_TYPE_RGB               (1U)
+#define DDP_DATA_TYPE_RGB                       (1U)
 
 /** DDP data type - HSL order */
-#define DDP_DATA_TYPE_HSL               (2U)
+#define DDP_DATA_TYPE_HSL                       (2U)
 
 /** DDP data type - RGBW order */
-#define DDP_DATA_TYPE_RGBW              (3U)
+#define DDP_DATA_TYPE_RGBW                      (3U)
 
 /** DDP data type - Grayscale (shades of gray) */
-#define DDP_DATA_TYPE_GRAYSCALE         (4U)
+#define DDP_DATA_TYPE_GRAYSCALE                 (4U)
 
 /** DDP pixel size - undefined */
-#define DDP_PIXEL_SIZE_UNDEFINED        (0U)
+#define DDP_PIXEL_ELEMENT_SIZE_UNDEFINED        (0U)
 
-/** DDP pixel size - 1 bit per pixel */
-#define DDP_PIXEL_SIZE_1                (1U)
+/** DDP pixel size - 1 bit per pixel element */
+#define DDP_PIXEL_ELEMENT_SIZE_1                (1U)
 
-/** DDP pixel size - 4 bit per pixel */
-#define DDP_PIXEL_SIZE_4                (2U)
+/** DDP pixel size - 4 bit per pixel element */
+#define DDP_PIXEL_ELEMENT_SIZE_4                (2U)
 
-/** DDP pixel size - 8 bit per pixel */
-#define DDP_PIXEL_SIZE_8                (3U)
+/** DDP pixel size - 8 bit per pixel element */
+#define DDP_PIXEL_ELEMENT_SIZE_8                (3U)
 
-/** DDP pixel size - 16 bit per pixel */
-#define DDP_PIXEL_SIZE_16               (4U)
+/** DDP pixel size - 16 bit per pixel element */
+#define DDP_PIXEL_ELEMENT_SIZE_16               (4U)
 
-/** DDP pixel size - 24 bit per pixel */
-#define DDP_PIXEL_SIZE_24               (5U)
+/** DDP pixel size - 24 bit per pixel element */
+#define DDP_PIXEL_ELEMENT_SIZE_24               (5U)
 
-/** DDP pixel size - 32 bit per pixel */
-#define DDP_PIXEL_SIZE_32               (6U)
+/** DDP pixel size - 32 bit per pixel element */
+#define DDP_PIXEL_ELEMENT_SIZE_32               (6U)
 
 /** DDP id - reserved */
-#define DDP_ID_RESERVED                 (0U)
+#define DDP_ID_RESERVED                         (0U)
 
 /** DDP id - default device */
-#define DDP_ID_DEFAULT                  (1U)
+#define DDP_ID_DEFAULT                          (1U)
 
 /** DDP id - custom id defined via JSON config */
-#define DDP_ID_CUSTOM                   (2U)
+#define DDP_ID_CUSTOM                           (2U)
 
 /** DDP id - JSON control */
-#define DDP_ID_JSON_CONTROL             (246U)
+#define DDP_ID_JSON_CONTROL                     (246U)
 
 /** DDP id - JSON config */
-#define DDP_ID_JSON_CONFIG              (250U)
+#define DDP_ID_JSON_CONFIG                      (250U)
 
 /** DDP id - JSON status */
-#define DDP_ID_JSON_STATUS              (251U)
+#define DDP_ID_JSON_STATUS                      (251U)
 
 /** DDP id - DMX legay mode */
-#define DDP_ID_DMX_TRANSIT              (254U)
+#define DDP_ID_DMX_TRANSIT                      (254U)
 
 /** DDP id - all devices */
-#define DDP_ID_ALL_DEVICES              (255U)
+#define DDP_ID_ALL_DEVICES                      (255U)
 
 /** DDP timecode field size in byte */
-#define DDP_TIMECODE_SIZE               (4U)
+#define DDP_TIMECODE_SIZE                       (4U)
 
 /******************************************************************************
  * Types and classes
@@ -198,7 +198,7 @@ bool DDPServer::begin(const String& deviceManufacturer, const String& deviceMode
     {
         m_udpServer.onPacket([](void* arg, AsyncUDPPacket& packet)
         {
-            DDPServer*  tthis = reinterpret_cast<DDPServer*>(arg);
+            DDPServer*  tthis = static_cast<DDPServer*>(arg);
 
             if (nullptr != tthis)
             {
@@ -394,46 +394,46 @@ uint8_t DDPServer::getDataType(const DDPHeader& header)
     return dataType;
 }
 
-uint8_t DDPServer::getBitsPerPixel(const DDPHeader& header)
+uint8_t DDPServer::getBitsPerPixelElement(const DDPHeader& header)
 {
-    uint8_t bitsPerPixel = (header.detail.dataType >> DDP_HEADER_DT_PIXEL_SIZE_BIT) & DDP_HEADER_DT_PIXEL_SIZE_MASK;
+    uint8_t bitsPerPixelElement = (header.detail.dataType >> DDP_HEADER_DT_PIXEL_ELEMENT_SIZE_BIT) & DDP_HEADER_DT_PIXEL_ELEMENT_SIZE_MASK;
 
-    switch(bitsPerPixel)
+    switch(bitsPerPixelElement)
     {
-    case DDP_PIXEL_SIZE_UNDEFINED:
-        bitsPerPixel = 8U;
+    case DDP_PIXEL_ELEMENT_SIZE_UNDEFINED:
+        bitsPerPixelElement = 0U;
         break;
 
-    case DDP_PIXEL_SIZE_1:
-        bitsPerPixel = 1U;
+    case DDP_PIXEL_ELEMENT_SIZE_1:
+        bitsPerPixelElement = 1U;
         break;
 
-    case DDP_PIXEL_SIZE_4:
-        bitsPerPixel = 4U;
+    case DDP_PIXEL_ELEMENT_SIZE_4:
+        bitsPerPixelElement = 4U;
         break;
 
-    case DDP_PIXEL_SIZE_8:
-        bitsPerPixel = 8U;
+    case DDP_PIXEL_ELEMENT_SIZE_8:
+        bitsPerPixelElement = 8U;
         break;
 
-    case DDP_PIXEL_SIZE_16:
-        bitsPerPixel = 16U;
+    case DDP_PIXEL_ELEMENT_SIZE_16:
+        bitsPerPixelElement = 16U;
         break;
 
-    case DDP_PIXEL_SIZE_24:
-        bitsPerPixel = 24U;
+    case DDP_PIXEL_ELEMENT_SIZE_24:
+        bitsPerPixelElement = 24U;
         break;
 
-    case DDP_PIXEL_SIZE_32:
-        bitsPerPixel = 32U;
+    case DDP_PIXEL_ELEMENT_SIZE_32:
+        bitsPerPixelElement = 32U;
         break;
 
     default:
-        bitsPerPixel = 8U;
+        bitsPerPixelElement = 0U;
         break;
     }
 
-    return bitsPerPixel;
+    return bitsPerPixelElement;
 }
 
 uint16_t DDPServer::getOffset(const DDPHeader& header)
@@ -586,7 +586,7 @@ void DDPServer::handleData(const DDPHeader& header, uint8_t* payload, uint16_t p
     else if ((DDP_ID_ALL_DEVICES == header.detail.id) ||
              (DDP_ID_DEFAULT == header.detail.id))
     {
-        ddpNotify(static_cast<DDPServer::Format>(getDataType(header)), getOffset(header), getBitsPerPixel(header), payload, payloadSize, isPushFlagSet(header));
+        ddpNotify(static_cast<DDPServer::Format>(getDataType(header)), getOffset(header), getBitsPerPixelElement(header), payload, payloadSize, isPushFlagSet(header));
     }
     else
     {
@@ -594,7 +594,7 @@ void DDPServer::handleData(const DDPHeader& header, uint8_t* payload, uint16_t p
     }
 }
 
-void DDPServer::ddpNotify(Format format, uint32_t offset, uint8_t bitsPerPixel, uint8_t* payload, uint16_t payloadSize, bool isFinal)
+void DDPServer::ddpNotify(Format format, uint32_t offset, uint8_t bitsPerPixelElement, uint8_t* payload, uint16_t payloadSize, bool isFinal)
 {
     DDPCallback callback = nullptr;
 
@@ -606,7 +606,7 @@ void DDPServer::ddpNotify(Format format, uint32_t offset, uint8_t bitsPerPixel,
 
     if (nullptr != callback)
     {
-        callback(format, offset, bitsPerPixel, payload, payloadSize, isFinal);
+        callback(format, offset, bitsPerPixelElement, payload, payloadSize, isFinal);
     }
 }
 
diff --git a/lib/DDPPlugin/src/DDPServer.h b/lib/DDPPlugin/src/DDPServer.h
index d572e108..b23dc11c 100644
--- a/lib/DDPPlugin/src/DDPServer.h
+++ b/lib/DDPPlugin/src/DDPServer.h
@@ -81,7 +81,7 @@ class DDPServer
      * It provides received data to the application. If the final flag is set, the
      * data is complete and ready for showing it.
      */
-    typedef std::function<void(Format format, uint32_t offset, uint8_t bitsPerPixel, uint8_t* payload, uint16_t payloadSize, bool isFinal)> DDPCallback;
+    typedef std::function<void(Format format, uint32_t offset, uint8_t bitsPerPixelElement, uint8_t* payload, uint16_t payloadSize, bool isFinal)> DDPCallback;
 
     /**
      * DDP application callback prototype for DMX legacy mode.
@@ -405,13 +405,14 @@ class DDPServer
     uint8_t getDataType(const DDPHeader& header);
 
     /**
-     * Get the bits per pixel from the DDP header.
+     * Get the bits per pixel element from the DDP header.
+     * Pixel element means for just one base color, not for the whole pixel.
      * 
      * @param[in] header    DDP header
      * 
-     * @return Bits per pixel
+     * @return Bits per pixel element
      */
-    uint8_t getBitsPerPixel(const DDPHeader& header);
+    uint8_t getBitsPerPixelElement(const DDPHeader& header);
 
     /**
      * Get the offset from the DDP header.
@@ -470,14 +471,14 @@ class DDPServer
      * Notifys a registered application and provides the DDP received data.
      * The application needs to copy the data into its own context!
      * 
-     * @param[in] format        Format of the payload data
-     * @param[in] offset        Byte offset in display framebuffer where to continue
-     * @param[in] bitsPerPixel  Bits per pixel in payload data
-     * @param[in] payload       Payload data
-     * @param[in] payloadSize   Payload data size in byte
-     * @param[in] isFinal       If final, its the last data and display shall show it. Otherwise more data will come.
+     * @param[in] format                Format of the payload data
+     * @param[in] offset                Byte offset in display framebuffer where to continue
+     * @param[in] bitsPerPixelElement   Bits per pixel element in payload data
+     * @param[in] payload               Payload data
+     * @param[in] payloadSize           Payload data size in byte
+     * @param[in] isFinal               If final, its the last data and display shall show it. Otherwise more data will come.
      */
-    void ddpNotify(Format format, uint32_t offset, uint8_t bitsPerPixel, uint8_t* payload, uint16_t payloadSize, bool isFinal);
+    void ddpNotify(Format format, uint32_t offset, uint8_t bitsPerPixelElement, uint8_t* payload, uint16_t payloadSize, bool isFinal);
 
     /**
      * Notifys a registered application and provides the DMX received data.
diff --git a/lib/DateTimePlugin/library.json b/lib/DateTimePlugin/library.json
index 65c13094..05375296 100644
--- a/lib/DateTimePlugin/library.json
+++ b/lib/DateTimePlugin/library.json
@@ -13,6 +13,8 @@
         "name": "LittleFS"
     }, {
         "name": "Plugin"
+    }, {
+        "name": "IRtc"
     }],
     "frameworks": "*",
     "platforms": "*"
diff --git a/lib/DateTimePlugin/src/DateTimePlugin.cpp b/lib/DateTimePlugin/src/DateTimePlugin.cpp
index d2e04a0d..35c75800 100644
--- a/lib/DateTimePlugin/src/DateTimePlugin.cpp
+++ b/lib/DateTimePlugin/src/DateTimePlugin.cpp
@@ -95,7 +95,7 @@ bool DateTimePlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool DateTimePlugin::setTopic(const String& topic, const JsonObject& value)
+bool DateTimePlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
@@ -460,11 +460,11 @@ void DateTimePlugin::updateDateTime(bool force)
     /* If not other timezone is given, the local time shall be used. */
     if (true == m_timeZone.isEmpty())
     {
-        isClockAvailable = clockDrv.getTime(&timeInfo);
+        isClockAvailable = clockDrv.getTime(timeInfo);
     }
     else
     {
-        isClockAvailable = clockDrv.getTzTime(m_timeZone.c_str(), &timeInfo);
+        isClockAvailable = clockDrv.getTzTime(m_timeZone.c_str(), timeInfo);
     }
     
     if (true == isClockAvailable)
@@ -680,7 +680,7 @@ bool DateTimePlugin::getTimeAsString(String& time, const String& format, const t
     {
         timeStructPtr = &timeStruct;
 
-        if (false == ClockDrv::getInstance().getTime(&timeStruct))
+        if (false == ClockDrv::getInstance().getTime(timeStruct))
         {
             timeStructPtr = nullptr;
         }
diff --git a/lib/DateTimePlugin/src/DateTimePlugin.h b/lib/DateTimePlugin/src/DateTimePlugin.h
index 4fda4566..580078d3 100644
--- a/lib/DateTimePlugin/src/DateTimePlugin.h
+++ b/lib/DateTimePlugin/src/DateTimePlugin.h
@@ -121,7 +121,7 @@ class DateTimePlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new DateTimePlugin(name, uid);
+        return new(std::nothrow) DateTimePlugin(name, uid);
     }
 
     /**
@@ -174,7 +174,7 @@ class DateTimePlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
diff --git a/lib/FirePlugin/src/FirePlugin.h b/lib/FirePlugin/src/FirePlugin.h
index ffd5e507..4cd5494e 100644
--- a/lib/FirePlugin/src/FirePlugin.h
+++ b/lib/FirePlugin/src/FirePlugin.h
@@ -110,7 +110,7 @@ class FirePlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new FirePlugin(name, uid);
+        return new(std::nothrow) FirePlugin(name, uid);
     }
 
     /**
diff --git a/lib/GameOfLifePlugin/src/GameOfLifePlugin.h b/lib/GameOfLifePlugin/src/GameOfLifePlugin.h
index e333e888..aace6d11 100644
--- a/lib/GameOfLifePlugin/src/GameOfLifePlugin.h
+++ b/lib/GameOfLifePlugin/src/GameOfLifePlugin.h
@@ -119,7 +119,7 @@ class GameOfLifePlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new GameOfLifePlugin(name, uid);
+        return new(std::nothrow)GameOfLifePlugin(name, uid);
     }
 
     /**
diff --git a/lib/GithubPlugin/src/GithubPlugin.cpp b/lib/GithubPlugin/src/GithubPlugin.cpp
deleted file mode 100644
index 0409c4c4..00000000
--- a/lib/GithubPlugin/src/GithubPlugin.cpp
+++ /dev/null
@@ -1,554 +0,0 @@
-/* MIT License
- *
- * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*******************************************************************************
-    DESCRIPTION
-*******************************************************************************/
-/**
- * @brief  Github plugin
- * @author Andreas Merkle <web@blue-andi.de>
- */
-
-/******************************************************************************
- * Includes
- *****************************************************************************/
-#include "GithubPlugin.h"
-
-#include <Logging.h>
-#include <ArduinoJson.h>
-
-/******************************************************************************
- * Compiler Switches
- *****************************************************************************/
-
-/******************************************************************************
- * Macros
- *****************************************************************************/
-
-/******************************************************************************
- * Types and classes
- *****************************************************************************/
-
-/******************************************************************************
- * Prototypes
- *****************************************************************************/
-
-/******************************************************************************
- * Local Variables
- *****************************************************************************/
-
-/* Initialize image path for standard icon. */
-const char* GithubPlugin::IMAGE_PATH_STD_ICON      = "/plugins/GithubPlugin/github.bmp";
-
-/* Initialize plugin topic. */
-const char* GithubPlugin::TOPIC_CONFIG             = "/github";
-
-/******************************************************************************
- * Public Methods
- *****************************************************************************/
-
-void GithubPlugin::getTopics(JsonArray& topics) const
-{
-    (void)topics.add(TOPIC_CONFIG);
-}
-
-bool GithubPlugin::getTopic(const String& topic, JsonObject& value) const
-{
-    bool isSuccessful = false;
-
-    if (0U != topic.equals(TOPIC_CONFIG))
-    {
-        getConfiguration(value);
-        isSuccessful = true;
-    }
-
-    return isSuccessful;
-}
-
-bool GithubPlugin::setTopic(const String& topic, const JsonObject& value)
-{
-    bool isSuccessful = false;
-
-    if (0U != topic.equals(TOPIC_CONFIG))
-    {
-        const size_t        JSON_DOC_SIZE           = 512U;
-        DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
-        JsonObject          jsonCfg                 = jsonDoc.to<JsonObject>();
-        JsonVariantConst    jsonUser                = value["user"];
-        JsonVariantConst    jsonRepository          = value["repository"];
-
-        /* The received configuration may not contain all single key/value pair.
-         * Therefore read first the complete internal configuration and
-         * overwrite them with the received ones.
-         */
-        getConfiguration(jsonCfg);
-
-        /* Note:
-         * Check only for the key/value pair availability.
-         * The type check will follow in the setConfiguration().
-         */
-
-        if (false == jsonUser.isNull())
-        {
-            jsonCfg["user"] = jsonUser.as<String>();
-            isSuccessful = true;
-        }
-
-        if (false == jsonRepository.isNull())
-        {
-            jsonCfg["repository"] = jsonRepository.as<String>();
-            isSuccessful = true;
-        }
-
-        if (true == isSuccessful)
-        {
-            JsonObjectConst jsonCfgConst = jsonCfg;
-
-            isSuccessful = setConfiguration(jsonCfgConst);
-
-            if (true == isSuccessful)
-            {
-                requestStoreToPersistentMemory();
-            }
-        }
-    }
-
-    return isSuccessful;
-}
-
-bool GithubPlugin::hasTopicChanged(const String& topic)
-{
-    MutexGuard<MutexRecursive>  guard(m_mutex);
-    bool                        hasTopicChanged = m_hasTopicChanged;
-
-    /* Only a single topic, therefore its not necessary to check. */
-    PLUGIN_NOT_USED(topic);
-
-    m_hasTopicChanged = false;
-
-    return hasTopicChanged;
-}
-
-void GithubPlugin::start(uint16_t width, uint16_t height)
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
-
-    m_iconCanvas.setPosAndSize(0, 0, ICON_WIDTH, ICON_HEIGHT);
-    (void)m_iconCanvas.addWidget(m_stdIconWidget);
-
-    /* Load all icons from filesystem now, to prevent filesystem
-     * access during active/inactive/update methods.
-     */
-    (void)m_stdIconWidget.load(FILESYSTEM, IMAGE_PATH_STD_ICON);
-
-    /* The text canvas is left aligned to the icon canvas and it spans over
-     * the whole display height.
-     */
-    m_textCanvas.setPosAndSize(ICON_WIDTH, 0, width - ICON_WIDTH, height);
-    (void)m_textCanvas.addWidget(m_textWidget);
-
-    /* Choose font. */
-    m_textWidget.setFont(Fonts::getFontByType(m_fontType));
-
-    /* The text widget inside the text canvas is left aligned on x-axis and
-     * aligned to the center of y-axis.
-     */
-    if (height > m_textWidget.getFont().getHeight())
-    {
-        uint16_t diffY = height - m_textWidget.getFont().getHeight();
-        uint16_t offsY = diffY / 2U;
-
-        m_textWidget.move(0, offsY);
-    }
-
-    /* Try to load configuration. If there is no configuration available, a default configuration
-     * will be created.
-     */
-    if (false == loadConfiguration())
-    {
-        if (false == saveConfiguration())
-        {
-            LOG_WARNING("Failed to create initial configuration file %s.", getFullPathToConfiguration().c_str());
-        }
-    }
-    else
-    {
-        /* Remember current timestamp to detect updates of the configuration in the
-         * filesystem without using the plugin API.
-         */
-        updateTimestampLastUpdate();
-    }
-
-    m_cfgReloadTimer.start(CFG_RELOAD_PERIOD);
-
-    initHttpClient();
-}
-
-void GithubPlugin::stop()
-{
-    String                      configurationFilename = getFullPathToConfiguration();
-    MutexGuard<MutexRecursive>  guard(m_mutex);
-
-    m_cfgReloadTimer.stop();
-    m_requestTimer.stop();
-
-    if (false != FILESYSTEM.remove(configurationFilename))
-    {
-        LOG_INFO("File %s removed", configurationFilename.c_str());
-    }
-}
-
-void GithubPlugin::process(bool isConnected)
-{
-    Msg                         msg;
-    MutexGuard<MutexRecursive>  guard(m_mutex);
-
-    /* Configuration in persistent memory updated? */
-    if ((true == m_cfgReloadTimer.isTimerRunning()) &&
-        (true == m_cfgReloadTimer.isTimeout()))
-    {
-        if (true == isConfigurationUpdated())
-        {
-            m_reloadConfigReq = true;
-        }
-
-        m_cfgReloadTimer.restart();
-    }
-
-    if (true == m_storeConfigReq)
-    {
-        if (false == saveConfiguration())
-        {
-            LOG_WARNING("Failed to save configuration: %s", getFullPathToConfiguration().c_str());
-        }
-
-        m_storeConfigReq = false;
-    }
-    else if (true == m_reloadConfigReq)
-    {
-        LOG_INFO("Reload configuration: %s", getFullPathToConfiguration().c_str());
-
-        if (true == loadConfiguration())
-        {
-            updateTimestampLastUpdate();
-        }
-
-        m_reloadConfigReq = false;
-    }
-    else
-    {
-        ;
-    }
-
-    /* Only if a network connection is established the required information
-     * shall be periodically requested via REST API.
-     */
-    if (false == m_requestTimer.isTimerRunning())
-    {
-        if (true == isConnected)
-        {
-            if (false == startHttpRequest())
-            {
-                /* If a request fails, show standard icon and a '?' */
-                m_textWidget.setFormatStr("\\calign?");
-
-                m_requestTimer.start(UPDATE_PERIOD_SHORT);
-            }
-            else
-            {
-                m_requestTimer.start(UPDATE_PERIOD);
-            }
-        }
-    }
-    else
-    {
-        /* If the connection is lost, stop periodically requesting information
-         * via REST API.
-         */
-        if (false == isConnected)
-        {
-            m_requestTimer.stop();
-        }
-        /* Network connection is available and next request may be necessary for
-         * information update.
-         */
-        else if (true == m_requestTimer.isTimeout())
-        {
-            if (false == startHttpRequest())
-            {
-                /* If a request fails, show standard icon and a '?' */
-                m_textWidget.setFormatStr("\\calign?");
-
-                m_requestTimer.start(UPDATE_PERIOD_SHORT);
-            }
-            else
-            {
-                m_requestTimer.start(UPDATE_PERIOD);
-            }
-        }
-    }
-
-    if (true == m_taskProxy.receive(msg))
-    {
-        switch(msg.type)
-        {
-        case MSG_TYPE_INVALID:
-            /* Should never happen. */
-            break;
-
-        case MSG_TYPE_RSP:
-            if (nullptr != msg.rsp)
-            {
-                handleWebResponse(*msg.rsp);
-                delete msg.rsp;
-                msg.rsp = nullptr;
-            }
-            break;
-
-        case MSG_TYPE_CONN_CLOSED:
-            LOG_INFO("Connection closed.");
-
-            if (true == m_isConnectionError)
-            {
-                /* If a request fails, show standard icon and a '?' */
-                m_textWidget.setFormatStr("\\calign?");
-
-                m_requestTimer.start(UPDATE_PERIOD_SHORT);
-            }
-            m_isConnectionError = false;
-            break;
-
-        case MSG_TYPE_CONN_ERROR:
-            LOG_WARNING("Connection error.");
-            m_isConnectionError = true;
-            break;
-
-        default:
-            /* Should never happen. */
-            break;
-        }
-    }
-}
-
-void GithubPlugin::update(YAGfx& gfx)
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
-
-    gfx.fillScreen(ColorDef::BLACK);
-    m_iconCanvas.update(gfx);
-    m_textCanvas.update(gfx);
-}
-
-/******************************************************************************
- * Protected Methods
- *****************************************************************************/
-
-/******************************************************************************
- * Private Methods
- *****************************************************************************/
-
-void GithubPlugin::requestStoreToPersistentMemory()
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
-
-    m_storeConfigReq = true;
-}
-
-void GithubPlugin::getConfiguration(JsonObject& jsonCfg) const
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
-
-    jsonCfg["user"]         = m_githubUser;
-    jsonCfg["repository"]   = m_githubRepository;
-}
-
-bool GithubPlugin::setConfiguration(JsonObjectConst& jsonCfg)
-{
-    bool                status          = false;
-    JsonVariantConst    jsonUser        = jsonCfg["user"];
-    JsonVariantConst    jsonRepository  = jsonCfg["repository"];
-
-    if (false == jsonUser.is<String>())
-    {
-        LOG_WARNING("JSON user not found or invalid type.");
-    }
-    else if (false == jsonRepository.is<String>())
-    {
-        LOG_WARNING("JSON repository not found or invalid type.");
-    }
-    else
-    {
-        MutexGuard<MutexRecursive> guard(m_mutex);
-
-        m_githubUser        = jsonUser.as<String>();
-        m_githubRepository  = jsonRepository.as<String>();
-
-        /* Force update on display */
-        m_requestTimer.start(UPDATE_PERIOD_SHORT);
-
-        m_hasTopicChanged = true;
-
-        status = true;
-    }
-
-    return status;
-}
-
-bool GithubPlugin::startHttpRequest()
-{
-    bool status = false;
-
-    if ((false == m_githubUser.isEmpty()) &&
-        (false == m_githubRepository.isEmpty()))
-    {
-        String url = String("https://api.github.com/repos/") + m_githubUser + "/" + m_githubRepository;
-
-        if (true == m_client.begin(url))
-        {
-            if (false == m_client.GET())
-            {
-                LOG_WARNING("GET %s failed.", url.c_str());
-            }
-            else
-            {
-                status = true;
-            }
-        }
-    }
-
-    return status;
-}
-
-void GithubPlugin::initHttpClient()
-{
-    /* Note: All registered callbacks are running in a different task context!
-     *       Therefore it is not allowed to access a member here directly.
-     *       The processing must be deferred via task proxy.
-     */
-    m_client.regOnResponse(
-        [this](const HttpResponse& rsp)
-        {
-            const size_t            JSON_DOC_SIZE   = 512U;
-            DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
-
-            if (nullptr != jsonDoc)
-            {
-                size_t                          payloadSize = 0U;
-                const char*                     payload     = reinterpret_cast<const char*>(rsp.getPayload(payloadSize));
-                const size_t                    FILTER_SIZE = 128U;
-                StaticJsonDocument<FILTER_SIZE> filter;
-                DeserializationError            error;
-
-                filter["stargazers_count"] = true;
-                
-                if (true == filter.overflowed())
-                {
-                    LOG_ERROR("Less memory for filter available.");
-                }
-
-                error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
-
-                if (DeserializationError::Ok != error.code())
-                {
-                    LOG_WARNING("JSON parse error: %s", error.c_str());
-                }
-                else
-                {
-                    Msg msg;
-
-                    msg.type    = MSG_TYPE_RSP;
-                    msg.rsp     = jsonDoc;
-
-                    if (false == this->m_taskProxy.send(msg))
-                    {
-                        delete jsonDoc;
-                        jsonDoc = nullptr;
-                    }
-                }
-            }
-        }
-    );
-
-    m_client.regOnClosed(
-        [this]()
-        {
-            Msg msg;
-
-            msg.type = MSG_TYPE_CONN_CLOSED;
-
-            (void)this->m_taskProxy.send(msg);
-        }
-    );
-
-    m_client.regOnError(
-        [this]()
-        {
-            Msg msg;
-
-            msg.type = MSG_TYPE_CONN_ERROR;
-
-            (void)this->m_taskProxy.send(msg);
-        }
-    );
-}
-
-void GithubPlugin::handleWebResponse(const DynamicJsonDocument& jsonDoc)
-{
-    JsonVariantConst jsonStargazersCount = jsonDoc["stargazers_count"];
-
-    if (false == jsonStargazersCount.is<uint32_t>())
-    {
-        LOG_WARNING("JSON stargazers_count type mismatch or missing.");
-    }
-    else
-    {
-        uint32_t    stargazersCount = jsonStargazersCount.as<uint32_t>();
-        String      info            = "\\calign";
-        
-        info += stargazersCount;
-
-        m_textWidget.setFormatStr(info);
-    }
-}
-
-void GithubPlugin::clearQueue()
-{
-    Msg msg;
-
-    while(true == m_taskProxy.receive(msg))
-    {
-        if (MSG_TYPE_RSP == msg.type)
-        {
-            delete msg.rsp;
-            msg.rsp = nullptr;
-        }
-    }
-}
-
-/******************************************************************************
- * External Functions
- *****************************************************************************/
-
-/******************************************************************************
- * Local Functions
- *****************************************************************************/
diff --git a/lib/GithubPlugin/web/GithubPlugin.jpg b/lib/GithubPlugin/web/GithubPlugin.jpg
deleted file mode 100644
index 1605cf60..00000000
Binary files a/lib/GithubPlugin/web/GithubPlugin.jpg and /dev/null differ
diff --git a/lib/ShellyPlugSPlugin/library.json b/lib/GrabViaMqttPlugin/library.json
similarity index 88%
rename from lib/ShellyPlugSPlugin/library.json
rename to lib/GrabViaMqttPlugin/library.json
index f474bb7c..250cd88d 100644
--- a/lib/ShellyPlugSPlugin/library.json
+++ b/lib/GrabViaMqttPlugin/library.json
@@ -1,5 +1,5 @@
 {
-    "name": "ShellyPlugSPlugin",
+    "name": "GrabViaMqttPlugin",
     "version": "0.1.0",
     "description": "....",
     "authors": [{
diff --git a/lib/GrabViaMqttPlugin/src/GrabViaMqttPlugin.cpp b/lib/GrabViaMqttPlugin/src/GrabViaMqttPlugin.cpp
new file mode 100644
index 00000000..fbaccf8f
--- /dev/null
+++ b/lib/GrabViaMqttPlugin/src/GrabViaMqttPlugin.cpp
@@ -0,0 +1,558 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  Grab information via REST API plugin
+ * @author Andreas Merkle <web@blue-andi.de>
+ */
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "GrabViaMqttPlugin.h"
+
+#include <Logging.h>
+#include <ArduinoJson.h>
+#include <MqttService.h>
+
+/******************************************************************************
+ * Compiler Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and classes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Prototypes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Variables
+ *****************************************************************************/
+
+/* Initialize plugin topic. */
+const char* GrabViaMqttPlugin::TOPIC_CONFIG = "/grabConfig";
+
+/******************************************************************************
+ * Public Methods
+ *****************************************************************************/
+
+void GrabViaMqttPlugin::getTopics(JsonArray& topics) const
+{
+    (void)topics.add(TOPIC_CONFIG);
+}
+
+bool GrabViaMqttPlugin::getTopic(const String& topic, JsonObject& value) const
+{
+    bool isSuccessful = false;
+
+    if (0U != topic.equals(TOPIC_CONFIG))
+    {
+        getConfiguration(value);
+        isSuccessful = true;
+    }
+
+    return isSuccessful;
+}
+
+bool GrabViaMqttPlugin::setTopic(const String& topic, const JsonObjectConst& value)
+{
+    bool isSuccessful = false;
+
+    if (0U != topic.equals(TOPIC_CONFIG))
+    {
+        const size_t        JSON_DOC_SIZE           = 1024U;
+        DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
+        JsonObject          jsonCfg                 = jsonDoc.to<JsonObject>();
+        JsonVariantConst    jsonPath                = value["path"];
+        JsonVariantConst    jsonFilter              = value["filter"];
+        JsonVariantConst    jsonIconPath            = value["iconPath"];
+        JsonVariantConst    jsonFormat              = value["format"];
+        JsonVariantConst    jsonMultiplier          = value["multiplier"];
+        JsonVariantConst    jsonOffset              = value["offset"];
+
+        /* The received configuration may not contain all single key/value pair.
+         * Therefore read first the complete internal configuration and
+         * overwrite them with the received ones.
+         */
+        getConfiguration(jsonCfg);
+
+        /* Note:
+         * Check only for the key/value pair availability.
+         * The type check will follow in the setConfiguration().
+         */
+
+        if (false == jsonPath.isNull())
+        {
+            jsonCfg["path"] = jsonPath.as<String>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonFilter.isNull())
+        {
+            if (true == jsonFilter.is<JsonObjectConst>())
+            {
+                jsonCfg["filter"] = jsonFilter.as<JsonObjectConst>();
+                isSuccessful = true;
+            }
+            else if (true == jsonFilter.is<String>())
+            {
+                const size_t            JSON_DOC_FILTER_SIZE    = 256U;
+                DynamicJsonDocument     jsonDocFilter(JSON_DOC_FILTER_SIZE);
+                DeserializationError    result = deserializeJson(jsonDocFilter, jsonFilter.as<String>());
+
+                if (DeserializationError::Ok == result)
+                {
+                    jsonCfg["filter"] = jsonDocFilter.as<JsonObjectConst>();
+                    isSuccessful = true;
+                }
+            }
+            else
+            {
+                ;
+            }
+        }
+
+        if (false == jsonIconPath.isNull())
+        {
+            jsonCfg["iconPath"] = jsonIconPath.as<String>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonFormat.isNull())
+        {
+            jsonCfg["format"] = jsonFormat.as<String>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonMultiplier.isNull())
+        {
+            jsonCfg["multiplier"] = jsonMultiplier.as<float>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonOffset.isNull())
+        {
+            jsonCfg["offset"] = jsonOffset.as<float>();
+            isSuccessful = true;
+        }
+
+        if (true == isSuccessful)
+        {
+            JsonObjectConst jsonCfgConst = jsonCfg;
+
+            isSuccessful = setConfiguration(jsonCfgConst);
+
+            if (true == isSuccessful)
+            {
+                requestStoreToPersistentMemory();
+            }
+        }
+    }
+
+    return isSuccessful;
+}
+
+bool GrabViaMqttPlugin::hasTopicChanged(const String& topic)
+{
+    MutexGuard<MutexRecursive>  guard(m_mutex);
+    bool                        hasTopicChanged = m_hasTopicChanged;
+
+    /* Only a single topic, therefore its not necessary to check. */
+    PLUGIN_NOT_USED(topic);
+
+    m_hasTopicChanged = false;
+
+    return hasTopicChanged;
+}
+
+void GrabViaMqttPlugin::start(uint16_t width, uint16_t height)
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    m_layoutLeft.setPosAndSize(0, 0, ICON_WIDTH, ICON_HEIGHT);
+    (void)m_layoutLeft.addWidget(m_iconWidget);
+
+    /* The text canvas is left aligned to the icon canvas and it spans over
+     * the whole display height.
+     */
+    m_layoutRight.setPosAndSize(ICON_WIDTH, 0, width - ICON_WIDTH, height);
+    (void)m_layoutRight.addWidget(m_textWidgetRight);
+
+    /* If only text is used, it will span over the whole display. */
+    m_layoutTextOnly.setPosAndSize(0, 0, width, height);
+    (void)m_layoutTextOnly.addWidget(m_textWidgetTextOnly);
+
+    /* Choose font. */
+    m_textWidgetRight.setFont(Fonts::getFontByType(m_fontType));
+    m_textWidgetTextOnly.setFont(Fonts::getFontByType(m_fontType));
+
+    /* The text widget inside the text canvas is left aligned on x-axis and
+     * aligned to the center of y-axis.
+     */
+    if (height > m_textWidgetRight.getFont().getHeight())
+    {
+        uint16_t diffY = height - m_textWidgetRight.getFont().getHeight();
+        uint16_t offsY = diffY / 2U;
+
+        m_textWidgetRight.move(0, offsY);
+        m_textWidgetTextOnly.move(0, offsY);
+    }
+
+    /* Try to load configuration. If there is no configuration available, a default configuration
+     * will be created.
+     */
+    if (false == loadConfiguration())
+    {
+        if (false == saveConfiguration())
+        {
+            LOG_WARNING("Failed to create initial configuration file %s.", getFullPathToConfiguration().c_str());
+        }
+    }
+    else
+    {
+        /* Remember current timestamp to detect updates of the configuration in the
+         * filesystem without using the plugin API.
+         */
+        updateTimestampLastUpdate();
+    }
+
+    if (false == m_iconPath.isEmpty())
+    {
+        (void)m_iconWidget.load(FILESYSTEM, m_iconPath);
+    }
+
+    m_cfgReloadTimer.start(CFG_RELOAD_PERIOD);
+
+    subscribe();
+}
+
+void GrabViaMqttPlugin::stop()
+{
+    String                      configurationFilename = getFullPathToConfiguration();
+    MutexGuard<MutexRecursive>  guard(m_mutex);
+
+    m_cfgReloadTimer.stop();
+    unsubscribe();
+
+    if (false != FILESYSTEM.remove(configurationFilename))
+    {
+        LOG_INFO("File %s removed", configurationFilename.c_str());
+    }
+}
+
+void GrabViaMqttPlugin::process(bool isConnected)
+{
+    MutexGuard<MutexRecursive>  guard(m_mutex);
+
+    /* Configuration in persistent memory updated? */
+    if ((true == m_cfgReloadTimer.isTimerRunning()) &&
+        (true == m_cfgReloadTimer.isTimeout()))
+    {
+        if (true == isConfigurationUpdated())
+        {
+            m_reloadConfigReq = true;
+        }
+
+        m_cfgReloadTimer.restart();
+    }
+
+    if (true == m_storeConfigReq)
+    {
+        if (false == saveConfiguration())
+        {
+            LOG_WARNING("Failed to save configuration: %s", getFullPathToConfiguration().c_str());
+        }
+
+        m_storeConfigReq = false;
+    }
+    else if (true == m_reloadConfigReq)
+    {
+        LOG_INFO("Reload configuration: %s", getFullPathToConfiguration().c_str());
+
+        if (true == loadConfiguration())
+        {
+            updateTimestampLastUpdate();
+        }
+
+        m_reloadConfigReq = false;
+    }
+    else
+    {
+        ;
+    }
+}
+
+void GrabViaMqttPlugin::update(YAGfx& gfx)
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    gfx.fillScreen(ColorDef::BLACK);
+
+    /* If a icon is available, the icon/text layout will be used otherwise the text only layout. */
+    if (false == m_iconPath.isEmpty())
+    {
+        m_layoutLeft.update(gfx);
+        m_layoutRight.update(gfx);
+    }
+    else
+    {
+        m_layoutTextOnly.update(gfx);
+    }
+}
+
+/******************************************************************************
+ * Protected Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Private Methods
+ *****************************************************************************/
+
+void GrabViaMqttPlugin::requestStoreToPersistentMemory()
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    m_storeConfigReq = true;
+}
+
+void GrabViaMqttPlugin::getConfiguration(JsonObject& jsonCfg) const
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    jsonCfg["path"]         = m_path;
+    jsonCfg["filter"]       = m_filter;
+    jsonCfg["iconPath"]     = m_iconPath;
+    jsonCfg["format"]       = m_format;
+    jsonCfg["multiplier"]   = m_multiplier;
+    jsonCfg["offset"]       = m_offset;
+}
+
+bool GrabViaMqttPlugin::setConfiguration(JsonObjectConst& jsonCfg)
+{
+    bool                status          = false;
+    JsonVariantConst    jsonPath        = jsonCfg["path"];
+    JsonVariantConst    jsonFilter      = jsonCfg["filter"];
+    JsonVariantConst    jsonIconPath    = jsonCfg["iconPath"];
+    JsonVariantConst    jsonFormat      = jsonCfg["format"];
+    JsonVariantConst    jsonMultiplier  = jsonCfg["multiplier"];
+    JsonVariantConst    jsonOffset      = jsonCfg["offset"];
+
+    if (false == jsonPath.is<String>())
+    {
+        LOG_WARNING("JSON path not found or invalid type.");
+    }
+    else if (false == jsonFilter.is<JsonObjectConst>())
+    {
+        LOG_WARNING("JSON filter not found or invalid type.");
+    }
+    else if (false == jsonIconPath.is<String>())
+    {
+        LOG_WARNING("JSON icon path not found or invalid type.");
+    }
+    else if (false == jsonFormat.is<String>())
+    {
+        LOG_WARNING("JSON format not found or invalid type.");
+    }
+    else if (false == jsonMultiplier.is<float>())
+    {
+        LOG_WARNING("JSON multiplier not found or invalid type.");
+    }
+    else if (false == jsonOffset.is<float>())
+    {
+        LOG_WARNING("JSON offset not found or invalid type.");
+    }
+    else
+    {
+        bool                        reqInit = false;
+        bool                        reqIcon = false;
+        MutexGuard<MutexRecursive>  guard(m_mutex);
+
+        if (m_path != jsonPath.as<String>())
+        {
+            unsubscribe();
+            reqInit = true;
+        }
+
+        if (m_iconPath != jsonIconPath.as<String>())
+        {
+            reqIcon = true;
+        }
+
+        m_path          = jsonPath.as<String>();
+        m_filter        = jsonFilter.as<JsonObjectConst>();
+        m_iconPath      = jsonIconPath.as<String>();
+        m_format        = jsonFormat.as<String>();
+        m_multiplier    = jsonMultiplier.as<float>();
+        m_offset        = jsonOffset.as<float>();
+
+        if (true == reqInit)
+        {
+            subscribe();
+        }
+
+        /* Load icon immediately */
+        if (true == reqIcon)
+        {
+            if (true == m_iconPath.endsWith(".sprite"))
+            {
+                String textureFileName = m_iconPath;
+
+                textureFileName.replace(".sprite", ".bmp");
+
+                if (false == m_iconWidget.loadSpriteSheet(FILESYSTEM, m_iconPath, textureFileName))
+                {
+                    LOG_WARNING("Failed to load animation %s / %s.", m_iconPath.c_str(), textureFileName.c_str());
+                }
+            }
+            else if (true == m_iconPath.endsWith(".bmp"))
+            {
+                if (false == m_iconWidget.load(FILESYSTEM, m_iconPath))
+                {
+                    LOG_WARNING("Failed to load bitmap %s.", m_iconPath.c_str());
+                }
+            }
+            else
+            {
+                m_iconWidget.clear(ColorDef::BLACK);
+            }
+        }
+
+        m_hasTopicChanged = true;
+
+        status = true;
+    }
+
+    return status;
+}
+
+void GrabViaMqttPlugin::getJsonValueByFilter(JsonObjectConst src, JsonObjectConst filter, JsonVariantConst& value)
+{
+    for (JsonPairConst pair : filter)
+    {
+        if (true == pair.value().is<JsonObjectConst>())
+        {
+            getJsonValueByFilter(src[pair.key()], filter[pair.key()], value);
+        }
+        else
+        {
+            value = src[pair.key()];
+        }
+
+        /* Break immediately as its assumed that the filter only contains one
+         * single object.
+         */
+        break;
+    }
+}
+
+void GrabViaMqttPlugin::subscribe()
+{
+    MqttService& mqttService = MqttService::getInstance();
+
+    if (false == m_path.isEmpty())
+    {
+        (void)mqttService.subscribe(m_path,
+                                    [this](const String& topic, const uint8_t* payload, size_t size)
+                                    {
+                                        this->mqttTopicCallback(topic, payload, size);
+                                    });
+    }
+}
+
+void GrabViaMqttPlugin::unsubscribe()
+{
+    MqttService& mqttService = MqttService::getInstance();
+
+    if (false == m_path.isEmpty())
+    {
+        mqttService.unsubscribe(m_path);
+    }
+}
+
+void GrabViaMqttPlugin::mqttTopicCallback(const String& topic, const uint8_t* payload, size_t size)
+{
+    const size_t            JSON_DOC_SIZE   = 1024U;
+    DynamicJsonDocument     jsonDoc(JSON_DOC_SIZE);
+    DeserializationError    error           = deserializeJson(jsonDoc, payload, size);
+
+    if (DeserializationError::Ok != error)
+    {
+        LOG_WARNING("MQTT payload contains invalid JSON.");
+    }
+    else
+    {
+        JsonVariantConst jsonValue;
+
+        getJsonValueByFilter(jsonDoc.as<JsonObjectConst>(), m_filter.as<JsonObjectConst>(), jsonValue);
+
+        /* Is it a number? */
+        if ((true == jsonValue.is<float>()) &&
+            (0 > m_format.indexOf("%s"))) /* Prevent mistake which may cause a LoadProhibited core panic by snprintf. */
+        {
+            const size_t    BUFFER_SIZE = 128U;
+            char            buffer[BUFFER_SIZE];
+            float           value = jsonValue.as<float>();
+
+            value *= m_multiplier;
+            value += m_offset;
+
+            (void)snprintf(buffer, sizeof(buffer), m_format.c_str(), value);
+
+            m_textWidgetRight.setFormatStr(buffer);
+            m_textWidgetTextOnly.setFormatStr(buffer);
+        }
+        /* Is it a string? */
+        else if (true == jsonValue.is<String>())
+        {
+            const size_t    BUFFER_SIZE = 40U;
+            char            buffer[BUFFER_SIZE];
+
+            (void)snprintf(buffer, sizeof(buffer), m_format.c_str(), jsonValue.as<String>().c_str());
+
+            m_textWidgetRight.setFormatStr(buffer);
+            m_textWidgetTextOnly.setFormatStr(buffer);
+        }
+        else
+        {
+            m_textWidgetRight.setFormatStr("\\calign-");
+            m_textWidgetTextOnly.setFormatStr("\\calign-");
+        }
+    }
+}
+
+/******************************************************************************
+ * External Functions
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Functions
+ *****************************************************************************/
diff --git a/lib/ShellyPlugSPlugin/src/ShellyPlugSPlugin.h b/lib/GrabViaMqttPlugin/src/GrabViaMqttPlugin.h
similarity index 65%
rename from lib/ShellyPlugSPlugin/src/ShellyPlugSPlugin.h
rename to lib/GrabViaMqttPlugin/src/GrabViaMqttPlugin.h
index b6a27cd4..8e9fbdb3 100644
--- a/lib/ShellyPlugSPlugin/src/ShellyPlugSPlugin.h
+++ b/lib/GrabViaMqttPlugin/src/GrabViaMqttPlugin.h
@@ -1,415 +1,363 @@
-/* MIT License
- *
- * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*******************************************************************************
-    DESCRIPTION
-*******************************************************************************/
-/**
- * @brief  ShellyPlugSPlugin plugin
- * @author Yann Le Glaz <yann_le@web.de>
-
- *
- * @addtogroup plugin
- *
- * @{
- */
-
-#ifndef SHELLYPLUGSPLUGIN_H
-#define SHELLYPLUGSPLUGIN_H
-
-/******************************************************************************
- * Compile Switches
- *****************************************************************************/
-
-/******************************************************************************
- * Includes
- *****************************************************************************/
-#include "AsyncHttpClient.h"
-#include "Plugin.hpp"
-
-#include <WidgetGroup.h>
-#include <BitmapWidget.h>
-#include <stdint.h>
-#include <TextWidget.h>
-#include <SimpleTimer.hpp>
-#include <TaskProxy.hpp>
-#include <Mutex.hpp>
-#include <FileSystem.h>
-
-/******************************************************************************
- * Macros
- *****************************************************************************/
-
-/******************************************************************************
- * Types and Classes
- *****************************************************************************/
-
-/**
- * Shows the current AC power being drawn via a Shelly PlugS, in watts.
- */
-class ShellyPlugSPlugin : public Plugin, private PluginConfigFsHandler
-{
-public:
-
-    /**
-     * Constructs the plugin.
-     *
-     * @param[in] name  Plugin name
-     * @param[in] uid   Unique id
-     */
-    ShellyPlugSPlugin(const String& name, uint16_t uid) :
-        Plugin(name, uid),
-        PluginConfigFsHandler(uid, FILESYSTEM),
-        m_fontType(Fonts::FONT_TYPE_DEFAULT),
-        m_textCanvas(),
-        m_iconCanvas(),
-        m_bitmapWidget(),
-        m_textWidget("?"),
-        m_ipAddress("192.168.1.123"), /* Example data */
-        m_client(),
-        m_mutex(),
-        m_requestTimer(),
-        m_cfgReloadTimer(),
-        m_storeConfigReq(false),
-        m_reloadConfigReq(false),
-        m_hasTopicChanged(false),
-        m_taskProxy()
-    {
-        (void)m_mutex.create();
-    }
-
-    /**
-     * Destroys the plugin.
-     */
-    ~ShellyPlugSPlugin()
-    {
-        m_client.regOnResponse(nullptr);
-        m_client.regOnClosed(nullptr);
-        m_client.regOnError(nullptr);
-
-        /* Abort any pending TCP request to avoid getting a callback after the
-         * object is destroyed.
-         */
-        m_client.end();
-        
-        clearQueue();
-        
-        m_mutex.destroy();
-    }
-
-    /**
-     * Plugin creation method, used to register on the plugin manager.
-     *
-     * @param[in] name  Plugin name
-     * @param[in] uid   Unique id
-     *
-     * @return If successful, it will return the pointer to the plugin instance, otherwise nullptr.
-     */
-    static IPluginMaintenance* create(const String& name, uint16_t uid)
-    {
-        return new ShellyPlugSPlugin(name, uid);
-    }
-
-    /**
-     * Get font type.
-     * 
-     * @return The font type the plugin uses.
-     */
-    Fonts::FontType getFontType() const final
-    {
-        return m_fontType;
-    }
-
-    /**
-     * Set font type.
-     * The plugin may skip the font type in case it gets conflicts with the layout.
-     * 
-     * A font type change will only be considered if it is set before the start()
-     * method is called!
-     * 
-     * @param[in] fontType  The font type which the plugin shall use.
-     */
-    void setFontType(Fonts::FontType fontType) final
-    {
-        m_fontType = fontType;
-        return;
-    }
-
-    /**
-     * Get plugin topics, which can be get/set via different communication
-     * interfaces like REST, websocket, MQTT, etc.
-     * 
-     * Example:
-     * {
-     *     "topics": [
-     *         "/text"
-     *     ]
-     * }
-     * 
-     * By default a topic is readable and writeable.
-     * This can be set explicit with the "access" key with the following possible
-     * values:
-     * - Only readable: "r"
-     * - Only writeable: "w"
-     * - Readable and writeable: "rw"
-     * 
-     * Example:
-     * {
-     *     "topics": [{
-     *         "name": "/text",
-     *         "access": "r"
-     *     }]
-     * }
-     * 
-     * @param[out] topics   Topis in JSON format
-     */
-    void getTopics(JsonArray& topics) const final;
-
-    /**
-     * Get a topic data.
-     * Note, currently only JSON format is supported.
-     * 
-     * @param[in]   topic   The topic which data shall be retrieved.
-     * @param[out]  value   The topic value in JSON format.
-     * 
-     * @return If successful it will return true otherwise false.
-     */
-    bool getTopic(const String& topic, JsonObject& value) const final;
-
-    /**
-     * Set a topic data.
-     * Note, currently only JSON format is supported.
-     * 
-     * @param[in]   topic   The topic which data shall be retrieved.
-     * @param[in]   value   The topic value in JSON format.
-     * 
-     * @return If successful it will return true otherwise false.
-     */
-    bool setTopic(const String& topic, const JsonObject& value) final;
-
-    /**
-     * Is the topic content changed since last time?
-     * Every readable volatile topic shall support this. Otherwise the topic
-     * handlers might not be able to provide updated information.
-     * 
-     * @param[in] topic The topic which to check.
-     * 
-     * @return If the topic content changed since last time, it will return true otherwise false.
-     */
-    bool hasTopicChanged(const String& topic) final;
-    
-    /**
-     * Start the plugin. This is called only once during plugin lifetime.
-     * It can be used as deferred initialization (after the constructor)
-     * and provides the canvas size.
-     * 
-     * If your display layout depends on canvas or font size, calculate it
-     * here.
-     * 
-     * Overwrite it if your plugin needs to know that it was installed.
-     * 
-     * @param[in] width     Display width in pixel
-     * @param[in] height    Display height in pixel
-     */
-    void start(uint16_t width, uint16_t height) final;
-
-   /**
-     * Stop the plugin. This is called only once during plugin lifetime.
-     * It can be used as a first clean-up, before the plugin will be destroyed.
-     * 
-     * Overwrite it if your plugin needs to know that it will be uninstalled.
-     */
-    void stop() final;
-
-    /**
-     * Process the plugin.
-     * Overwrite it if your plugin has cyclic stuff to do without being in a
-     * active slot.
-     * 
-     * @param[in] isConnected   The network connection status. If network
-     *                          connection is established, it will be true otherwise false.
-     */
-    void process(bool isConnected) final;
-
-    /**
-     * Update the display.
-     * The scheduler will call this method periodically.
-     *
-     * @param[in] gfx   Display graphics interface
-     */
-    void update(YAGfx& gfx) final;
-
-    /**
-     * Get ip-address.
-     * 
-     * @return IP-address
-     */
-    String getIPAddress() const;
-
-    /**
-     * Set ip-address.
-     * 
-     * @param[in] ipAddress IP-address
-     */
-    void setIPAddress(const String& ipAddress);
-
-private:
-
-    /**
-     * Icon width in pixels.
-     */
-    static const int16_t    ICON_WIDTH          = 8;
-
-    /**
-     * Icon height in pixels.
-     */
-    static const int16_t    ICON_HEIGHT         = 8;
-
-    /**
-     * Image path within the filesystem.
-     */
-    static const char*      IMAGE_PATH;
-
-    /**
-     * Plugin topic, used to read/write the configuration.
-     */
-    static const char*      TOPIC_CONFIG;
-
-    /**
-     * Period in ms for requesting power consumption from the Shelly PlugS.
-     * This is used in case the last request to the server was successful.
-     */
-    static const uint32_t   UPDATE_PERIOD       = SIMPLE_TIMER_SECONDS(15U);
-
-    /**
-     * Short period in ms for requesting power consumption from the Shelly PlugS.
-     * This is used in case the request to the server failed.
-     */
-    static const uint32_t   UPDATE_PERIOD_SHORT = SIMPLE_TIMER_SECONDS(10U);
-
-    /**
-     * The configuration in the persistent memory shall be cyclic loaded.
-     * This mechanism ensure that manual changes in the file are considered.
-     * This is the reload period in ms.
-     */
-    static const uint32_t   CFG_RELOAD_PERIOD   = SIMPLE_TIMER_SECONDS(30U);
-
-    Fonts::FontType         m_fontType;         /**< Font type which shall be used if there is no conflict with the layout. */
-    WidgetGroup             m_textCanvas;       /**< Canvas used for the text widget. */
-    WidgetGroup             m_iconCanvas;       /**< Canvas used for the bitmap widget. */
-    BitmapWidget            m_bitmapWidget;     /**< Bitmap widget, used to show the icon. */
-    TextWidget              m_textWidget;       /**< Text widget, used for showing the text. */
-    String                  m_ipAddress;        /**< IP-address of the ShellyPlugS server. */
-    AsyncHttpClient         m_client;           /**< Asynchronous HTTP client. */
-    mutable MutexRecursive  m_mutex;            /**< Mutex to protect against concurrent access. */
-    SimpleTimer             m_requestTimer;     /**< Timer is used for cyclic ShellyPlugS  http request. */
-    SimpleTimer             m_cfgReloadTimer;   /**< Timer is used to cyclic reload the configuration from persistent memory. */
-    bool                    m_storeConfigReq;   /**< Is requested to store the configuration in persistent memory? */
-    bool                    m_reloadConfigReq;  /**< Is requested to reload the configuration from persistent memory? */
-    bool                    m_hasTopicChanged;  /**< Has the topic content changed? */
-
-    /**
-     * Defines the message types, which are necessary for HTTP client/server handling.
-     */
-    enum MsgType
-    {
-        MSG_TYPE_INVALID = 0,   /**< Invalid message type. */
-        MSG_TYPE_RSP            /**< A response, caused by a previous request. */
-    };
-
-    /**
-     * A message for HTTP client/server handling.
-     */
-    struct Msg
-    {
-        MsgType                 type;   /**< Message type */
-        DynamicJsonDocument*    rsp;    /**< Response, only valid if message type is a response. */
-
-        /**
-         * Constructs a message.
-         */
-        Msg() :
-            type(MSG_TYPE_INVALID),
-            rsp(nullptr)
-        {
-        }
-    }; 
-
-    /**
-     * Task proxy used to decouple server responses, which happen in a different task context.
-     */
-    TaskProxy<Msg, 2U, 0U> m_taskProxy;
-
-    /**
-     * Request to store configuration to persistent memory.
-     */
-    void requestStoreToPersistentMemory();
-
-    /**
-     * Get configuration in JSON.
-     * 
-     * @param[out] cfg  Configuration
-     */
-    void getConfiguration(JsonObject& cfg) const final;
-
-    /**
-     * Set configuration in JSON.
-     * 
-     * @param[in] cfg   Configuration
-     * 
-     * @return If successful set, it will return true otherwise false.
-     */
-    bool setConfiguration(JsonObjectConst& cfg) final;
-
-    /**
-     * Request new data.
-     *
-     * @return If successful it will return true otherwise false.
-     */
-    bool startHttpRequest(void);
-
-    /**
-     * Register callback function on response reception.
-     */
-    void initHttpClient(void);
-
-    /**
-     * Handle a web response from the server.
-     * 
-     * @param[in] jsonDoc   Web response as JSON document
-     */
-    void handleWebResponse(DynamicJsonDocument& jsonDoc);
-
-    /**
-     * Clear the task proxy queue.
-     */
-    void clearQueue();
-};
-
-/******************************************************************************
- * Functions
- *****************************************************************************/
-
-#endif  /* SHELLYPLUGSPLUGIN_H */
-
-/** @} */
\ No newline at end of file
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  Grab information via REST API plugin
+ * @author Andreas Merkle <web@blue-andi.de>
+ *
+ * @addtogroup plugin
+ *
+ * @{
+ */
+
+#ifndef GRAB_VIA_REST_PLUGIN_H
+#define GRAB_VIA_REST_PLUGIN_H
+
+/******************************************************************************
+ * Compile Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include <stdint.h>
+#include "Plugin.hpp"
+
+#include <WidgetGroup.h>
+#include <BitmapWidget.h>
+#include <TextWidget.h>
+#include <Mutex.hpp>
+#include <FileSystem.h>
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and Classes
+ *****************************************************************************/
+
+/**
+ * Grab information from a MQTT broker and display it.
+ */
+class GrabViaMqttPlugin : public Plugin, private PluginConfigFsHandler
+{
+public:
+
+    /**
+     * Constructs the plugin.
+     *
+     * @param[in] name  Plugin name
+     * @param[in] uid   Unique id
+     */
+    GrabViaMqttPlugin(const String& name, uint16_t uid) :
+        Plugin(name, uid),
+        PluginConfigFsHandler(uid, FILESYSTEM),
+        m_fontType(Fonts::FONT_TYPE_DEFAULT),
+        m_layoutRight(),
+        m_layoutLeft(),
+        m_layoutTextOnly(),
+        m_iconWidget(),
+        m_textWidgetRight("\\calign?"),
+        m_textWidgetTextOnly("\\calign?"),
+        m_path(),
+        m_filter(1024U),
+        m_iconPath(),
+        m_format("%s"),
+        m_multiplier(1.0f),
+        m_offset(0.0f),
+        m_mutex(),
+        m_cfgReloadTimer(),
+        m_storeConfigReq(false),
+        m_reloadConfigReq(false),
+        m_hasTopicChanged(false)
+    {
+        (void)m_mutex.create();
+    }
+
+    /**
+     * Destroys the plugin.
+     */
+    ~GrabViaMqttPlugin()
+    {
+        m_mutex.destroy();
+    }
+
+    /**
+     * Plugin creation method, used to register on the plugin manager.
+     *
+     * @param[in] name  Plugin name
+     * @param[in] uid   Unique id
+     *
+     * @return If successful, it will return the pointer to the plugin instance, otherwise nullptr.
+     */
+    static IPluginMaintenance* create(const String& name, uint16_t uid)
+    {
+        return new(std::nothrow)GrabViaMqttPlugin(name, uid);
+    }
+
+    /**
+     * Get font type.
+     * 
+     * @return The font type the plugin uses.
+     */
+    Fonts::FontType getFontType() const final
+    {
+        return m_fontType;
+    }
+
+    /**
+     * Set font type.
+     * The plugin may skip the font type in case it gets conflicts with the layout.
+     * 
+     * A font type change will only be considered if it is set before the start()
+     * method is called!
+     * 
+     * @param[in] fontType  The font type which the plugin shall use.
+     */
+    void setFontType(Fonts::FontType fontType) final
+    {
+        m_fontType = fontType;
+        return;
+    }
+
+    /**
+     * Get plugin topics, which can be get/set via different communication
+     * interfaces like REST, websocket, MQTT, etc.
+     * 
+     * Example:
+     * {
+     *     "topics": [
+     *         "/text"
+     *     ]
+     * }
+     * 
+     * By default a topic is readable and writeable.
+     * This can be set explicit with the "access" key with the following possible
+     * values:
+     * - Only readable: "r"
+     * - Only writeable: "w"
+     * - Readable and writeable: "rw"
+     * 
+     * Example:
+     * {
+     *     "topics": [{
+     *         "name": "/text",
+     *         "access": "r"
+     *     }]
+     * }
+     * 
+     * @param[out] topics   Topis in JSON format
+     */
+    void getTopics(JsonArray& topics) const final;
+
+    /**
+     * Get a topic data.
+     * Note, currently only JSON format is supported.
+     * 
+     * @param[in]   topic   The topic which data shall be retrieved.
+     * @param[out]  value   The topic value in JSON format.
+     * 
+     * @return If successful it will return true otherwise false.
+     */
+    bool getTopic(const String& topic, JsonObject& value) const final;
+
+    /**
+     * Set a topic data.
+     * Note, currently only JSON format is supported.
+     * 
+     * @param[in]   topic   The topic which data shall be retrieved.
+     * @param[in]   value   The topic value in JSON format.
+     * 
+     * @return If successful it will return true otherwise false.
+     */
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
+
+    /**
+     * Is the topic content changed since last time?
+     * Every readable volatile topic shall support this. Otherwise the topic
+     * handlers might not be able to provide updated information.
+     * 
+     * @param[in] topic The topic which to check.
+     * 
+     * @return If the topic content changed since last time, it will return true otherwise false.
+     */
+    bool hasTopicChanged(const String& topic) final;
+    
+    /**
+     * Start the plugin. This is called only once during plugin lifetime.
+     * It can be used as deferred initialization (after the constructor)
+     * and provides the canvas size.
+     * 
+     * If your display layout depends on canvas or font size, calculate it
+     * here.
+     * 
+     * Overwrite it if your plugin needs to know that it was installed.
+     * 
+     * @param[in] width     Display width in pixel
+     * @param[in] height    Display height in pixel
+     */
+    void start(uint16_t width, uint16_t height) final;
+
+    /**
+     * Stop the plugin. This is called only once during plugin lifetime.
+     * It can be used as a first clean-up, before the plugin will be destroyed.
+     * 
+     * Overwrite it if your plugin needs to know that it will be uninstalled.
+     */
+    void stop() final;
+
+    /**
+     * Process the plugin.
+     * Overwrite it if your plugin has cyclic stuff to do without being in a
+     * active slot.
+     * 
+     * @param[in] isConnected   The network connection status. If network
+     *                          connection is established, it will be true otherwise false.
+     */
+    void process(bool isConnected) final;
+
+    /**
+     * Update the display.
+     * The scheduler will call this method periodically.
+     *
+     * @param[in] gfx   Display graphics interface
+     */
+    void update(YAGfx& gfx) final;
+
+private:
+
+    /**
+     * Icon width in pixels.
+     */
+    static const uint16_t   ICON_WIDTH          = 8U;
+
+    /**
+     * Icon height in pixels.
+     */
+    static const uint16_t   ICON_HEIGHT         = 8U;
+
+    /**
+     * Plugin topic, used to read/write the configuration.
+     */
+    static const char*      TOPIC_CONFIG;
+
+    /**
+     * The configuration in the persistent memory shall be cyclic loaded.
+     * This mechanism ensure that manual changes in the file are considered.
+     * This is the reload period in ms.
+     */
+    static const uint32_t   CFG_RELOAD_PERIOD   = SIMPLE_TIMER_SECONDS(30U);
+
+    Fonts::FontType         m_fontType;             /**< Font type which shall be used if there is no conflict with the layout. */
+    WidgetGroup             m_layoutRight;          /**< Canvas used for the text widget in a layout with icon on the left side. */
+    WidgetGroup             m_layoutLeft;           /**< Canvas used for the bitmap widget in a layout with text on the right side. */
+    WidgetGroup             m_layoutTextOnly;       /**< Canvas used in case only text is shown. */
+    BitmapWidget            m_iconWidget;           /**< Bitmap widget, used to show the icon. */
+    TextWidget              m_textWidgetRight;      /**< Text widget, used in layout with icon. */
+    TextWidget              m_textWidgetTextOnly;   /**< Text widget, used in layout without icon. */
+    String                  m_path;                 /**< MQTT topic path */
+    DynamicJsonDocument     m_filter;               /**< Filter used for the response in JSON format. */
+    String                  m_iconPath;             /**< Icon filename with path. */
+    String                  m_format;               /**< Format used to embed the retrieved filtered value. */
+    float                   m_multiplier;           /**< If grabbed value is a number, it will be multiplied with the multiplier. */
+    float                   m_offset;               /**< If grabbed value is a number, the offset will be added after the multiplication with the multiplier. */
+    mutable MutexRecursive  m_mutex;                /**< Mutex to protect against concurrent access. */
+    SimpleTimer             m_cfgReloadTimer;       /**< Timer is used to cyclic reload the configuration from persistent memory. */
+    bool                    m_storeConfigReq;       /**< Is requested to store the configuration in persistent memory? */
+    bool                    m_reloadConfigReq;      /**< Is requested to reload the configuration from persistent memory? */
+    bool                    m_hasTopicChanged;      /**< Has the topic content changed? */
+
+    /**
+     * Request to store configuration to persistent memory.
+     */
+    void requestStoreToPersistentMemory();
+
+    /**
+     * Get configuration in JSON.
+     * 
+     * @param[out] cfg  Configuration
+     */
+    void getConfiguration(JsonObject& cfg) const final;
+
+    /**
+     * Set configuration in JSON.
+     * 
+     * @param[in] cfg   Configuration
+     * 
+     * @return If successful set, it will return true otherwise false.
+     */
+    bool setConfiguration(JsonObjectConst& cfg) final;
+
+    /**
+     * Request new data.
+     * 
+     * @return If successful it will return true otherwise false.
+     */
+    bool startHttpRequest(void);
+
+    /**
+     * Get value from JSON source by the filter.
+     * 
+     * @param[in]   src     Source in JSON format
+     * @param[in]   filter  Filter in JSON format
+     * @param[out]  value   Value in JSON format
+     */
+    void getJsonValueByFilter(JsonObjectConst src, JsonObjectConst filter, JsonVariantConst& value);
+
+    /**
+     * Clear the task proxy queue.
+     */
+    void clearQueue();
+
+    /**
+     * Subscribe MQTT topic to be informed about value changes.
+     */
+    void subscribe();
+
+    /**
+     * Unsubscribe MQTT topic to stop on change notifications.
+     */
+    void unsubscribe();
+
+    /**
+     * The MQTT callback is registered by subscription and will be called on change by
+     * the MQTT service.
+     * 
+     * @param[in] topic     Topic
+     * @param[in] payload   Topic payload
+     * @param[in] size      Topic payload size in byte
+     */
+    void mqttTopicCallback(const String& topic, const uint8_t* payload, size_t size);
+};
+
+/******************************************************************************
+ * Functions
+ *****************************************************************************/
+
+#endif  /* GRAB_VIA_REST_PLUGIN_H */
+
+/** @} */
diff --git a/lib/GithubPlugin/web/GithubPlugin.html b/lib/GrabViaMqttPlugin/web/GrabViaMqttPlugin.html
similarity index 65%
rename from lib/GithubPlugin/web/GithubPlugin.html
rename to lib/GrabViaMqttPlugin/web/GrabViaMqttPlugin.html
index 98c0de08..39f8a67c 100644
--- a/lib/GithubPlugin/web/GithubPlugin.html
+++ b/lib/GrabViaMqttPlugin/web/GrabViaMqttPlugin.html
@@ -32,21 +32,26 @@
         <!-- Begin page content -->
         <main role="main" class="flex-shrink-0">
             <div class="container">
-                <h1 class="mt-5">GithubPlugin</h1>
-                <p><img src="GithubPlugin.jpg" alt="Screenshot" /></p>
-                <p>The plugin shows the stargazers count of a github repository.</p>
+                <h1 class="mt-5">GrabViaMqttPlugin</h1>
+                <p><img src="GrabViaMqttPlugin.jpg" alt="Screenshot" /></p>
+                <p>The plugin can grab information in JSON format via MQTT and shows it on the display.</p>
                 <h2 class="mt-1">REST API</h2>
-                <h3 class="mt-1">Get github user and repository name</h3>
-                <pre name="injectOrigin" class="text-light"><code>GET {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/github</code></pre>
-                <h3 class="mt-1">Set github user and/or repository name</h3>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/github?user=&lt;USER&gt;&repository=&lt;REPOSITORY&gt;</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/github?user=&lt;USER&gt;&repository=&lt;REPOSITORY&gt;</code></pre>
+                <h3 class="mt-1">Get configuration</h3>
+                <pre name="injectOrigin" class="text-light"><code>GET {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/grabConfig</code></pre>
+                <h3 class="mt-1">Set configuration</h3>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/grabConfig?path=&lt;PATH&gt;&filter=&lt;FILTER&gt;&iconPath=&lt;ICON-PATH&gt;&format=&lt;FORMAT&gt;&MULTIPLIER=&lt;MULTIPLIER&gt;&OFFSET=&lt;OFFSET&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/grabConfig?path=&lt;PATH&gt;&filter=&lt;FILTER&gt;&iconPath=&lt;ICON-PATH&gt;&format=&lt;FORMAT&gt;&MULTIPLIER=&lt;MULTIPLIER&gt;&OFFSET=&lt;OFFSET&gt;</code></pre>
                 <ul>
                     <li>PLUGIN-UID: The plugin unique id.</li>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
-                    <li>USER: The name of the user who owns the repository.</li>
-                    <li>REPOSITORY: The name of the repository.</li>
+                    <li>PATH: MQTT topic path.</li>
+                    <li>FILTER: Filter to identify the value in the JSON response. See the details here: <a href="https://arduinojson.org/news/2020/03/22/version-6-15-0/" target="_blank">ArduinoJson 6.15: Filtering done right</a></li>
+                    <li>ICON-PATH: Filename of the icon including the path.</li>
+                    <li>FORMAT: Format specifier, e.g. "%s" for strings or "%f" for numbers.</li>
+                    <li>MULTIPLIER: Number which is multiplied with a number value. Not used for string values.</li>
+                    <li>OFFSET: Number which is added to a number value. Not used for string values.</li>
                 </ul>
+                <p><a href="https://github.com/BlueAndi/esp-rgb-led-matrix/tree/Development/doc/grabConfigs/mqtt" target="_blank">Configuration examples</a> may help to configure.</p>
                 <h2 class="mt-2">Configuration</h2>
                 <h3 class="mt-1">User</h3>
                 <form id="myForm" action="javascript:setConfig(pluginUid.options[pluginUid.selectedIndex].value)">
@@ -56,15 +61,31 @@ <h3 class="mt-1">User</h3>
                         </select>    
                     </div>
                     <div class="form-group">
-                        <label for="user">User name:</label>
-                        <input type="text" id="user" name="user" value="BlueAndi" />    
+                        <label for="path">Path:</label>
+                        <input type="text" id="path" name="path" value="" size="80" />    
                     </div>
                     <div class="form-group">
-                        <label for="repository">Repository name:</label>
-                        <input type="text" id="repository" name="repository" value="esp-rgb-led-matrix" />    
-                    </div>                    
+                        <label for="filter">Filter:</label>
+                        <input type="text" id="filter" name="filter" value="null" size="80" />
+                    </div>
+                    <div class="form-group">
+                        <label for="iconPath">ICON path:</label>
+                        <input type="text" id="iconPath" name="iconPath" value="" size="80"/>
+                    </div>
+                    <div class="form-group">
+                        <label for="format">Format:</label>
+                        <input type="text" id="format" name="format" value="%s" maxlength="40" />
+                    </div>
+                    <div class="form-group">
+                        <label for="multiplier">Multiplier:</label>
+                        <input type="number" id="multiplier" name="multiplier" value="1" />    
+                    </div>
+                    <div class="form-group">
+                        <label for="offset">Offset:</label>
+                        <input type="number" id="offset" name="offset" value="0" />    
+                    </div>
                     <input name="submit" type="submit" value="Update"/>
-                </form>       
+                </form>
             </div>
         </main>
   
@@ -90,7 +111,7 @@ <h3 class="mt-1">User</h3>
 
         <script>
 
-            var pluginName  = "GithubPlugin";
+            var pluginName  = "GrabViaMqttPlugin";
             var restClient  = new pixelix.rest.Client();
     
             function enableUI() {
@@ -143,11 +164,15 @@ <h3 class="mt-1">User</h3>
                 disableUI();
                 return utils.makeRequest({
                     method: "GET",
-                    url: "/rest/api/v1/display/uid/" + pluginUid + "/github",
+                    url: "/rest/api/v1/display/uid/" + pluginUid + "/grabConfig",
                     isJsonResponse: true
                 }).then(function(rsp) {
-                    $("#user").val(rsp.data.user);
-                    $("#repository").val(rsp.data.repository);
+                    $("#path").val(rsp.data.path);
+                    $("#filter").val(JSON.stringify(rsp.data.filter));
+                    $("#iconPath").val(rsp.data.iconPath);
+                    $("#format").val(rsp.data.format);
+                    $("#multiplier").val(rsp.data.multiplier);
+                    $("#offset").val(rsp.data.offset);
                 }).catch(function(rsp) {
                     alert("Internal error.");
                 }).finally(function() {
@@ -160,11 +185,15 @@ <h3 class="mt-1">User</h3>
 
                 return utils.makeRequest({
                     method: "POST",
-                    url: "/rest/api/v1/display/uid/" + pluginUid + "/github",
+                    url: "/rest/api/v1/display/uid/" + pluginUid + "/grabConfig",
                     isJsonResponse: true,
                     parameter: {
-                        user:  $("#user").val(),
-                        repository: $("#repository").val()
+                        path:  $("#path").val(),
+                        filter: $("#filter").val(),
+                        iconPath: $("#iconPath").val(),
+                        format: $("#format").val(),
+                        multiplier: $("#multiplier").val(),
+                        offset: $("#offset").val()
                     }
                 }).then(function(rsp) {
                     alert("Ok.");
diff --git a/lib/GrabViaMqttPlugin/web/GrabViaMqttPlugin.jpg b/lib/GrabViaMqttPlugin/web/GrabViaMqttPlugin.jpg
new file mode 100644
index 00000000..c4a5e2ae
Binary files /dev/null and b/lib/GrabViaMqttPlugin/web/GrabViaMqttPlugin.jpg differ
diff --git a/lib/GithubPlugin/library.json b/lib/GrabViaRestPlugin/library.json
similarity index 88%
rename from lib/GithubPlugin/library.json
rename to lib/GrabViaRestPlugin/library.json
index 38605d28..6499b988 100644
--- a/lib/GithubPlugin/library.json
+++ b/lib/GrabViaRestPlugin/library.json
@@ -1,5 +1,5 @@
 {
-    "name": "GithubPlugin",
+    "name": "GrabViaRestPlugin",
     "version": "0.1.0",
     "description": "....",
     "authors": [{
diff --git a/lib/GrabViaRestPlugin/src/GrabViaRestPlugin.cpp b/lib/GrabViaRestPlugin/src/GrabViaRestPlugin.cpp
new file mode 100644
index 00000000..54e5c08d
--- /dev/null
+++ b/lib/GrabViaRestPlugin/src/GrabViaRestPlugin.cpp
@@ -0,0 +1,759 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  Grab information via MQTT plugin
+ * @author Andreas Merkle <web@blue-andi.de>
+ */
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "GrabViaRestPlugin.h"
+
+#include <Logging.h>
+#include <ArduinoJson.h>
+#include <HttpStatus.h>
+
+/******************************************************************************
+ * Compiler Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and classes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Prototypes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Variables
+ *****************************************************************************/
+
+/* Initialize plugin topic. */
+const char* GrabViaRestPlugin::TOPIC_CONFIG = "/grabConfig";
+
+/******************************************************************************
+ * Public Methods
+ *****************************************************************************/
+
+void GrabViaRestPlugin::getTopics(JsonArray& topics) const
+{
+    (void)topics.add(TOPIC_CONFIG);
+}
+
+bool GrabViaRestPlugin::getTopic(const String& topic, JsonObject& value) const
+{
+    bool isSuccessful = false;
+
+    if (0U != topic.equals(TOPIC_CONFIG))
+    {
+        getConfiguration(value);
+        isSuccessful = true;
+    }
+
+    return isSuccessful;
+}
+
+bool GrabViaRestPlugin::setTopic(const String& topic, const JsonObjectConst& value)
+{
+    bool isSuccessful = false;
+
+    if (0U != topic.equals(TOPIC_CONFIG))
+    {
+        const size_t        JSON_DOC_SIZE           = 1024U;
+        DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
+        JsonObject          jsonCfg                 = jsonDoc.to<JsonObject>();
+        JsonVariantConst    jsonMethod              = value["method"];
+        JsonVariantConst    jsonUrl                 = value["url"];
+        JsonVariantConst    jsonFilter              = value["filter"];
+        JsonVariantConst    jsonIconPath            = value["iconPath"];
+        JsonVariantConst    jsonFormat              = value["format"];
+        JsonVariantConst    jsonMultiplier          = value["multiplier"];
+        JsonVariantConst    jsonOffset              = value["offset"];
+
+        /* The received configuration may not contain all single key/value pair.
+         * Therefore read first the complete internal configuration and
+         * overwrite them with the received ones.
+         */
+        getConfiguration(jsonCfg);
+
+        /* Note:
+         * Check only for the key/value pair availability.
+         * The type check will follow in the setConfiguration().
+         */
+
+        if (false == jsonMethod.isNull())
+        {
+            jsonCfg["method"] = jsonMethod.as<String>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonUrl.isNull())
+        {
+            jsonCfg["url"] = jsonUrl.as<String>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonFilter.isNull())
+        {
+            if (true == jsonFilter.is<JsonObjectConst>())
+            {
+                jsonCfg["filter"] = jsonFilter.as<JsonObjectConst>();
+                isSuccessful = true;
+            }
+            else if (true == jsonFilter.is<String>())
+            {
+                const size_t            JSON_DOC_FILTER_SIZE    = 256U;
+                DynamicJsonDocument     jsonDocFilter(JSON_DOC_FILTER_SIZE);
+                DeserializationError    result = deserializeJson(jsonDocFilter, jsonFilter.as<String>());
+
+                if (DeserializationError::Ok == result)
+                {
+                    jsonCfg["filter"] = jsonDocFilter.as<JsonObjectConst>();
+                    isSuccessful = true;
+                }
+            }
+            else
+            {
+                ;
+            }
+        }
+
+        if (false == jsonIconPath.isNull())
+        {
+            jsonCfg["iconPath"] = jsonIconPath.as<String>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonFormat.isNull())
+        {
+            jsonCfg["format"] = jsonFormat.as<String>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonMultiplier.isNull())
+        {
+            jsonCfg["multiplier"] = jsonMultiplier.as<float>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonOffset.isNull())
+        {
+            jsonCfg["offset"] = jsonOffset.as<float>();
+            isSuccessful = true;
+        }
+
+        if (true == isSuccessful)
+        {
+            JsonObjectConst jsonCfgConst = jsonCfg;
+
+            isSuccessful = setConfiguration(jsonCfgConst);
+
+            if (true == isSuccessful)
+            {
+                requestStoreToPersistentMemory();
+            }
+        }
+    }
+
+    return isSuccessful;
+}
+
+bool GrabViaRestPlugin::hasTopicChanged(const String& topic)
+{
+    MutexGuard<MutexRecursive>  guard(m_mutex);
+    bool                        hasTopicChanged = m_hasTopicChanged;
+
+    /* Only a single topic, therefore its not necessary to check. */
+    PLUGIN_NOT_USED(topic);
+
+    m_hasTopicChanged = false;
+
+    return hasTopicChanged;
+}
+
+void GrabViaRestPlugin::start(uint16_t width, uint16_t height)
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    m_layoutLeft.setPosAndSize(0, 0, ICON_WIDTH, ICON_HEIGHT);
+    (void)m_layoutLeft.addWidget(m_iconWidget);
+
+    /* The text canvas is left aligned to the icon canvas and it spans over
+     * the whole display height.
+     */
+    m_layoutRight.setPosAndSize(ICON_WIDTH, 0, width - ICON_WIDTH, height);
+    (void)m_layoutRight.addWidget(m_textWidgetRight);
+
+    /* If only text is used, it will span over the whole display. */
+    m_layoutTextOnly.setPosAndSize(0, 0, width, height);
+    (void)m_layoutTextOnly.addWidget(m_textWidgetTextOnly);
+
+    /* Choose font. */
+    m_textWidgetRight.setFont(Fonts::getFontByType(m_fontType));
+    m_textWidgetTextOnly.setFont(Fonts::getFontByType(m_fontType));
+
+    /* The text widget inside the text canvas is left aligned on x-axis and
+     * aligned to the center of y-axis.
+     */
+    if (height > m_textWidgetRight.getFont().getHeight())
+    {
+        uint16_t diffY = height - m_textWidgetRight.getFont().getHeight();
+        uint16_t offsY = diffY / 2U;
+
+        m_textWidgetRight.move(0, offsY);
+        m_textWidgetTextOnly.move(0, offsY);
+    }
+
+    /* Try to load configuration. If there is no configuration available, a default configuration
+     * will be created.
+     */
+    if (false == loadConfiguration())
+    {
+        if (false == saveConfiguration())
+        {
+            LOG_WARNING("Failed to create initial configuration file %s.", getFullPathToConfiguration().c_str());
+        }
+    }
+    else
+    {
+        /* Remember current timestamp to detect updates of the configuration in the
+         * filesystem without using the plugin API.
+         */
+        updateTimestampLastUpdate();
+    }
+
+    if (false == m_iconPath.isEmpty())
+    {
+        (void)m_iconWidget.load(FILESYSTEM, m_iconPath);
+    }
+
+    m_cfgReloadTimer.start(CFG_RELOAD_PERIOD);
+
+    initHttpClient();
+}
+
+void GrabViaRestPlugin::stop()
+{
+    String                      configurationFilename = getFullPathToConfiguration();
+    MutexGuard<MutexRecursive>  guard(m_mutex);
+
+    m_cfgReloadTimer.stop();
+    m_requestTimer.stop();
+
+    if (false != FILESYSTEM.remove(configurationFilename))
+    {
+        LOG_INFO("File %s removed", configurationFilename.c_str());
+    }
+}
+
+void GrabViaRestPlugin::process(bool isConnected)
+{
+    Msg                         msg;
+    MutexGuard<MutexRecursive>  guard(m_mutex);
+
+    /* Configuration in persistent memory updated? */
+    if ((true == m_cfgReloadTimer.isTimerRunning()) &&
+        (true == m_cfgReloadTimer.isTimeout()))
+    {
+        if (true == isConfigurationUpdated())
+        {
+            m_reloadConfigReq = true;
+        }
+
+        m_cfgReloadTimer.restart();
+    }
+
+    if (true == m_storeConfigReq)
+    {
+        if (false == saveConfiguration())
+        {
+            LOG_WARNING("Failed to save configuration: %s", getFullPathToConfiguration().c_str());
+        }
+
+        m_storeConfigReq = false;
+    }
+    else if (true == m_reloadConfigReq)
+    {
+        LOG_INFO("Reload configuration: %s", getFullPathToConfiguration().c_str());
+
+        if (true == loadConfiguration())
+        {
+            updateTimestampLastUpdate();
+        }
+
+        m_reloadConfigReq = false;
+    }
+    else
+    {
+        ;
+    }
+
+    /* Only if a network connection is established the required information
+     * shall be periodically requested via REST API.
+     */
+    if (false == m_requestTimer.isTimerRunning())
+    {
+        if (true == isConnected)
+        {
+            if (false == startHttpRequest())
+            {
+                /* If a request fails, a '?' will be shown. */
+                m_textWidgetRight.setFormatStr("\\calign?");
+                m_textWidgetTextOnly.setFormatStr("\\calign?");
+
+                m_requestTimer.start(UPDATE_PERIOD_SHORT);
+            }
+            else
+            {
+                m_requestTimer.start(UPDATE_PERIOD);
+            }
+        }
+    }
+    else
+    {
+        /* If the connection is lost, stop periodically requesting information
+         * via REST API.
+         */
+        if (false == isConnected)
+        {
+            m_requestTimer.stop();
+        }
+        /* Network connection is available and next request may be necessary for
+         * information update.
+         */
+        else if (true == m_requestTimer.isTimeout())
+        {
+            if (false == startHttpRequest())
+            {
+                /* If a request fails, a '?' will be shown. */
+                m_textWidgetRight.setFormatStr("\\calign?");
+                m_textWidgetTextOnly.setFormatStr("\\calign?");
+
+                m_requestTimer.start(UPDATE_PERIOD_SHORT);
+            }
+            else
+            {
+                m_requestTimer.start(UPDATE_PERIOD);
+            }
+        }
+    }
+
+    if (true == m_taskProxy.receive(msg))
+    {
+        switch(msg.type)
+        {
+        case MSG_TYPE_INVALID:
+            /* Should never happen. */
+            break;
+
+        case MSG_TYPE_RSP:
+            if (nullptr != msg.rsp)
+            {
+                handleWebResponse(*msg.rsp);
+                delete msg.rsp;
+                msg.rsp = nullptr;
+            }
+            break;
+
+        case MSG_TYPE_CONN_CLOSED:
+            LOG_INFO("Connection closed.");
+
+            if (true == m_isConnectionError)
+            {
+                /* If a request fails, show standard icon and a '?' */
+                m_textWidgetRight.setFormatStr("\\calign?");
+                m_textWidgetTextOnly.setFormatStr("\\calign?");
+
+                m_requestTimer.start(UPDATE_PERIOD_SHORT);
+            }
+            m_isConnectionError = false;
+            break;
+
+        case MSG_TYPE_CONN_ERROR:
+            LOG_WARNING("Connection error.");
+            m_isConnectionError = true;
+            break;
+
+        default:
+            /* Should never happen. */
+            break;
+        }
+    }
+}
+
+void GrabViaRestPlugin::update(YAGfx& gfx)
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    gfx.fillScreen(ColorDef::BLACK);
+
+    /* If a icon is available, the icon/text layout will be used otherwise the text only layout. */
+    if (false == m_iconPath.isEmpty())
+    {
+        m_layoutLeft.update(gfx);
+        m_layoutRight.update(gfx);
+    }
+    else
+    {
+        m_layoutTextOnly.update(gfx);
+    }
+}
+
+/******************************************************************************
+ * Protected Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Private Methods
+ *****************************************************************************/
+
+void GrabViaRestPlugin::requestStoreToPersistentMemory()
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    m_storeConfigReq = true;
+}
+
+void GrabViaRestPlugin::getConfiguration(JsonObject& jsonCfg) const
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    jsonCfg["method"]       = m_method;
+    jsonCfg["url"]          = m_url;
+    jsonCfg["filter"]       = m_filter;
+    jsonCfg["iconPath"]     = m_iconPath;
+    jsonCfg["format"]       = m_format;
+    jsonCfg["multiplier"]   = m_multiplier;
+    jsonCfg["offset"]       = m_offset;
+}
+
+bool GrabViaRestPlugin::setConfiguration(JsonObjectConst& jsonCfg)
+{
+    bool                status          = false;
+    JsonVariantConst    jsonMethod      = jsonCfg["method"];
+    JsonVariantConst    jsonUrl         = jsonCfg["url"];
+    JsonVariantConst    jsonFilter      = jsonCfg["filter"];
+    JsonVariantConst    jsonIconPath    = jsonCfg["iconPath"];
+    JsonVariantConst    jsonFormat      = jsonCfg["format"];
+    JsonVariantConst    jsonMultiplier  = jsonCfg["multiplier"];
+    JsonVariantConst    jsonOffset      = jsonCfg["offset"];
+
+    if (false == jsonMethod.is<String>())
+    {
+        LOG_WARNING("JSON method not found or invalid type.");
+    }
+    else if (false == jsonUrl.is<String>())
+    {
+        LOG_WARNING("JSON URL not found or invalid type.");
+    }
+    else if (false == jsonFilter.is<JsonObjectConst>())
+    {
+        LOG_WARNING("JSON filter not found or invalid type.");
+    }
+    else if (false == jsonIconPath.is<String>())
+    {
+        LOG_WARNING("JSON icon path not found or invalid type.");
+    }
+    else if (false == jsonFormat.is<String>())
+    {
+        LOG_WARNING("JSON format not found or invalid type.");
+    }
+    else if (false == jsonMultiplier.is<float>())
+    {
+        LOG_WARNING("JSON multiplier not found or invalid type.");
+    }
+    else if (false == jsonOffset.is<float>())
+    {
+        LOG_WARNING("JSON offset not found or invalid type.");
+    }
+    else
+    {
+        bool                        reqIcon = false;
+        MutexGuard<MutexRecursive>  guard(m_mutex);
+
+        if (m_iconPath != jsonIconPath.as<String>())
+        {
+            reqIcon = true;
+        }
+
+        m_method        = jsonMethod.as<String>();
+        m_url           = jsonUrl.as<String>();
+        m_filter        = jsonFilter.as<JsonObjectConst>();
+        m_iconPath      = jsonIconPath.as<String>();
+        m_format        = jsonFormat.as<String>();
+        m_multiplier    = jsonMultiplier.as<float>();
+        m_offset        = jsonOffset.as<float>();
+
+        /* Force update on display */
+        m_requestTimer.start(UPDATE_PERIOD_SHORT);
+
+        /* Load icon immediately */
+        if (true == reqIcon)
+        {
+            if (true == m_iconPath.endsWith(".sprite"))
+            {
+                String textureFileName = m_iconPath;
+
+                textureFileName.replace(".sprite", ".bmp");
+
+                if (false == m_iconWidget.loadSpriteSheet(FILESYSTEM, m_iconPath, textureFileName))
+                {
+                    LOG_WARNING("Failed to load animation %s / %s.", m_iconPath.c_str(), textureFileName.c_str());
+                }
+            }
+            else if (true == m_iconPath.endsWith(".bmp"))
+            {
+                if (false == m_iconWidget.load(FILESYSTEM, m_iconPath))
+                {
+                    LOG_WARNING("Failed to load bitmap %s.", m_iconPath.c_str());
+                }
+            }
+            else
+            {
+                m_iconWidget.clear(ColorDef::BLACK);
+            }
+        }
+
+        m_hasTopicChanged = true;
+
+        status = true;
+    }
+
+    return status;
+}
+
+bool GrabViaRestPlugin::startHttpRequest()
+{
+    bool status = false;
+
+    if (false == m_url.isEmpty())
+    {
+        if (true == m_client.begin(m_url))
+        {
+            if (true == m_method.equalsIgnoreCase("GET"))
+            {
+                if (false == m_client.GET())
+                {
+                    LOG_WARNING("GET %s failed.", m_url.c_str());
+                }
+                else
+                {
+                    status = true;
+                }
+            }
+            else if (true == m_method.equalsIgnoreCase("POST"))
+            {
+                if (false == m_client.POST())
+                {
+                    LOG_WARNING("POST %s failed.", m_url.c_str());
+                }
+                else
+                {
+                    status = true;
+                }
+            }
+            else
+            {
+                LOG_WARNING("Invalid HTTP method %s.", m_method.c_str());
+            }
+        }
+    }
+
+    return status;
+}
+
+void GrabViaRestPlugin::initHttpClient()
+{
+    /* Note: All registered callbacks are running in a different task context!
+     *       Therefore it is not allowed to access a member here directly.
+     *       The processing must be deferred via task proxy.
+     */
+    m_client.regOnResponse(
+        [this](const HttpResponse& rsp)
+        {
+            handleAsyncWebResponse(rsp);
+        }
+    );
+
+    m_client.regOnClosed(
+        [this]()
+        {
+            Msg msg;
+
+            msg.type = MSG_TYPE_CONN_CLOSED;
+
+            (void)this->m_taskProxy.send(msg);
+        }
+    );
+
+    m_client.regOnError(
+        [this]()
+        {
+            Msg msg;
+
+            msg.type = MSG_TYPE_CONN_ERROR;
+
+            (void)this->m_taskProxy.send(msg);
+        }
+    );
+}
+
+void GrabViaRestPlugin::handleAsyncWebResponse(const HttpResponse& rsp)
+{
+    if (HttpStatus::STATUS_CODE_OK == rsp.getStatusCode())
+    {
+        const size_t            JSON_DOC_SIZE   = 512U;
+        DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
+
+        if (nullptr != jsonDoc)
+        {
+            size_t                  payloadSize = 0U;
+            const void*             vPayload    = rsp.getPayload(payloadSize);
+            const char*             payload     = static_cast<const char*>(vPayload);
+            
+            if (true == m_filter.overflowed())
+            {
+                LOG_ERROR("Less memory for filter available.");
+            }
+            else if ((nullptr == payload) ||
+                     (0U == payloadSize))
+            {
+                LOG_ERROR("No payload.");
+            }
+            else
+            {
+                DeserializationError error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(m_filter));
+
+                if (DeserializationError::Ok != error.code())
+                {
+                    LOG_WARNING("JSON parse error: %s", error.c_str());
+                }
+                else
+                {
+                    Msg msg;
+
+                    msg.type    = MSG_TYPE_RSP;
+                    msg.rsp     = jsonDoc;
+
+                    if (false == this->m_taskProxy.send(msg))
+                    {
+                        delete jsonDoc;
+                        jsonDoc = nullptr;
+                    }
+                }
+            }
+        }
+    }
+}
+
+void GrabViaRestPlugin::getJsonValueByFilter(JsonObjectConst src, JsonObjectConst filter, JsonVariantConst& value)
+{
+    for (JsonPairConst pair : filter)
+    {
+        if (true == pair.value().is<JsonObjectConst>())
+        {
+            getJsonValueByFilter(src[pair.key()], filter[pair.key()], value);
+        }
+        else
+        {
+            value = src[pair.key()];
+        }
+
+        /* Break immediately as its assumed that the filter only contains one
+         * single object.
+         */
+        break;
+    }
+}
+
+void GrabViaRestPlugin::handleWebResponse(const DynamicJsonDocument& jsonDoc)
+{
+    JsonVariantConst jsonValue;
+
+    getJsonValueByFilter(jsonDoc.as<JsonObjectConst>(), m_filter.as<JsonObjectConst>(), jsonValue);
+
+    /* Is it a number? */
+    if ((true == jsonValue.is<float>()) &&
+        (0 > m_format.indexOf("%s"))) /* Prevent mistake which may cause a LoadProhibited core panic by snprintf. */
+    {
+        const size_t    BUFFER_SIZE = 128U;
+        char            buffer[BUFFER_SIZE];
+        float           value = jsonValue.as<float>();
+
+        value *= m_multiplier;
+        value += m_offset;
+
+        (void)snprintf(buffer, sizeof(buffer), m_format.c_str(), value);
+
+        m_textWidgetRight.setFormatStr(buffer);
+        m_textWidgetTextOnly.setFormatStr(buffer);
+    }
+    /* Is it a string? */
+    else if (true == jsonValue.is<String>())
+    {
+        const size_t    BUFFER_SIZE = 128U;
+        char            buffer[BUFFER_SIZE];
+
+        (void)snprintf(buffer, sizeof(buffer), m_format.c_str(), jsonValue.as<String>().c_str());
+
+        m_textWidgetRight.setFormatStr(buffer);
+        m_textWidgetTextOnly.setFormatStr(buffer);
+    }
+    else
+    {
+        m_textWidgetRight.setFormatStr("\\calign-");
+        m_textWidgetTextOnly.setFormatStr("\\calign-");
+    }
+}
+
+void GrabViaRestPlugin::clearQueue()
+{
+    Msg msg;
+
+    while(true == m_taskProxy.receive(msg))
+    {
+        if (MSG_TYPE_RSP == msg.type)
+        {
+            delete msg.rsp;
+            msg.rsp = nullptr;
+        }
+    }
+}
+
+/******************************************************************************
+ * External Functions
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Functions
+ *****************************************************************************/
diff --git a/lib/GithubPlugin/src/GithubPlugin.h b/lib/GrabViaRestPlugin/src/GrabViaRestPlugin.h
similarity index 71%
rename from lib/GithubPlugin/src/GithubPlugin.h
rename to lib/GrabViaRestPlugin/src/GrabViaRestPlugin.h
index 07cbb8bf..3ebb70d4 100644
--- a/lib/GithubPlugin/src/GithubPlugin.h
+++ b/lib/GrabViaRestPlugin/src/GrabViaRestPlugin.h
@@ -25,7 +25,7 @@
     DESCRIPTION
 *******************************************************************************/
 /**
- * @brief  Github plugin
+ * @brief  Grab information via MQTT plugin
  * @author Andreas Merkle <web@blue-andi.de>
  *
  * @addtogroup plugin
@@ -33,8 +33,8 @@
  * @{
  */
 
-#ifndef GITHUB_PLUGIN_H
-#define GITHUB_PLUGIN_H
+#ifndef GRAB_VIA_MQTT_PLUGIN_H
+#define GRAB_VIA_MQTT_PLUGIN_H
 
 /******************************************************************************
  * Compile Switches
@@ -63,9 +63,9 @@
  *****************************************************************************/
 
 /**
- * Shows the current number of stars, of the given github repository.
+ * Capture information from a remote server by using REST API.
  */
-class GithubPlugin : public Plugin, private PluginConfigFsHandler
+class GrabViaRestPlugin : public Plugin, private PluginConfigFsHandler
 {
 public:
 
@@ -75,19 +75,24 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
      * @param[in] name  Plugin name
      * @param[in] uid   Unique id
      */
-    GithubPlugin(const String& name, uint16_t uid) :
+    GrabViaRestPlugin(const String& name, uint16_t uid) :
         Plugin(name, uid),
         PluginConfigFsHandler(uid, FILESYSTEM),
         m_fontType(Fonts::FONT_TYPE_DEFAULT),
-        m_textCanvas(),
-        m_iconCanvas(),
-        m_stdIconWidget(),
-        m_textWidget("\\calign?"),
-        m_githubUser("BlueAndi"),
-        m_githubRepository("esp-rgb-led-matrix"),
-        m_urlIcon(),
-        m_urlText(),
+        m_layoutRight(),
+        m_layoutLeft(),
+        m_layoutTextOnly(),
+        m_iconWidget(),
+        m_textWidgetRight("\\calign?"),
+        m_textWidgetTextOnly("\\calign?"),
+        m_method("GET"),
+        m_url(),
+        m_filter(1024U),
         m_client(),
+        m_iconPath(),
+        m_format("%s"),
+        m_multiplier(1.0f),
+        m_offset(0.0f),
         m_requestTimer(),
         m_mutex(),
         m_isConnectionError(false),
@@ -103,7 +108,7 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
     /**
      * Destroys the plugin.
      */
-    ~GithubPlugin()
+    ~GrabViaRestPlugin()
     {
         m_client.regOnResponse(nullptr);
         m_client.regOnClosed(nullptr);
@@ -129,7 +134,7 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new GithubPlugin(name, uid);
+        return new(std::nothrow)GrabViaRestPlugin(name, uid);
     }
 
     /**
@@ -207,7 +212,7 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
@@ -261,20 +266,6 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
      */
     void update(YAGfx& gfx) final;
 
-    /**
-     * Get github user name.
-     * 
-     * @return github user name
-     */
-    String getUser() const;
-
-    /**
-     * Set github user name.
-     * 
-     * @param[in] name  github user name
-     */
-    void setUser(const String& name);
-
 private:
 
     /**
@@ -287,11 +278,6 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
      */
     static const uint16_t   ICON_HEIGHT         = 8U;
 
-    /**
-     * Image path within the filesystem to standard icon.
-     */
-    static const char*      IMAGE_PATH_STD_ICON;
-
     /**
      * Plugin topic, used to read/write the configuration.
      */
@@ -301,7 +287,7 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
      * Period in ms for requesting data from server.
      * This is used in case the last request to the server was successful.
      */
-    static const uint32_t   UPDATE_PERIOD       = SIMPLE_TIMER_HOURS(4U);
+    static const uint32_t   UPDATE_PERIOD       = SIMPLE_TIMER_MINUTES(2U);
 
     /**
      * Short period in ms for requesting data from server.
@@ -316,23 +302,28 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
      */
     static const uint32_t   CFG_RELOAD_PERIOD   = SIMPLE_TIMER_SECONDS(30U);
 
-    Fonts::FontType         m_fontType;                 /**< Font type which shall be used if there is no conflict with the layout. */
-    WidgetGroup             m_textCanvas;               /**< Canvas used for the text widget. */
-    WidgetGroup             m_iconCanvas;               /**< Canvas used for the bitmap widget. */
-    BitmapWidget            m_stdIconWidget;            /**< Bitmap widget, used to show the standard icon. */
-    TextWidget              m_textWidget;               /**< Text widget, used for showing the text. */
-    String                  m_githubUser;               /**< The github user name */
-    String                  m_githubRepository;         /**< The github repository name */
-    String                  m_urlIcon;                  /**< REST API URL for updating the icon */
-    String                  m_urlText;                  /**< REST API URL for updating the text */
-    AsyncHttpClient         m_client;                   /**< Asynchronous HTTP client. */
-    SimpleTimer             m_requestTimer;             /**< Timer used for cyclic request of new data. */
-    mutable MutexRecursive  m_mutex;                    /**< Mutex to protect against concurrent access. */
-    bool                    m_isConnectionError;        /**< Is connection error happened? */
-    SimpleTimer             m_cfgReloadTimer;           /**< Timer is used to cyclic reload the configuration from persistent memory. */
-    bool                    m_storeConfigReq;           /**< Is requested to store the configuration in persistent memory? */
-    bool                    m_reloadConfigReq;          /**< Is requested to reload the configuration from persistent memory? */
-    bool                    m_hasTopicChanged;          /**< Has the topic content changed? */
+    Fonts::FontType         m_fontType;             /**< Font type which shall be used if there is no conflict with the layout. */
+    WidgetGroup             m_layoutRight;          /**< Canvas used for the text widget in a layout with icon on the left side. */
+    WidgetGroup             m_layoutLeft;           /**< Canvas used for the bitmap widget in a layout with text on the right side. */
+    WidgetGroup             m_layoutTextOnly;       /**< Canvas used in case only text is shown. */
+    BitmapWidget            m_iconWidget;           /**< Bitmap widget, used to show the icon. */
+    TextWidget              m_textWidgetRight;      /**< Text widget, used in layout with icon. */
+    TextWidget              m_textWidgetTextOnly;   /**< Text widget, used in layout without icon. */
+    String                  m_method;               /**< HTTP method. */
+    String                  m_url;                  /**< REST URL. */
+    DynamicJsonDocument     m_filter;               /**< Filter used for the response in JSON format. */
+    AsyncHttpClient         m_client;               /**< Asynchronous HTTP client. */
+    String                  m_iconPath;             /**< Icon filename with path. */
+    String                  m_format;               /**< Format used to embed the retrieved filtered value. */
+    float                   m_multiplier;           /**< If grabbed value is a number, it will be multiplied with the multiplier. */
+    float                   m_offset;               /**< If grabbed value is a number, the offset will be added after the multiplication with the multiplier. */
+    SimpleTimer             m_requestTimer;         /**< Timer used for cyclic request of new data. */
+    mutable MutexRecursive  m_mutex;                /**< Mutex to protect against concurrent access. */
+    bool                    m_isConnectionError;    /**< Is connection error happened? */
+    SimpleTimer             m_cfgReloadTimer;       /**< Timer is used to cyclic reload the configuration from persistent memory. */
+    bool                    m_storeConfigReq;       /**< Is requested to store the configuration in persistent memory? */
+    bool                    m_reloadConfigReq;      /**< Is requested to reload the configuration from persistent memory? */
+    bool                    m_hasTopicChanged;      /**< Has the topic content changed? */
 
     /**
      * Defines the message types, which are necessary for HTTP client/server handling.
@@ -401,6 +392,23 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
      */
     void initHttpClient(void);
 
+    /**
+     * Handle asynchronous web response from the server.
+     * This will be called in LwIP context! Don't modify any member here directly!
+     * 
+     * @param[in] jsonDoc   Web response as JSON document
+     */
+    void handleAsyncWebResponse(const HttpResponse& rsp);
+
+    /**
+     * Get value from JSON source by the filter.
+     * 
+     * @param[in]   src     Source in JSON format
+     * @param[in]   filter  Filter in JSON format
+     * @param[out]  value   Value in JSON format
+     */
+    void getJsonValueByFilter(JsonObjectConst src, JsonObjectConst filter, JsonVariantConst& value);
+
     /**
      * Handle a web response from the server.
      * 
@@ -418,6 +426,6 @@ class GithubPlugin : public Plugin, private PluginConfigFsHandler
  * Functions
  *****************************************************************************/
 
-#endif  /* GITHUB_PLUGIN_H */
+#endif  /* GRAB_VIA_MQTT_PLUGIN_H */
 
 /** @} */
diff --git a/lib/ShellyPlugSPlugin/web/ShellyPlugSPlugin.html b/lib/GrabViaRestPlugin/web/GrabViaRestPlugin.html
similarity index 61%
rename from lib/ShellyPlugSPlugin/web/ShellyPlugSPlugin.html
rename to lib/GrabViaRestPlugin/web/GrabViaRestPlugin.html
index efc3e687..0257709f 100644
--- a/lib/ShellyPlugSPlugin/web/ShellyPlugSPlugin.html
+++ b/lib/GrabViaRestPlugin/web/GrabViaRestPlugin.html
@@ -1,194 +1,237 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-        <!-- Styles -->
-        <link rel="stylesheet" type="text/css" href="/style/bootstrap.min.css" />
-        <link rel="stylesheet" type="text/css" href="/style/sticky-footer-navbar.css" />
-        <link rel="stylesheet" type="text/css" href="/style/style.css" />
-
-        <title>PIXELIX</title>
-        <link rel="shortcut icon" type="image/png" href="/favicon.png" />
-    </head>
-    <body class="d-flex flex-column h-100">
-        <header>
-            <!-- Fixed navbar -->
-            <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
-                <a class="navbar-brand" href="/index.html">
-                    <img src="/images/LogoSmall.png" alt="PIXELIX" />
-                </a>
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="collapse navbar-collapse" id="navbarCollapse">
-                    <ul class="navbar-nav mr-auto" id="menu">
-                    </ul>
-                </div>
-            </nav>
-        </header>
-
-        <!-- Begin page content -->
-        <main role="main" class="flex-shrink-0">
-            <div class="container">
-                <h1 class="mt-5">ShellyPlugSPlugin</h1>
-                <p><img src="ShellyPlugSPlugin.jpg" alt="Screenshot" /></p>
-                <p>The plugin shows the current AC power being drawn via a Shelly PlugS, in watts.</p>
-                <h2 class="mt-1">REST API</h2>
-                <h3 class="mt-1">Get ip-address</h3>
-                <pre name="injectOrigin" class="text-light"><code>GET {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/ipAddress</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>GET {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/ipAddress</code></pre>
-                <h3 class="mt-1">Set ip-address</h3>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/ipAddress?shellyPlugSIP=&lt;IPADDRESS&gt;</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/ipAddress?shellyPlugSIP=&lt;IPADDRESS&gt;</code></pre>
-                <ul>
-                    <li>PLUGIN-UID: The plugin unique id.</li>
-                    <li>PLUGIN-ALIAS: The plugin alias name.</li>
-                    <li>IPADDRESS: The ip-address for the Shelly PlugS server.</li>
-                </ul>
-                <h2 class="mt-2">Configuration</h2>
-                <h3 class="mt-1">IP-address</h3>
-                <form id="myForm" action="javascript:setConfig(pluginUid.options[pluginUid.selectedIndex].value)">
-                    <div class="form-group">
-                        <label for="pluginUid">Plugin UID:</label>
-                        <select id="pluginUid" size="1" onChange="getConfig(pluginUid.options[pluginUid.selectedIndex].value)">
-                        </select>    
-                    </div>
-                    <div class="form-group">
-                        <label for="shellyPlugSIP">IP-address of server:</label>
-                        <input type="text" id="shellyPlugSIP" name="shellyPlugSIP" value="192.168.178.12" />    
-                    </div>                    
-                    <input name="submit" type="submit" value="Update"/>
-                </form>
-            </div>
-        </main>
-  
-        <!-- Footer -->
-        <footer class="footer mt-auto py-3">
-            <div class="container">
-                <hr />
-                <span class="text-muted">(C) 2019 - 2023 Andreas Merkle (web@blue-andi.de)</span><br />
-                <span class="text-muted"><a href="https://github.com/BlueAndi/esp-rgb-led-matrix/blob/master/LICENSE">MIT License</a></span>
-            </div>
-        </footer>
-
-        <!-- jQuery, and Bootstrap JS bundle -->
-        <script type="text/javascript" src="/js/jquery-3.6.3.slim.min.js"></script>
-        <script type="text/javascript" src="/js/bootstrap.bundle.min.js"></script>
-        <!-- Pixelix menu -->
-        <script type="text/javascript" src="/js/menu.js"></script>
-        <script type="text/javascript" src="/js/pluginsSubMenu.js"></script>
-        <!-- Pixelix utilities -->
-        <script type="text/javascript" src="/js/utils.js"></script>
-        <!-- Pixelix REST API -->
-        <script type="text/javascript" src="/js/rest.js"></script>
-
-        <script>
-
-            var pluginName  = "ShellyPlugSPlugin";
-            var restClient  = new pixelix.rest.Client();
-
-            function enableUI() {
-                utils.enableForm("myForm", true);
-            }
-    
-            function disableUI() {
-                utils.enableForm("myForm", false);
-            }
-    
-            function getPluginInstances() {
-                return restClient.getPluginInstances().then(function(rsp) {
-                    var slotIndex   = 0;
-                    var cnt         = 0;
-                    var $option     = null;
-                    var optionText  = ""
-
-                    for(slotIndex = 0; slotIndex < rsp.data.slots.length; ++slotIndex) {
-                        if (rsp.data.slots[slotIndex].name === pluginName) {
-
-                            optionText = rsp.data.slots[slotIndex].uid;
-                            optionText += " (";
-                            
-                            if (0 === rsp.data.slots[slotIndex].alias.length) {
-                                optionText += "-"
-                            } else {
-                                optionText += rsp.data.slots[slotIndex].alias
-                            }
-
-                            optionText += ")";
-
-                            $option = $("<option>")
-                                        .attr("value", "" + rsp.data.slots[slotIndex].uid)
-                                        .text(optionText);
-                            
-                            $("#pluginUid").append($option);
-
-                            ++cnt;
-                        }
-                    }
-
-                    return Promise.resolve(cnt);
-                }).catch(function(rsp) {
-                    alert("Internal error.");
-                    return Promise.resolve(0);
-                });
-            };
-    
-            function getConfig(pluginUid) {
-                disableUI();
-                return utils.makeRequest({
-                    method: "GET",
-                    url: "/rest/api/v1/display/uid/" + pluginUid + "/ipAddress",
-                    isJsonResponse: true
-                }).then(function(rsp) {
-                    $("#shellyPlugSIP").val(rsp.data.shellyPlugSIP);
-                }).catch(function(rsp) {
-                    alert("Internal error.");
-                }).finally(function() {
-                    enableUI();
-                });
-            }
-
-            function setConfig(pluginUid) {
-                disableUI();
-                return utils.makeRequest({
-                    method: "POST",
-                    url: "/rest/api/v1/display/uid/" + pluginUid + "/ipAddress",
-                    isJsonResponse: true,
-                    parameter: {
-                        shellyPlugSIP: $("#shellyPlugSIP").val()
-                    }
-                }).then(function(rsp) {
-                    alert("Ok.");
-                }).catch(function(rsp) {
-                    alert("Failed.");
-                }).finally(function() {
-                    enableUI();
-                });
-            }
-
-            $(document).ready(function() {
-                menu.addSubMenu(menu.data, "Plugins", pluginSubMenu);
-                menu.create("menu", menu.data);
-
-                utils.injectOrigin("injectOrigin", "{{ORIGIN}}");
-
-                /* Disable all forms, until the plugin instances are loaded. */
-                disableUI();
-    
-                /* Load all plugin instances. */
-                getPluginInstances().then(function(cnt) {
-                    var select = document.getElementById("pluginUid");
-
-                    if (0 < cnt) {
-
-                        return getConfig(
-                            select.options[select.selectedIndex].value
-                        );
-                    }
-                });
-            });
-        </script>
-    </body>
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+
+        <!-- Styles -->
+        <link rel="stylesheet" type="text/css" href="/style/bootstrap.min.css" />
+        <link rel="stylesheet" type="text/css" href="/style/sticky-footer-navbar.css" />
+        <link rel="stylesheet" type="text/css" href="/style/style.css" />
+
+        <title>PIXELIX</title>
+        <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+    </head>
+    <body class="d-flex flex-column h-100">
+        <header>
+            <!-- Fixed navbar -->
+            <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
+                <a class="navbar-brand" href="/index.html">
+                    <img src="/images/LogoSmall.png" alt="PIXELIX" />
+                </a>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="collapse navbar-collapse" id="navbarCollapse">
+                    <ul class="navbar-nav mr-auto" id="menu">
+                    </ul>
+                </div>
+            </nav>
+        </header>
+
+        <!-- Begin page content -->
+        <main role="main" class="flex-shrink-0">
+            <div class="container">
+                <h1 class="mt-5">GrabViaRestPlugin</h1>
+                <p><img src="GrabViaRestPlugin.jpg" alt="Screenshot" /></p>
+                <p>The plugin can grab information in JSON format via REST API and shows it on the display.</p>
+                <h2 class="mt-1">REST API</h2>
+                <h3 class="mt-1">Get configuration</h3>
+                <pre name="injectOrigin" class="text-light"><code>GET {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/grabConfig</code></pre>
+                <h3 class="mt-1">Set configuration</h3>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/grabConfig?method=&lt;METHOD&gt;&url=&lt;URL&gt;&filter=&lt;FILTER&gt;&iconPath=&lt;ICON-PATH&gt;&format=&lt;FORMAT&gt;&MULTIPLIER=&lt;MULTIPLIER&gt;&OFFSET=&lt;OFFSET&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/grabConfig?method=&lt;METHOD&gt;&url=&lt;URL&gt;&filter=&lt;FILTER&gt;&iconPath=&lt;ICON-PATH&gt;&format=&lt;FORMAT&gt;&MULTIPLIER=&lt;MULTIPLIER&gt;&OFFSET=&lt;OFFSET&gt;</code></pre>
+                <ul>
+                    <li>PLUGIN-UID: The plugin unique id.</li>
+                    <li>PLUGIN-ALIAS: The plugin alias name.</li>
+                    <li>METHOD: HTTP method, supported are "GET" and "POST".</li>
+                    <li>URL: REST API URL.</li>
+                    <li>FILTER: Filter to identify the value in the JSON response. See the details here: <a href="https://arduinojson.org/news/2020/03/22/version-6-15-0/" target="_blank">ArduinoJson 6.15: Filtering done right</a></li>
+                    <li>ICON-PATH: Filename of the icon including the path.</li>
+                    <li>FORMAT: Format specifier, e.g. "%s" for strings or "%f" for numbers.</li>
+                    <li>MULTIPLIER: Number which is multiplied with a number value. Not used for string values.</li>
+                    <li>OFFSET: Number which is added to a number value. Not used for string values.</li>
+                </ul>
+                <p><a href="https://github.com/BlueAndi/esp-rgb-led-matrix/tree/Development/doc/grabConfigs/rest" target="_blank">Configuration examples</a> may help to configure.</p>
+                <h2 class="mt-2">Configuration</h2>
+                <h3 class="mt-1">User</h3>
+                <form id="myForm" action="javascript:setConfig(pluginUid.options[pluginUid.selectedIndex].value)">
+                    <div class="form-group">
+                        <label for="pluginUid">Plugin UID:</label>
+                        <select id="pluginUid" size="1" onChange="getConfig(pluginUid.options[pluginUid.selectedIndex].value)">
+                        </select>    
+                    </div>
+                    <div class="form-group">
+                        <label for="method">Method:</label>
+                        <input type="text" id="method" name="method" value="GET" />    
+                    </div>
+                    <div class="form-group">
+                        <label for="url">URL:</label>
+                        <input type="text" id="url" name="url" value="" size="80" />    
+                    </div>
+                    <div class="form-group">
+                        <label for="filter">Filter:</label>
+                        <input type="text" id="filter" name="filter" value="null" size="80" />
+                    </div>
+                    <div class="form-group">
+                        <label for="iconPath">ICON path:</label>
+                        <input type="text" id="iconPath" name="iconPath" value="" size="80"/>
+                    </div>
+                    <div class="form-group">
+                        <label for="format">Format:</label>
+                        <input type="text" id="format" name="format" value="%s" maxlength="40" />
+                    </div>
+                    <div class="form-group">
+                        <label for="multiplier">Multiplier:</label>
+                        <input type="number" id="multiplier" name="multiplier" value="1" />    
+                    </div>
+                    <div class="form-group">
+                        <label for="offset">Offset:</label>
+                        <input type="number" id="offset" name="offset" value="0" />    
+                    </div>
+                    <input name="submit" type="submit" value="Update"/>
+                </form> 
+            </div>
+        </main>
+  
+        <!-- Footer -->
+        <footer class="footer mt-auto py-3">
+            <div class="container">
+                <hr />
+                <span class="text-muted">(C) 2019 - 2023 Andreas Merkle (web@blue-andi.de)</span><br />
+                <span class="text-muted"><a href="https://github.com/BlueAndi/esp-rgb-led-matrix/blob/master/LICENSE">MIT License</a></span>
+            </div>
+        </footer>
+
+        <!-- jQuery, and Bootstrap JS bundle -->
+        <script type="text/javascript" src="/js/jquery-3.6.3.slim.min.js"></script>
+        <script type="text/javascript" src="/js/bootstrap.bundle.min.js"></script>
+        <!-- Pixelix menu -->
+        <script type="text/javascript" src="/js/menu.js"></script>
+        <script type="text/javascript" src="/js/pluginsSubMenu.js"></script>
+        <!-- Pixelix utilities -->
+        <script type="text/javascript" src="/js/utils.js"></script>
+        <!-- Pixelix REST API -->
+        <script type="text/javascript" src="/js/rest.js"></script>
+
+        <script>
+
+            var pluginName  = "GrabViaRestPlugin";
+            var restClient  = new pixelix.rest.Client();
+    
+            function enableUI() {
+                utils.enableForm("myForm", true);
+            }
+    
+            function disableUI() {
+                utils.enableForm("myForm", false);
+            }
+    
+            function getPluginInstances() {
+                return restClient.getPluginInstances().then(function(rsp) {
+                    var slotIndex   = 0;
+                    var cnt         = 0;
+                    var $option     = null;
+                    var optionText  = ""
+
+                    for(slotIndex = 0; slotIndex < rsp.data.slots.length; ++slotIndex) {
+                        if (rsp.data.slots[slotIndex].name === pluginName) {
+
+                            optionText = rsp.data.slots[slotIndex].uid;
+                            optionText += " (";
+                            
+                            if (0 === rsp.data.slots[slotIndex].alias.length) {
+                                optionText += "-"
+                            } else {
+                                optionText += rsp.data.slots[slotIndex].alias
+                            }
+
+                            optionText += ")";
+
+                            $option = $("<option>")
+                                        .attr("value", "" + rsp.data.slots[slotIndex].uid)
+                                        .text(optionText);
+                            
+                            $("#pluginUid").append($option);
+
+                            ++cnt;
+                        }
+                    }
+
+                    return Promise.resolve(cnt);
+                }).catch(function(rsp) {
+                    alert("Internal error.");
+                    return Promise.resolve(0);
+                });
+            };
+    
+            function getConfig(pluginUid) {
+                disableUI();
+                return utils.makeRequest({
+                    method: "GET",
+                    url: "/rest/api/v1/display/uid/" + pluginUid + "/grabConfig",
+                    isJsonResponse: true
+                }).then(function(rsp) {
+                    $("#method").val(rsp.data.method);
+                    $("#url").val(rsp.data.url);
+                    $("#filter").val(JSON.stringify(rsp.data.filter));
+                    $("#iconPath").val(rsp.data.iconPath);
+                    $("#format").val(rsp.data.format);
+                    $("#multiplier").val(rsp.data.multiplier);
+                    $("#offset").val(rsp.data.offset);
+                }).catch(function(rsp) {
+                    alert("Internal error.");
+                }).finally(function() {
+                    enableUI();
+                });
+            }
+
+            function setConfig(pluginUid) {
+                disableUI();
+
+                return utils.makeRequest({
+                    method: "POST",
+                    url: "/rest/api/v1/display/uid/" + pluginUid + "/grabConfig",
+                    isJsonResponse: true,
+                    parameter: {
+                        method:  $("#method").val(),
+                        url:  $("#url").val(),
+                        filter: $("#filter").val(),
+                        iconPath: $("#iconPath").val(),
+                        format: $("#format").val(),
+                        multiplier: $("#multiplier").val(),
+                        offset: $("#offset").val()
+                    }
+                }).then(function(rsp) {
+                    alert("Ok.");
+                }).catch(function(rsp) {
+                    alert("Failed.");
+                }).finally(function() {
+                    enableUI();
+                });
+            }
+
+            $(document).ready(function() {
+                menu.addSubMenu(menu.data, "Plugins", pluginSubMenu);
+                menu.create("menu", menu.data);
+                
+                utils.injectOrigin("injectOrigin", "{{ORIGIN}}");
+
+                /* Disable all forms, until the plugin instances are loaded. */
+                disableUI();
+    
+                /* Load all plugin instances. */
+                getPluginInstances().then(function(cnt) {
+                    var select = document.getElementById("pluginUid");
+
+                    if (0 < cnt) {
+
+                        return getConfig(
+                            select.options[select.selectedIndex].value
+                        );
+                    }
+                });
+            });
+        </script>
+    </body>
 </html>
\ No newline at end of file
diff --git a/lib/GrabViaRestPlugin/web/GrabViaRestPlugin.jpg b/lib/GrabViaRestPlugin/web/GrabViaRestPlugin.jpg
new file mode 100644
index 00000000..6fea5c23
Binary files /dev/null and b/lib/GrabViaRestPlugin/web/GrabViaRestPlugin.jpg differ
diff --git a/lib/GruenbeckPlugin/src/GruenbeckPlugin.cpp b/lib/GruenbeckPlugin/src/GruenbeckPlugin.cpp
index 4126b696..677f0e31 100644
--- a/lib/GruenbeckPlugin/src/GruenbeckPlugin.cpp
+++ b/lib/GruenbeckPlugin/src/GruenbeckPlugin.cpp
@@ -37,6 +37,7 @@
 
 #include <ArduinoJson.h>
 #include <Logging.h>
+#include <HttpStatus.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -86,7 +87,7 @@ bool GruenbeckPlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool GruenbeckPlugin::setTopic(const String& topic, const JsonObject& value)
+bool GruenbeckPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
@@ -457,53 +458,7 @@ void GruenbeckPlugin::initHttpClient()
     m_client.regOnResponse(
         [this](const HttpResponse& rsp)
         {
-            const size_t            JSON_DOC_SIZE   = 256U;
-            DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
-
-            if (nullptr != jsonDoc)
-            {
-                /* Structure of response-payload for requesting D_Y_10_1
-                *
-                * <data><code>ok</code><D_Y_10_1>XYZ</D_Y_10_1></data>
-                *
-                * <data><code>ok</code><D_Y_10_1>  = 31 bytes
-                * XYZ                              = 3 byte (relevant data)
-                * </D_Y_10_1></data>               = 18 bytes
-                */
-
-                /* Start index of relevant data */
-                const uint32_t  START_INDEX_OF_RELEVANT_DATA    = 31U;
-
-                /* Length of relevant data */
-                const uint32_t  RELEVANT_DATA_LENGTH            = 3U;
-
-                size_t          payloadSize                     = 0U;
-                const char*     payload                         = reinterpret_cast<const char*>(rsp.getPayload(payloadSize));
-                char            restCapacity[RELEVANT_DATA_LENGTH + 1];
-                Msg             msg;
-
-                if (payloadSize >= (START_INDEX_OF_RELEVANT_DATA + RELEVANT_DATA_LENGTH))
-                {
-                    memcpy(restCapacity, &payload[START_INDEX_OF_RELEVANT_DATA], RELEVANT_DATA_LENGTH);
-                    restCapacity[RELEVANT_DATA_LENGTH] = '\0';
-                }
-                else
-                {
-                    restCapacity[0] = '?';
-                    restCapacity[1] = '\0';
-                }
-
-                (*jsonDoc)["restCapacity"] = restCapacity;
-
-                msg.type    = MSG_TYPE_RSP;
-                msg.rsp     = jsonDoc;
-
-                if (false == this->m_taskProxy.send(msg))
-                {
-                    delete jsonDoc;
-                    jsonDoc = nullptr;
-                }
-            }
+            handleAsyncWebResponse(rsp);
         }
     );
 
@@ -530,6 +485,62 @@ void GruenbeckPlugin::initHttpClient()
     );
 }
 
+void GruenbeckPlugin::handleAsyncWebResponse(const HttpResponse& rsp)
+{
+    if (HttpStatus::STATUS_CODE_OK == rsp.getStatusCode())
+    {
+        const size_t            JSON_DOC_SIZE   = 256U;
+        DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
+
+        if (nullptr != jsonDoc)
+        {
+            /* Structure of response-payload for requesting D_Y_10_1
+            *
+            * <data><code>ok</code><D_Y_10_1>XYZ</D_Y_10_1></data>
+            *
+            * <data><code>ok</code><D_Y_10_1>  = 31 bytes
+            * XYZ                              = 3 byte (relevant data)
+            * </D_Y_10_1></data>               = 18 bytes
+            */
+
+            /* Start index of relevant data */
+            const uint32_t  START_INDEX_OF_RELEVANT_DATA    = 31U;
+
+            /* Length of relevant data */
+            const uint32_t  RELEVANT_DATA_LENGTH            = 3U;
+
+            size_t          payloadSize                     = 0U;
+            const void*     vPayload                        = rsp.getPayload(payloadSize);
+            const char*     payload                         = static_cast<const char*>(vPayload);
+            char            restCapacity[RELEVANT_DATA_LENGTH + 1];
+            Msg             msg;
+
+            if ((nullptr != payload) &&
+                (payloadSize >= (START_INDEX_OF_RELEVANT_DATA + RELEVANT_DATA_LENGTH)))
+            {
+                memcpy(restCapacity, &payload[START_INDEX_OF_RELEVANT_DATA], RELEVANT_DATA_LENGTH);
+                restCapacity[RELEVANT_DATA_LENGTH] = '\0';
+            }
+            else
+            {
+                restCapacity[0] = '?';
+                restCapacity[1] = '\0';
+            }
+
+            (*jsonDoc)["restCapacity"] = restCapacity;
+
+            msg.type    = MSG_TYPE_RSP;
+            msg.rsp     = jsonDoc;
+
+            if (false == this->m_taskProxy.send(msg))
+            {
+                delete jsonDoc;
+                jsonDoc = nullptr;
+            }
+        }
+    }
+}
+
 void GruenbeckPlugin::handleWebResponse(const DynamicJsonDocument& jsonDoc)
 {
     JsonVariantConst jsonRestCapacity = jsonDoc["restCapacity"];
diff --git a/lib/GruenbeckPlugin/src/GruenbeckPlugin.h b/lib/GruenbeckPlugin/src/GruenbeckPlugin.h
index dd30a656..a4c912bf 100644
--- a/lib/GruenbeckPlugin/src/GruenbeckPlugin.h
+++ b/lib/GruenbeckPlugin/src/GruenbeckPlugin.h
@@ -130,7 +130,7 @@ class GruenbeckPlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new GruenbeckPlugin(name, uid);
+        return new(std::nothrow)GruenbeckPlugin(name, uid);
     }
 
     /**
@@ -208,7 +208,7 @@ class GruenbeckPlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
@@ -401,6 +401,14 @@ class GruenbeckPlugin : public Plugin, private PluginConfigFsHandler
      */
     void initHttpClient(void);
 
+    /**
+     * Handle asynchronous web response from the server.
+     * This will be called in LwIP context! Don't modify any member here directly!
+     * 
+     * @param[in] jsonDoc   Web response as JSON document
+     */
+    void handleAsyncWebResponse(const HttpResponse& rsp);
+
     /**
      * Handle a web response from the server.
      * 
diff --git a/lib/HalLedMatrix/src/Display.cpp b/lib/HalLedMatrix/src/Display.cpp
index 6293454d..1bbf01ff 100644
--- a/lib/HalLedMatrix/src/Display.cpp
+++ b/lib/HalLedMatrix/src/Display.cpp
@@ -70,7 +70,8 @@ Display::Display() :
     IDisplay(),
     m_strip(Board::LedMatrix::width * Board::LedMatrix::height, Board::Pin::ledMatrixDataOutPinNo),
     m_topo(Board::LedMatrix::width, Board::LedMatrix::height),
-    m_ledMatrix()
+    m_ledMatrix(),
+    m_isOn(true)
 {
 }
 
@@ -78,6 +79,49 @@ Display::~Display()
 {
 }
 
+void Display::show()
+{
+    if (true == m_isOn)
+    {
+        const int16_t height = m_ledMatrix.getHeight();
+        const int16_t width = m_ledMatrix.getWidth();
+
+        for (int16_t y = 0; y < height; ++y)
+        {
+            for (int16_t x = 0; x < width; ++x)
+            {
+                HtmlColor htmlColor = static_cast<uint32_t>(m_ledMatrix.getColor(x, y));
+#if CONFIG_DISPLAY_ROTATE180 != 0
+                m_strip.SetPixelColor(m_topo.Map(width - x - 1, height - y - 1), htmlColor);
+#else
+                m_strip.SetPixelColor(m_topo.Map(x, y), htmlColor);
+#endif
+            }
+        }
+
+        m_strip.Show();
+    }
+}
+
+void Display::off()
+{
+    m_isOn = false;
+
+    /* Simulate powered off display. */
+    m_strip.ClearTo(ColorDef::BLACK);
+    m_strip.Show();
+}
+
+void Display::on()
+{
+    m_isOn = true;
+}
+
+bool Display::isOn() const
+{
+    return m_isOn;
+}
+
 /******************************************************************************
  * External Functions
  *****************************************************************************/
diff --git a/lib/HalLedMatrix/src/Display.h b/lib/HalLedMatrix/src/Display.h
index eadae48b..ae9b336b 100644
--- a/lib/HalLedMatrix/src/Display.h
+++ b/lib/HalLedMatrix/src/Display.h
@@ -95,24 +95,7 @@ class Display : public IDisplay
      * Show framebuffer on physical display. This may be synchronous
      * or asynchronous.
      */
-    void show() final
-    {
-        int16_t x = 0;
-        int16_t y = 0;
-
-        for(y = 0; y < m_ledMatrix.getHeight(); ++y)
-        {
-            for(x = 0; x < m_ledMatrix.getWidth(); ++x)
-            {
-                HtmlColor htmlColor = static_cast<uint32_t>(m_ledMatrix.getColor(x, y));
-
-                m_strip.SetPixelColor(m_topo.Map(x, y), htmlColor);
-            }
-        }
-
-        m_strip.Show();
-        return;
-    }
+    void show() final;
 
     /**
      * The display is ready, when the last physical pixel update is finished.
@@ -140,7 +123,6 @@ class Display : public IDisplay
             (Board::LedMatrix::maxCurrentPerLed * Board::LedMatrix::width *Board::LedMatrix::height);
 
         m_strip.SetLuminance(SAFE_LUMINANCE);
-        return;
     }
 
     /**
@@ -198,6 +180,23 @@ class Display : public IDisplay
         return m_ledMatrix.getColor(x, y);
     }
 
+    /**
+     * Power display off.
+     */
+    void off() final;
+
+    /**
+     * Power display on.
+     */
+    void on() final;
+
+    /**
+     * Is display powered on?
+     * 
+     * @return If display is powered on, it will return true otherwise false.
+     */
+    bool isOn() const final;
+
 private:
 
     /**
@@ -214,6 +213,11 @@ class Display : public IDisplay
      */
     YAGfxStaticBitmap<Board::LedMatrix::width, Board::LedMatrix::height>    m_ledMatrix;
 
+    /**
+     * Is display on?
+     */
+    bool                                                                    m_isOn;
+
     /**
      * Construct display.
      */
diff --git a/lib/HalTftDisplay/src/Board.cpp b/lib/HalTftDisplay/src/Board.cpp
index 6b510e8d..2e35be68 100644
--- a/lib/HalTftDisplay/src/Board.cpp
+++ b/lib/HalTftDisplay/src/Board.cpp
@@ -83,6 +83,9 @@ const AnalogPin<Pin::batteryInPinNo>                Board::batteryVoltageIn;
 /** Digital output pin: Buzzer */
 const DOutPin<Pin::buzzerOutPinNo>                  Board::buzzerOut;
 
+/** Digital output pin: TFT display backlight switch */
+const DOutPin<Pin::tftBackLightPinNo>               Board::tftBackLightOut;
+
 /******************************************************************************
  * Local Variables
  *****************************************************************************/
@@ -97,7 +100,8 @@ static const IoPin* ioPinList[] =
     &ldrIn,
     &dhtIn,
     &batteryVoltageIn,
-    &buzzerOut
+    &buzzerOut,
+    &tftBackLightOut
 };
 
 /******************************************************************************
diff --git a/lib/HalTftDisplay/src/Board.h b/lib/HalTftDisplay/src/Board.h
index 7a01d571..2c916ba3 100644
--- a/lib/HalTftDisplay/src/Board.h
+++ b/lib/HalTftDisplay/src/Board.h
@@ -105,6 +105,9 @@ namespace Pin
 
     /** Pin number of buzzer out */
     constexpr uint8_t   buzzerOutPinNo          = CONFIG_PIN_BUZZER_OUT;
+
+    /** Pin number of TFT display backlight LED switch. */
+    constexpr uint8_t   tftBackLightPinNo       = TFT_BL;
 };
 
 /* Digital output pin: Onboard LED */
@@ -134,6 +137,9 @@ extern const AnalogPin<Pin::batteryInPinNo>                 batteryVoltageIn;
 /* Digital output pin: Buzzer */
 extern const DOutPin<Pin::buzzerOutPinNo>                   buzzerOut;
 
+/* Digital output pin: TFT display backlight switch */
+extern const DOutPin<Pin::tftBackLightPinNo>                tftBackLightOut;
+
 /** ADC resolution in digits */
 constexpr uint16_t  adcResolution               = 4096U;
 
diff --git a/lib/HalTftDisplay/src/Display.cpp b/lib/HalTftDisplay/src/Display.cpp
index 6a91ca0d..f27db236 100644
--- a/lib/HalTftDisplay/src/Display.cpp
+++ b/lib/HalTftDisplay/src/Display.cpp
@@ -70,7 +70,8 @@ Display::Display() :
     IDisplay(),
     m_tft(),
     m_ledMatrix(),
-    m_brightness(DEFAULT_BRIGHTNESS)
+    m_brightness(DEFAULT_BRIGHTNESS),
+    m_isOn(false)
 {
 }
 
@@ -78,6 +79,79 @@ Display::~Display()
 {
 }
 
+void Display::show()
+{
+    int32_t x = 0;
+    int32_t y = 0;
+
+    for(y = 0; y < MATRIX_HEIGHT; ++y)
+    {
+        for(x = 0; x < MATRIX_WIDTH; ++x)
+        {
+#if CONFIG_DISPLAY_ROTATE180 != 0
+            Color       brightnessAdjustedColor = m_ledMatrix.getColor(MATRIX_WIDTH - x - 1, MATRIX_HEIGHT - y - 1);
+#else
+            Color       brightnessAdjustedColor = m_ledMatrix.getColor(x, y);
+#endif           
+    	    uint16_t    intensity               = brightnessAdjustedColor.getIntensity();
+            int32_t     xNative                 = y * (PIXEL_HEIGHT + PiXEL_DISTANCE) + BORDER_Y;
+            int32_t     yNative                 = TFT_HEIGHT - (x * (PIXEL_WIDTH  + PiXEL_DISTANCE) + BORDER_X) - 1;
+
+            intensity *= (static_cast<uint16_t>(m_brightness) + 1U);
+            intensity /= 256U;
+            brightnessAdjustedColor.setIntensity(static_cast<uint8_t>(intensity));
+
+            m_tft.fillRect( xNative,
+                            yNative,
+                            PIXEL_HEIGHT,
+                            PIXEL_WIDTH,
+                            brightnessAdjustedColor.to565());
+        }
+    }
+}
+
+void Display::off()
+{
+    m_tft.writecommand(TFT_DISPOFF);
+
+#if defined (TFT_BL) && defined (TFT_BACKLIGHT_ON)
+
+#if (LOW == TFT_BACKLIGHT_ON)
+
+    /* Turn off the back-light LED */
+    Board::tftBackLightOut.write(HIGH);
+
+#else   /* (LOW == TFT_BACKLIGHT_ON) */
+
+    /* Turn off the back-light LED */
+    Board::tftBackLightOut.write(LOW);
+
+#endif  /* (LOW == TFT_BACKLIGHT_ON) */
+
+#endif /* defined (TFT_BL) && defined (TFT_BACKLIGHT_ON) */
+
+    m_isOn = false;
+}
+
+void Display::on()
+{
+    m_tft.writecommand(TFT_DISPON);
+
+#if defined (TFT_BL) && defined (TFT_BACKLIGHT_ON)
+
+    /* Turn off the back-light LED */
+    Board::tftBackLightOut.write(TFT_BACKLIGHT_ON);
+
+#endif /* defined (TFT_BL) && defined (TFT_BACKLIGHT_ON) */
+
+    m_isOn = true;
+}
+
+bool Display::isOn() const
+{
+    return m_isOn;
+}
+
 /******************************************************************************
  * External Functions
  *****************************************************************************/
diff --git a/lib/HalTftDisplay/src/Display.h b/lib/HalTftDisplay/src/Display.h
index 2fc19885..a01b9f45 100644
--- a/lib/HalTftDisplay/src/Display.h
+++ b/lib/HalTftDisplay/src/Display.h
@@ -87,6 +87,7 @@ class Display : public IDisplay
     {
         m_tft.init();
         m_tft.fillScreen(TFT_BLACK);
+        m_isOn = true;
 
         return true;
     }
@@ -95,32 +96,7 @@ class Display : public IDisplay
      * Show framebuffer on physical display. This may be synchronous
      * or asynchronous.
      */
-    void show() final
-    {
-        int32_t x = 0;
-        int32_t y = 0;
-
-        for(y = 0; y < MATRIX_HEIGHT; ++y)
-        {
-            for(x = 0; x < MATRIX_WIDTH; ++x)
-            {
-                Color       brightnessAdjustedColor = m_ledMatrix.getColor(x, y);
-                uint16_t    intensity               = brightnessAdjustedColor.getIntensity();
-                int32_t     xNative                 = y * (PIXEL_HEIGHT + PiXEL_DISTANCE) + BORDER_Y;
-                int32_t     yNative                 = TFT_HEIGHT - (x * (PIXEL_WIDTH  + PiXEL_DISTANCE) + BORDER_X) - 1;
-
-                intensity *= (static_cast<uint16_t>(m_brightness) + 1U);
-                intensity /= 256U;
-                brightnessAdjustedColor.setIntensity(static_cast<uint8_t>(intensity));
-
-                m_tft.fillRect( xNative,
-                                yNative,
-                                PIXEL_HEIGHT,
-                                PIXEL_WIDTH,
-                                brightnessAdjustedColor.to565());
-            }
-        }
-    }
+    void show() final;
 
     /**
      * The display is ready, when the last physical pixel update is finished.
@@ -199,6 +175,23 @@ class Display : public IDisplay
         return m_ledMatrix.getColor(x, y);
     }
 
+    /**
+     * Power display off.
+     */
+    void off() final;
+
+    /**
+     * Power display on.
+     */
+    void on() final;
+
+    /**
+     * Is display powered on?
+     * 
+     * @return If display is powered on, it will return true otherwise false.
+     */
+    bool isOn() const final;
+
 private:
 
     /* The below TFT_* definitions are set in platform.ini build_flags */
@@ -230,6 +223,7 @@ class Display : public IDisplay
     TFT_eSPI                                        m_tft;          /**< T-Display driver */
     YAGfxStaticBitmap<MATRIX_WIDTH, MATRIX_HEIGHT>  m_ledMatrix;    /**< Simulated LED matrix framebuffer */
     uint8_t                                         m_brightness;   /**< Display brightness [0; 255] value. 255 = max. brightness. */
+    bool                                            m_isOn;         /**< Is display on? */
 
     /**
      * Construct display.
diff --git a/lib/IRtc/library.json b/lib/IRtc/library.json
new file mode 100644
index 00000000..876a5137
--- /dev/null
+++ b/lib/IRtc/library.json
@@ -0,0 +1,15 @@
+{
+    "name": "IRtc",
+    "version": "0.1.0",
+    "description": "....",
+    "authors": [{
+        "name": "Andreas Merkle",
+        "email": "web@blue-andi.de",
+        "url": "https://github.com/BlueAndi",
+        "maintainer": true
+    }],
+    "license": "MIT",
+    "dependencies": [],
+    "frameworks": "*",
+    "platforms": "*"
+}
diff --git a/lib/IRtc/src/IRtc.h b/lib/IRtc/src/IRtc.h
new file mode 100644
index 00000000..48f2a660
--- /dev/null
+++ b/lib/IRtc/src/IRtc.h
@@ -0,0 +1,111 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  RTC interface
+ * @author Andreas Merkle <web@blue-andi.de>
+ *
+ * @addtogroup Hal
+ *
+ * @{
+ */
+
+#ifndef IRTC_H
+#define IRTC_H
+
+/******************************************************************************
+ * Compile Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "time.h"
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and Classes
+ *****************************************************************************/
+
+/**
+ * Abstract RTC interface.
+ */
+class IRtc
+{
+public:
+
+    /**
+     * Destroys the inteface.
+     */
+    virtual ~IRtc()
+    {
+    }
+
+    /**
+     * Checks for the RTC and if available, it will be initialized
+     * and started.
+     * 
+     * @return If no RTC is available, it will return false.
+     */
+    virtual bool begin() = 0;
+
+    /**
+     * Get the time from the RTC.
+     * 
+     * @param[out] timeInfo Time destination
+     * 
+     * @return If time info is updated, it will return true otherwise false.
+     */
+    virtual bool getTime(struct tm& timeInfo) = 0;
+
+    /**
+     * Set the RTC by time.
+     * 
+     * @param[in] timeInfo Time source
+     */
+    virtual void setTime(const struct tm& timeInfo) = 0;
+
+protected:
+
+    /**
+     * Creates the interface.
+     */
+    IRtc()
+    {
+    }
+
+};
+
+/******************************************************************************
+ * Functions
+ *****************************************************************************/
+
+#endif  /* IRTC_H */
+
+/** @} */
\ No newline at end of file
diff --git a/lib/ITopicHandler/ITopicHandler.h b/lib/ITopicHandler/src/ITopicHandler.h
similarity index 60%
rename from lib/ITopicHandler/ITopicHandler.h
rename to lib/ITopicHandler/src/ITopicHandler.h
index d0d644e8..26f18282 100644
--- a/lib/ITopicHandler/ITopicHandler.h
+++ b/lib/ITopicHandler/src/ITopicHandler.h
@@ -56,21 +56,21 @@
  *****************************************************************************/
 
 /**
- * The topic handler interface, used by the plugin manager to register/unregister
- * plugin topics.
+ * The abstract topic handler interface, which will be realized by different
+ * protocols.
  */
 class ITopicHandler
 {
 public:
 
-    /** Topic accessibility */
-    typedef enum
-    {
-        ACCESS_READ_ONLY = 0,   /**< Read only */
-        ACCESS_READ_WRITE,      /**< Read and write */
-        ACCESS_WRITE_ONLY       /**< Write only */
-    
-    } Access;
+    /** Function prototype to get topic content. */
+    typedef std::function<bool(const String& topic, JsonObject& value)> GetTopicFunc;
+
+    /** Function prototype to set topic content. */
+    typedef std::function<bool(const String& topic, const JsonObjectConst& value)> SetTopicFunc;
+
+    /** Function prototype for file upload request. */
+    typedef std::function<bool(const String& topic, const String& srcFilename, String& dstFilename)> UploadReqFunc;
 
     /**
      * Destroy the interface.
@@ -90,22 +90,26 @@ class ITopicHandler
     virtual void stop() = 0;
 
     /**
-     * Register a single topic of the given plugin.
+     * Register the topic.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
-     * @param[in] topic     The topic name.
-     * @param[in] access    The topic accessibility.
-     * @param[in] extra     Extra parameters, which depend on the topic handler.
+     * @param[in] deviceId      The device id which represents the physical device.
+     * @param[in] entityId      The entity id which represents the entity of the device.
+     * @param[in] topic         The topic name.
+     * @param[in] extra         Extra parameters, which depend on the topic handler.
+     * @param[in] getTopicFunc  Function to get the topic content.
+     * @param[in] setTopicFunc  Function to set the topic content.
+     * @param[in] uploadReqFunc Function used for requesting whether an file upload is allowed.
      */
-    virtual void registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra) = 0;
+    virtual void registerTopic(const String& deviceId, const String& entityId, const String& topic, JsonObjectConst& extra, GetTopicFunc getTopicFunc, SetTopicFunc setTopicFunc, UploadReqFunc uploadReqFunc) = 0;
 
     /**
-     * Unregister the topic of the given plugin.
+     * Unregister the topic.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
      * @param[in] topic     The topic name.
      */
-    virtual void unregisterTopic(IPluginMaintenance* plugin, const String& topic) = 0;
+    virtual void unregisterTopic(const String& deviceId, const String& entityId, const String& topic) = 0;
 
     /**
      * Process the topic handler.
@@ -115,10 +119,11 @@ class ITopicHandler
     /**
      * Notify that the topic has changed.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
      * @param[in] topic     The topic name.
      */
-    virtual void notify(IPluginMaintenance* plugin, const String& topic) = 0;
+    virtual void notify(const String& deviceId, const String& entityId, const String& topic) = 0;
 
 protected:
 
diff --git a/lib/IconTextLampPlugin/src/IconTextLampPlugin.cpp b/lib/IconTextLampPlugin/src/IconTextLampPlugin.cpp
index b197a02a..be10500d 100644
--- a/lib/IconTextLampPlugin/src/IconTextLampPlugin.cpp
+++ b/lib/IconTextLampPlugin/src/IconTextLampPlugin.cpp
@@ -71,6 +71,9 @@ const char* IconTextLampPlugin::TOPIC_LAMP              = "/lamp";
 /* Initialize plugin topic. */
 const char* IconTextLampPlugin::TOPIC_ICON              = "/bitmap";
 
+/* Initialize plugin topic. */
+const char* IconTextLampPlugin::TOPIC_SPRITESHEET       = "/spritesheet";
+
 /* Initialize bitmap image filename extension. */
 const char* IconTextLampPlugin::FILE_EXT_BITMAP         = ".bmp";
 
@@ -83,22 +86,27 @@ const char* IconTextLampPlugin::FILE_EXT_SPRITE_SHEET   = ".sprite";
 
 void IconTextLampPlugin::getTopics(JsonArray& topics) const
 {
-    uint8_t     lampId      = 0U;
-    JsonObject  jsonText    = topics.createNestedObject();
-    JsonObject  jsonIcon    = topics.createNestedObject();
-    JsonObject  jsonLamps   = topics.createNestedObject();
+    uint8_t     lampId          = 0U;
+    JsonObject  jsonText        = topics.createNestedObject();
+    JsonObject  jsonIcon        = topics.createNestedObject();
+    JsonObject  jsonSpriteSheet = topics.createNestedObject();
+    JsonObject  jsonLamps       = topics.createNestedObject();
 
     jsonText["name"]            = TOPIC_TEXT;
 
-    /* Home Assistant support of MQTT discovery */
-    jsonText["ha"]["component"]         = "text";
-    jsonText["ha"]["commandTemplate"]   = "{\"text\": \"{{ value }}\" }";
-    jsonText["ha"]["valueTemplate"]     = "{{ value_json.text }}";
-    jsonText["ha"]["icon"]              = "mdi:form-textbox";
+    /* Home Assistant support of MQTT discovery (https://www.home-assistant.io/integrations/mqtt) */
+    jsonText["ha"]["component"]             = "text";                           /* MQTT integration */
+    jsonText["ha"]["discovery"]["name"]     = "MQTT text";                      /* Application that is the origin the discovered MQTT. */
+    jsonText["ha"]["discovery"]["cmd_tpl"]  = "{\"text\": \"{{ value }}\" }";   /* Command template */
+    jsonText["ha"]["discovery"]["val_tpl"]  = "{{ value_json.text }}";          /* Value template */
+    jsonText["ha"]["discovery"]["ic"]       = "mdi:form-textbox";               /* Icon (MaterialDesignIcons.com) */
 
     jsonIcon["name"]            = TOPIC_ICON;
     jsonIcon["access"]          = "w"; /* Only icon upload is supported. */
 
+    jsonSpriteSheet["name"]     = TOPIC_SPRITESHEET;
+    jsonSpriteSheet["access"]   = "w"; /* Only sprite sheet upload is supported. */
+
     jsonLamps["name"]           = TOPIC_LAMPS;
     jsonLamps["access"]         = "r"; /* Only read access allowed. */
 
@@ -114,9 +122,16 @@ bool IconTextLampPlugin::getTopic(const String& topic, JsonObject& value) const
 
     if (0U != topic.equals(TOPIC_TEXT))
     {
-        String  formattedText   = getText();
+        String  formattedText       = getText();
+        String  iconFullPath;
+        String  spriteSheetFullPath;
+
+        getIconFilePath(iconFullPath);
+        getSpriteSheetFilePath(spriteSheetFullPath);
 
-        value["text"] = formattedText;
+        value["text"]                   = formattedText;
+        value["iconFullPath"]           = iconFullPath;
+        value["spriteSheetFullPath"]    = spriteSheetFullPath;
 
         isSuccessful = true;
     }
@@ -163,24 +178,56 @@ bool IconTextLampPlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool IconTextLampPlugin::setTopic(const String& topic, const JsonObject& value)
+bool IconTextLampPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
     if (0U != topic.equals(TOPIC_TEXT))
     {
         String              text;
-        JsonVariantConst    jsonShow    = value["text"];
+        JsonVariantConst    jsonText                = value["text"];
+        JsonVariantConst    jsonIconFullPath        = value["iconFullPath"];
+        JsonVariantConst    jsonSpriteSheetFullPath = value["spriteSheetFullPath"];
 
-        if (false == jsonShow.isNull())
+        if (false == jsonText.isNull())
         {
-            text = jsonShow.as<String>();
+            text = jsonText.as<String>();
+
+            setText(text);
+
             isSuccessful = true;
         }
 
-        if (true == isSuccessful)
+        if (false == jsonIconFullPath.isNull())
         {
-            setText(text);
+            String iconFullPath = jsonIconFullPath.as<String>();
+
+            if (true == iconFullPath.isEmpty())
+            {
+                clearBitmap();
+            }
+            else
+            {
+                loadBitmap(iconFullPath);
+            }
+
+            isSuccessful = true;
+        }
+
+        if (false == jsonSpriteSheetFullPath.isNull())
+        {
+            String spriteSheetFullPath = jsonSpriteSheetFullPath.as<String>();
+
+            if (true == spriteSheetFullPath.isEmpty())
+            {
+                clearSpriteSheet();
+            }
+            else
+            {
+                loadSpriteSheet(spriteSheetFullPath);
+            }
+
+            isSuccessful = true;
         }
     }
     else if (0U != topic.startsWith(String(TOPIC_LAMP) + "/"))
@@ -217,6 +264,7 @@ bool IconTextLampPlugin::setTopic(const String& topic, const JsonObject& value)
     {
         JsonVariantConst jsonFullPath = value["fullPath"];
 
+        /* File upload? */
         if (false == jsonFullPath.isNull())
         {
             String fullPath = jsonFullPath.as<String>();
@@ -224,6 +272,23 @@ bool IconTextLampPlugin::setTopic(const String& topic, const JsonObject& value)
             isSuccessful = loadBitmap(fullPath);
         }
     }
+    else if (0U != topic.equals(TOPIC_SPRITESHEET))
+    {
+        JsonVariantConst jsonFullPath = value["fullPath"];
+
+        /* File upload? */
+        if (false == jsonFullPath.isNull())
+        {
+            String fullPath = jsonFullPath.as<String>();
+
+            /* Don't use the return value, because there may be no bitmap
+             * available.
+             */
+            (void)loadSpriteSheet(fullPath);
+
+            isSuccessful = true;
+        }
+    }
     else
     {
         ;
@@ -287,18 +352,20 @@ bool IconTextLampPlugin::isUploadAccepted(const String& topic, const String& src
 
             isAccepted = true;
         }
+    }
+    else if (0U != topic.equals(TOPIC_SPRITESHEET))
+    {
         /* Accept upload of a sprite sheet file. */
-        else if (0U != srcFilename.endsWith(FILE_EXT_SPRITE_SHEET))
+        if (0U != srcFilename.endsWith(FILE_EXT_SPRITE_SHEET))
         {
             dstFilename = getFileName(FILE_EXT_SPRITE_SHEET);
 
             isAccepted = true;
         }
-        else
-        {
-            /* Not accepted. */
-            ;
-        }
+    }
+    else
+    {
+        ;
     }
 
     return isAccepted;
@@ -306,24 +373,37 @@ bool IconTextLampPlugin::isUploadAccepted(const String& topic, const String& src
 
 void IconTextLampPlugin::start(uint16_t width, uint16_t height)
 {
-    uint16_t                    tcHeight        = 0U;
-    uint16_t                    lampWidth       = 0U;
-    uint16_t                    lampDistance    = 0U;
-    const uint16_t              minDistance     = 1U;   /* Min. distance between lamps. */
-    const uint16_t              minBorder       = 1U;   /* Min. border left and right of all lamps. */
-    const uint16_t              canvasWidth     = width - ICON_WIDTH;
+    uint16_t                    tcHeight            = 0U;
+    uint16_t                    lampWidth           = 0U;
+    uint16_t                    lampDistance        = 0U;
+    const uint16_t              minDistance         = 1U;   /* Min. distance between lamps. */
+    const uint16_t              minBorder           = 1U;   /* Min. border left and right of all lamps. */
+    const uint16_t              canvasWidth         = width - ICON_WIDTH;
+    String                      bitmapFullPath      = getFileName(FILE_EXT_BITMAP);
+    String                      spriteSheetFullPath = getFileName(FILE_EXT_SPRITE_SHEET);
     MutexGuard<MutexRecursive>  guard(m_mutex);
 
     m_iconCanvas.setPosAndSize(0, 0, ICON_WIDTH, ICON_HEIGHT);
     (void)m_iconCanvas.addWidget(m_bitmapWidget);
 
-    /* If there is already an icon in the filesystem, it will be loaded.
-     * First check whether it is a animated sprite sheet and if not, try
-     * to load just a bitmap image.
+    /* If there is an icon in the filesystem with the plugin UID as filename,
+     * it will be loaded. First check whether it is a animated sprite sheet
+     * and if not, try to load just a bitmap image.
      */
-    if (false == m_bitmapWidget.loadSpriteSheet(FILESYSTEM, getFileName(FILE_EXT_SPRITE_SHEET), getFileName(FILE_EXT_BITMAP)))
+    m_iconPath.clear();
+    m_spriteSheetPath.clear();
+
+    if (false == m_bitmapWidget.loadSpriteSheet(FILESYSTEM, spriteSheetFullPath, bitmapFullPath))
+    {
+        if (true == m_bitmapWidget.load(FILESYSTEM, bitmapFullPath))
+        {
+            m_iconPath = bitmapFullPath;
+        }
+    }
+    else
     {
-        (void)m_bitmapWidget.load(FILESYSTEM, getFileName(FILE_EXT_BITMAP));
+        m_iconPath          = bitmapFullPath;
+        m_spriteSheetPath   = spriteSheetFullPath;
     }
 
     /* The text canvas is left aligned to the icon canvas and aligned to the
@@ -367,16 +447,20 @@ void IconTextLampPlugin::start(uint16_t width, uint16_t height)
 
 void IconTextLampPlugin::stop()
 {
-    MutexGuard<MutexRecursive> guard(m_mutex);
+    String                      bitmapFullPath       = getFileName(FILE_EXT_BITMAP);
+    String                      spriteSheetFullPath  = getFileName(FILE_EXT_SPRITE_SHEET);
+    MutexGuard<MutexRecursive>  guard(m_mutex);
 
-    if (false != FILESYSTEM.remove(getFileName(FILE_EXT_BITMAP)))
+    /* Remove icon which is specific for the plugin instance. */
+    if (false != FILESYSTEM.remove(bitmapFullPath))
     {
-        LOG_INFO("File %s removed", getFileName(FILE_EXT_BITMAP).c_str());
+        LOG_INFO("File %s removed", bitmapFullPath.c_str());
     }
 
-    if (false != FILESYSTEM.remove(getFileName(FILE_EXT_SPRITE_SHEET)))
+    /* Remove spritesheet which is specific for the plugin instance. */
+    if (false != FILESYSTEM.remove(spriteSheetFullPath))
     {
-        LOG_INFO("File %s removed", getFileName(FILE_EXT_SPRITE_SHEET).c_str());
+        LOG_INFO("File %s removed", spriteSheetFullPath.c_str());
     }
 }
 
@@ -417,36 +501,90 @@ bool IconTextLampPlugin::loadBitmap(const String& filename)
     bool                        status = false;
     MutexGuard<MutexRecursive>  guard(m_mutex);
 
-    if (0U != filename.endsWith(FILE_EXT_BITMAP))
+    if (m_iconPath != filename)
     {
-        status = m_bitmapWidget.load(FILESYSTEM, filename);
+        m_iconPath = filename;
 
-        /* Ensure that only the bitmap image file exists in the filesystem,
-         * otherwise after a restart, the obsolete sprite sheet will
-         * be loaded.
-         */
-        if (true == status)
-        {
-            (void)FILESYSTEM.remove(getFileName(FILE_EXT_SPRITE_SHEET));
-        }
+        m_hasTopicTextChanged = true;
     }
-    else if (0U != filename.endsWith(FILE_EXT_SPRITE_SHEET))
+
+    if (false == m_spriteSheetPath.isEmpty())
     {
-        String bmpFilename = filename;
+        status = m_bitmapWidget.loadSpriteSheet(FILESYSTEM, m_spriteSheetPath, m_iconPath);
+    }
+    
+    if (false == status)
+    {
+        status = m_bitmapWidget.load(FILESYSTEM, m_iconPath);
+    }
+
+    return status;
+}
+
+bool IconTextLampPlugin::loadSpriteSheet(const String& filename)
+{
+    bool                        status = false;
+    MutexGuard<MutexRecursive>  guard(m_mutex);
 
-        bmpFilename.replace(FILE_EXT_SPRITE_SHEET, FILE_EXT_BITMAP);
+    if (m_spriteSheetPath != filename)
+    {
+        m_spriteSheetPath = filename;
 
-        status = m_bitmapWidget.loadSpriteSheet(FILESYSTEM, filename,  bmpFilename);
+        m_hasTopicTextChanged = true;
     }
-    else
+
+    if (false == m_iconPath.isEmpty())
     {
-        /* Not supported. */
-        ;
+        status = m_bitmapWidget.loadSpriteSheet(FILESYSTEM, m_spriteSheetPath, m_iconPath);
     }
 
     return status;
 }
 
+void IconTextLampPlugin::clearBitmap()
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    if (false == m_iconPath.isEmpty())
+    {
+        m_iconPath.clear();
+        m_bitmapWidget.clear(ColorDef::BLACK);
+
+        m_hasTopicTextChanged = true;
+    }
+}
+
+void IconTextLampPlugin::clearSpriteSheet()
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    if (false == m_spriteSheetPath.isEmpty())
+    {
+        m_spriteSheetPath.clear();
+
+        m_hasTopicTextChanged = true;
+    }
+
+    if (false == m_iconPath.isEmpty())
+    {
+        (void)m_bitmapWidget.load(FILESYSTEM, m_iconPath);
+    }
+}
+
+void IconTextLampPlugin::getIconFilePath(String& fullPath) const
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    fullPath = m_iconPath;
+}
+
+void IconTextLampPlugin::getSpriteSheetFilePath(String& fullPath) const
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    fullPath = m_spriteSheetPath;
+}
+
 bool IconTextLampPlugin::getLamp(uint8_t lampId) const
 {
     bool lampState = false;
diff --git a/lib/IconTextLampPlugin/src/IconTextLampPlugin.h b/lib/IconTextLampPlugin/src/IconTextLampPlugin.h
index 7c9ae158..b16d552d 100644
--- a/lib/IconTextLampPlugin/src/IconTextLampPlugin.h
+++ b/lib/IconTextLampPlugin/src/IconTextLampPlugin.h
@@ -83,6 +83,8 @@ class IconTextLampPlugin : public Plugin
         m_lampCanvas(),
         m_bitmapWidget(),
         m_textWidget(),
+        m_iconPath(),
+        m_spriteSheetPath(),
         m_lampWidgets(),
         m_mutex(),
         m_hasTopicTextChanged(false),
@@ -110,7 +112,7 @@ class IconTextLampPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new IconTextLampPlugin(name, uid);
+        return new(std::nothrow)IconTextLampPlugin(name, uid);
     }
 
     /**
@@ -163,7 +165,7 @@ class IconTextLampPlugin : public Plugin
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
@@ -230,18 +232,49 @@ class IconTextLampPlugin : public Plugin
     void setText(const String& formatText);
 
     /**
-     * Load bitmap image / sprite sheet from filesystem.
-     * If a bitmap image is loaded, it will remove a corresponding sprite
-     * sheet file from filesystem.
-     * If a sprite sheet is loaded, it will load the texture file from
-     * filesystem. This assumes that the texture file was uploaded before!
+     * Load bitmap image from filesystem. If a sprite sheet is available, the
+     * bitmap will be automatically used as texture for animation.
      *
-     * @param[in] filename  Bitmap image / Sprite sheet filename
+     * @param[in] filename  Bitmap image filename
      *
      * @return If successul, it will return true otherwise false.
      */
     bool loadBitmap(const String& filename);
 
+    /**
+     * Load sprite sheet from filesystem. If a bitmap is available, it will
+     * be automatically used as texture for animation.
+     *
+     * @param[in] filename  Sprite sheet filename
+     *
+     * @return If successul, it will return true otherwise false.
+     */
+    bool loadSpriteSheet(const String& filename);
+
+    /**
+     * Clear bitmap icon.
+     */
+    void clearBitmap();
+
+    /**
+     * Clear sprite sheet.
+     */
+    void clearSpriteSheet();
+
+    /**
+     * Get icon file path.
+     * 
+     * @param[out] Path to icon file.
+     */
+    void getIconFilePath(String& fullPath) const;
+
+    /**
+     * Get sprite sheet file path.
+     * 
+     * @param[out] Path to sprite sheet file.
+     */
+    void getSpriteSheetFilePath(String& fullPath) const;
+
     /**
      * Get lamp state (true = on / false = off).
      * 
@@ -281,6 +314,11 @@ class IconTextLampPlugin : public Plugin
      */
     static const char*      TOPIC_ICON;
 
+    /**
+     * Plugin topic, used for parameter exchange.
+     */
+    static const char*      TOPIC_SPRITESHEET;
+
     /**
      * Icon width in pixels.
      */
@@ -311,6 +349,8 @@ class IconTextLampPlugin : public Plugin
     WidgetGroup             m_lampCanvas;                       /**< Canvas used for the lamp widget. */
     BitmapWidget            m_bitmapWidget;                     /**< Bitmap widget, used to show the icon. */
     TextWidget              m_textWidget;                       /**< Text widget, used for showing the text. */
+    String                  m_iconPath;                         /**< Full path to icon. */
+    String                  m_spriteSheetPath;                  /**< Full path to spritesheet. */
     LampWidget              m_lampWidgets[MAX_LAMPS];           /**< Lamp widgets, used to signal different things. */
     mutable MutexRecursive  m_mutex;                            /**< Mutex to protect against concurrent access. */
     bool                    m_hasTopicTextChanged;              /**< Has the topic text content changed? */
diff --git a/lib/IconTextLampPlugin/web/IconTextLampPlugin.html b/lib/IconTextLampPlugin/web/IconTextLampPlugin.html
index a7cc80ce..f277bd6a 100644
--- a/lib/IconTextLampPlugin/web/IconTextLampPlugin.html
+++ b/lib/IconTextLampPlugin/web/IconTextLampPlugin.html
@@ -57,20 +57,29 @@ <h3 class="mt-1">Get text</h3>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
                 </ul>
                 <h3 class="mt-1">Set text</h3>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/text?text=&lt;TEXT&gt;</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/text?text=&lt;TEXT&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/text?text=&lt;TEXT&gt;&AMP;ICONFULLPATH=&lt;ICON-FULL-PATH&gt;&AMP;SPRITESHEETFULLPATH=&lt;SPRITESHEET-FULL-PATH&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/text?text=&lt;TEXT&gt;&AMP;ICONFULLPATH=&lt;ICON-FULL-PATH&gt;&AMP;SPRITESHEETFULLPATH=&lt;SPRITESHEET-FULL-PATH&gt;</code></pre>
                 <ul>
                     <li>PLUGIN-UID: The plugin unique id.</li>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
                     <li>TEXT: The text to show on the display.</li>
+                    <li>ICON-FULL-PATH: Full path to the icon.</li>
+                    <li>SPRITESHEET-FULL-PATH: Full path to the sprite sheet.</li>
                 </ul>
-                <h3 class="mt-1">Set icon</h3>
+                <h3 class="mt-1">Upload icon</h3>
                 <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/bitmap</code></pre>
                 <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/bitmap</code></pre>
                 <ul>
                     <li>PLUGIN-UID: The plugin unique id.</li>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
                 </ul>
+                <h3 class="mt-1">Upload sprite sheet</h3>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/spritesheet</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/spritesheet</code></pre>
+                <ul>
+                    <li>PLUGIN-UID: The plugin unique id.</li>
+                    <li>PLUGIN-ALIAS: The plugin alias name.</li>
+                </ul>
                 <h3 class="mt-1">Get all lamp states</h3>
                 <pre name="injectOrigin" class="text-light"><code>GET {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/lamps</code></pre>
                 <pre name="injectOrigin" class="text-light"><code>GET {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/lamps</code></pre>
@@ -89,7 +98,7 @@ <h3 class="mt-1">Set lamp state</h3>
                 </ul>
                 <h2 class="mt-2">Configuration</h2>
                 <h3 class="mt-1">Icon</h3>
-                <form id="myFormIcon" enctype="multipart/form-data" action="javascript:setIcon(pluginUidIcon.options[pluginUidIcon.selectedIndex].value, icon.files[0])">
+                <form id="myFormIcon" enctype="multipart/form-data" action="javascript:uploadIcon(pluginUidIcon.options[pluginUidIcon.selectedIndex].value, icon.files[0])">
                     <div class="form-group">
                         <label for="pluginUidIcon">Plugin UID:</label>
                         <select id="pluginUidIcon" name="pluginUid" size="1">
@@ -97,23 +106,44 @@ <h3 class="mt-1">Icon</h3>
                     </div>
                     <div class="form-group">
                         <label for="icon">Icon:</label>
-                        <input id="icon" type="file" />    
+                        <input id="icon" type="file" accept=".bmp" />    
+                    </div>
+                    <input name="submit" type="submit" value="Update"/>
+                </form>
+                <h3 class="mt-1">Sprite sheet</h3>
+                <form id="myFormSpriteSheet" enctype="multipart/form-data" action="javascript:uploadSpriteSheet(pluginUidSpriteSheet.options[pluginUidSpriteSheet.selectedIndex].value, spriteSheet.files[0])">
+                    <div class="form-group">
+                        <label for="pluginUid">Plugin UID:</label>
+                        <select id="pluginUidSpriteSheet" name="pluginUid" size="1">
+                        </select>    
+                    </div>
+                    <div class="form-group">
+                        <label for="spriteSheet">Sprite sheet:</label>
+                        <input id="spriteSheet" type="file" accept=".sprite" />
                     </div>
                     <input name="submit" type="submit" value="Update"/>
                 </form>
                 <h3 class="mt-1">Text</h3>
-                <form id="myFormText" action="javascript:setText(pluginUidText.options[pluginUidText.selectedIndex].value, justText.value)">
+                <form id="myFormText" action="javascript:setText(pluginUidText.options[pluginUidText.selectedIndex].value, justText.value, iconFullPath.value, spriteSheetFullPath.value)">
                     <div class="form-group">
                         <label for="pluginUidText">Plugin UID:</label>
-                        <select id="pluginUidText" name="pluginUid" size="1" onChange="getText(pluginUidText.options[pluginUidText.selectedIndex].value, 'justText')">
+                        <select id="pluginUidText" name="pluginUid" size="1" onChange="getText(pluginUidText.options[pluginUidText.selectedIndex].value, 'justText', 'iconFullPath', 'spriteSheetFullPath')">
                         </select>    
                     </div>
                     <div class="form-group">
                         <label for="justText">Text:</label>
-                        <input type="text" id="justText" name="justText" value="" size="20" />    
+                        <input type="text" id="justText" name="justText" value="" size="20" />
+                    </div>
+                    <div class="form-group">
+                        <label for="iconFullPath">Icon full path:</label>
+                        <input type="text" id="iconFullPath" name="iconFullPath" value="" size="40" />    
+                    </div>
+                    <div class="form-group">
+                        <label for="spriteSheetFullPath">Sprite sheet full path:</label>
+                        <input type="text" id="spriteSheetFullPath" name="spriteSheetFullPath" value="" size="40" />    
                     </div>
                     <input name="submit" type="submit" value="Update"/>
-                </form>
+                </form>   
                 <h3 class="mt-1">Lamp</h3>
                 <form id="myFormLamp" action="javascript:setLamp(pluginUidLamp.options[pluginUidLamp.selectedIndex].value, lampId.options[lampId.selectedIndex].value, lampState.options[lampState.selectedIndex].value)">
                     <div class="form-group">
@@ -169,12 +199,14 @@ <h3 class="mt-1">Lamp</h3>
 
             function enableUI() {
                 utils.enableForm("myFormIcon", true);
+                utils.enableForm("myFormSpriteSheet", true);
                 utils.enableForm("myFormText", true);
                 utils.enableForm("myFormLamp", true);
             }
 
             function disableUI() {
                 utils.enableForm("myFormIcon", false);
+                utils.enableForm("myFormSpriteSheet", false);
                 utils.enableForm("myFormText", false);
                 utils.enableForm("myFormLamp", false);
             }
@@ -222,12 +254,43 @@ <h3 class="mt-1">Lamp</h3>
                 });
             };
 
-            function setIcon(pluginUid, file) {
+            function uploadIcon(pluginUid, file) {
+                disableUI();
+
+                return utils.checkBMPFile(file).then(function() {
+                    return utils.makeRequest({
+                        method: "POST",
+                        url: "/rest/api/v1/display/uid/" + pluginUid + "/bitmap",
+                        isJsonResponse: true,
+                        parameter: {
+                            file: file
+                        },
+                        headers: {
+                            "X-File-Size": file.size
+                        }
+                    });
+                }).then(function(rsp) {
+                    updateForms();
+                    alert("Ok.");
+                }).catch(function(rsp) {
+                    if ("string" === typeof rsp) {
+                        alert("Error: " + rsp);
+                    } else if (("undefined" !== typeof rsp) && ("undefined" !== typeof rsp.error) && ("string" === typeof rsp.error.msg)) {
+                        alert("Error: " + rsp.error.msg);
+                    } else {
+                        alert("Failed.");
+                    }
+                }).finally(function() {
+                    enableUI();
+                });
+            }
+
+            function uploadSpriteSheet(pluginUid, file) {
                 disableUI();
 
                 return utils.makeRequest({
                     method: "POST",
-                    url: "/rest/api/v1/display/uid/" + pluginUid + "/bitmap",
+                    url: "/rest/api/v1/display/uid/" + pluginUid + "/spritesheet",
                     isJsonResponse: true,
                     parameter: {
                         file: file
@@ -236,15 +299,20 @@ <h3 class="mt-1">Lamp</h3>
                         "X-File-Size": file.size
                     }
                 }).then(function(rsp) {
+                    updateForms();
                     alert("Ok.");
                 }).catch(function(rsp) {
-                    alert("Failed.");
+                    if (("undefined" !== typeof rsp.error) && ("string" === typeof rsp.error.msg)) {
+                        alert("Error: " + rsp.error.msg);
+                    } else {
+                        alert("Failed.");
+                    }
                 }).finally(function() {
                     enableUI();
                 });
             }
 
-            function getText(pluginUid, justTextId) {
+            function getText(pluginUid, justTextId, iconFullPathId, spriteSheetFullPathId) {
                 disableUI();
                 return utils.makeRequest({
                     method: "GET",
@@ -252,8 +320,12 @@ <h3 class="mt-1">Lamp</h3>
                     isJsonResponse: true
                 }).then(function(rsp) {
                     var justTextInput = document.getElementById(justTextId);
+                    var iconFullPathInput = document.getElementById(iconFullPathId);
+                    var spriteSheetFullPathInput = document.getElementById(spriteSheetFullPathId);
 
                     justTextInput.value = rsp.data.text;
+                    iconFullPathInput.value = rsp.data.iconFullPath;
+                    spriteSheetFullPathInput.value = rsp.data.spriteSheetFullPath;
 
                 }).catch(function(rsp) {
                     alert("Internal error.");
@@ -262,7 +334,7 @@ <h3 class="mt-1">Lamp</h3>
                 });
             }
 
-            function setText(pluginUid, justText) {
+            function setText(pluginUid, justText, iconFullPath, spriteSheetFullPath) {
                 disableUI();
 
                 return utils.makeRequest({
@@ -270,7 +342,9 @@ <h3 class="mt-1">Lamp</h3>
                     url: "/rest/api/v1/display/uid/" + pluginUid + "/text",
                     isJsonResponse: true,
                     parameter: {
-                        text: justText
+                        text: justText,
+                        iconFullPath: iconFullPath,
+                        spriteSheetFullPath: spriteSheetFullPath
                     }
                 }).then(function(rsp) {
                     alert("Ok.");
@@ -322,6 +396,20 @@ <h3 class="mt-1">Lamp</h3>
                 });
             }
 
+            function updateForms() {
+                var selectText = document.getElementById("pluginUidText");
+
+                if (0 <= selectText.selectedIndex) {
+
+                    return getText(
+                        selectText.options[selectText.selectedIndex].value,
+                        "justText",
+                        "iconFullPath",
+                        "spriteSheetFullPath"
+                    );
+                }
+            }
+
             $(document).ready(function() {
                 menu.addSubMenu(menu.data, "Plugins", pluginSubMenu);
                 menu.create("menu", menu.data);
@@ -339,10 +427,7 @@ <h3 class="mt-1">Lamp</h3>
 
                     if (0 < cnt) {
 
-                        return getText(
-                            selectText.options[selectText.selectedIndex].value,
-                            "justText"
-                        ).then(function() {
+                        return updateForms().then(function() {
                             return getLamp(
                                 selectLamp.options[selectLamp.selectedIndex].value,
                                 selectLampId.options[selectLampId.selectedIndex].value,
diff --git a/lib/IconTextPlugin/src/IconTextPlugin.cpp b/lib/IconTextPlugin/src/IconTextPlugin.cpp
index c0a77af3..89519a9e 100644
--- a/lib/IconTextPlugin/src/IconTextPlugin.cpp
+++ b/lib/IconTextPlugin/src/IconTextPlugin.cpp
@@ -64,6 +64,9 @@ const char* IconTextPlugin::TOPIC_TEXT              = "/text";
 /* Initialize plugin topic. */
 const char* IconTextPlugin::TOPIC_ICON              = "/bitmap";
 
+/* Initialize plugin topic. */
+const char* IconTextPlugin::TOPIC_SPRITESHEET       = "/spritesheet";
+
 /* Initialize bitmap image filename extension. */
 const char* IconTextPlugin::FILE_EXT_BITMAP         = ".bmp";
 
@@ -90,19 +93,24 @@ bool IconTextPlugin::isEnabled() const
 
 void IconTextPlugin::getTopics(JsonArray& topics) const
 {
-    JsonObject  jsonText    = topics.createNestedObject();
-    JsonObject  jsonIcon    = topics.createNestedObject();
+    JsonObject  jsonText        = topics.createNestedObject();
+    JsonObject  jsonIcon        = topics.createNestedObject();
+    JsonObject  jsonSpriteSheet = topics.createNestedObject();
 
     jsonText["name"]            = TOPIC_TEXT;
 
-    /* Home Assistant support of MQTT discovery */
-    jsonText["ha"]["component"]         = "text";
-    jsonText["ha"]["commandTemplate"]   = "{\"text\": \"{{ value }}\" }";
-    jsonText["ha"]["valueTemplate"]     = "{{ value_json.text }}";
-    jsonText["ha"]["icon"]              = "mdi:form-textbox";
+    /* Home Assistant support of MQTT discovery (https://www.home-assistant.io/integrations/mqtt) */
+    jsonText["ha"]["component"]             = "text";                           /* MQTT integration */
+    jsonText["ha"]["discovery"]["name"]     = "MQTT text";                      /* Application that is the origin the discovered MQTT. */
+    jsonText["ha"]["discovery"]["cmd_tpl"]  = "{\"text\": \"{{ value }}\" }";   /* Command template */
+    jsonText["ha"]["discovery"]["val_tpl"]  = "{{ value_json.text }}";          /* Value template */
+    jsonText["ha"]["discovery"]["ic"]       = "mdi:form-textbox";               /* Icon (MaterialDesignIcons.com) */
 
-    jsonIcon["name"]    = TOPIC_ICON;
-    jsonIcon["access"]  = "w"; /* Only icon upload is supported. */
+    jsonIcon["name"]            = TOPIC_ICON;
+    jsonIcon["access"]          = "w"; /* Only icon upload is supported. */
+
+    jsonSpriteSheet["name"]     = TOPIC_SPRITESHEET;
+    jsonSpriteSheet["access"]   = "w"; /* Only sprite sheet upload is supported. */
 }
 
 bool IconTextPlugin::getTopic(const String& topic, JsonObject& value) const
@@ -111,9 +119,16 @@ bool IconTextPlugin::getTopic(const String& topic, JsonObject& value) const
 
     if (0U != topic.equals(TOPIC_TEXT))
     {
-        String  formattedText   = getText();
+        String  formattedText       = getText();
+        String  iconFullPath;
+        String  spriteSheetFullPath;
+
+        getIconFilePath(iconFullPath);
+        getSpriteSheetFilePath(spriteSheetFullPath);
 
-        value["text"] = formattedText;
+        value["text"]                   = formattedText;
+        value["iconFullPath"]           = iconFullPath;
+        value["spriteSheetFullPath"]    = spriteSheetFullPath;
 
         isSuccessful = true;
     }
@@ -121,30 +136,62 @@ bool IconTextPlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool IconTextPlugin::setTopic(const String& topic, const JsonObject& value)
+bool IconTextPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
     if (0U != topic.equals(TOPIC_TEXT))
     {
-        String              text;
-        JsonVariantConst    jsonShow    = value["text"];
+        JsonVariantConst    jsonText                = value["text"];
+        JsonVariantConst    jsonIconFullPath        = value["iconFullPath"];
+        JsonVariantConst    jsonSpriteSheetFullPath = value["spriteSheetFullPath"];
 
-        if (false == jsonShow.isNull())
+        if (false == jsonText.isNull())
         {
-            text = jsonShow.as<String>();
+            String text = jsonText.as<String>();
+
+            setText(text);
+
             isSuccessful = true;
         }
 
-        if (true == isSuccessful)
+        if (false == jsonIconFullPath.isNull())
         {
-            setText(text);
+            String iconFullPath = jsonIconFullPath.as<String>();
+
+            if (true == iconFullPath.isEmpty())
+            {
+                clearBitmap();
+            }
+            else
+            {
+                loadBitmap(iconFullPath);
+            }
+
+            isSuccessful = true;
+        }
+
+        if (false == jsonSpriteSheetFullPath.isNull())
+        {
+            String spriteSheetFullPath = jsonSpriteSheetFullPath.as<String>();
+
+            if (true == spriteSheetFullPath.isEmpty())
+            {
+                clearSpriteSheet();
+            }
+            else
+            {
+                loadSpriteSheet(spriteSheetFullPath);
+            }
+
+            isSuccessful = true;
         }
     }
     else if (0U != topic.equals(TOPIC_ICON))
     {
         JsonVariantConst jsonFullPath = value["fullPath"];
 
+        /* File upload? */
         if (false == jsonFullPath.isNull())
         {
             String fullPath = jsonFullPath.as<String>();
@@ -152,6 +199,23 @@ bool IconTextPlugin::setTopic(const String& topic, const JsonObject& value)
             isSuccessful = loadBitmap(fullPath);
         }
     }
+    else if (0U != topic.equals(TOPIC_SPRITESHEET))
+    {
+        JsonVariantConst jsonFullPath = value["fullPath"];
+
+        /* File upload? */
+        if (false == jsonFullPath.isNull())
+        {
+            String fullPath = jsonFullPath.as<String>();
+
+            /* Don't use the return value, because there may be no bitmap
+             * available.
+             */
+            (void)loadSpriteSheet(fullPath);
+
+            isSuccessful = true;
+        }
+    }
     else
     {
         ;
@@ -189,18 +253,20 @@ bool IconTextPlugin::isUploadAccepted(const String& topic, const String& srcFile
 
             isAccepted = true;
         }
+    }
+    else if (0U != topic.equals(TOPIC_SPRITESHEET))
+    {
         /* Accept upload of a sprite sheet file. */
-        else if (0U != srcFilename.endsWith(FILE_EXT_SPRITE_SHEET))
+        if (0U != srcFilename.endsWith(FILE_EXT_SPRITE_SHEET))
         {
             dstFilename = getFileName(FILE_EXT_SPRITE_SHEET);
 
             isAccepted = true;
         }
-        else
-        {
-            /* Not accepted. */
-            ;
-        }
+    }
+    else
+    {
+        ;
     }
 
     return isAccepted;
@@ -208,18 +274,31 @@ bool IconTextPlugin::isUploadAccepted(const String& topic, const String& srcFile
 
 void IconTextPlugin::start(uint16_t width, uint16_t height)
 {
-    MutexGuard<MutexRecursive> guard(m_mutex);
+    String                      bitmapFullPath      = getFileName(FILE_EXT_BITMAP);
+    String                      spriteSheetFullPath = getFileName(FILE_EXT_SPRITE_SHEET);
+    MutexGuard<MutexRecursive>  guard(m_mutex);
 
     m_iconCanvas.setPosAndSize(0, 0, ICON_WIDTH, ICON_HEIGHT);
     (void)m_iconCanvas.addWidget(m_bitmapWidget);
 
-    /* If there is already an icon in the filesystem, it will be loaded.
-     * First check whether it is a animated sprite sheet and if not, try
-     * to load just a bitmap image.
+    /* If there is an icon in the filesystem with the plugin UID as filename,
+     * it will be loaded. First check whether it is a animated sprite sheet
+     * and if not, try to load just a bitmap image.
      */
-    if (false == m_bitmapWidget.loadSpriteSheet(FILESYSTEM, getFileName(FILE_EXT_SPRITE_SHEET), getFileName(FILE_EXT_BITMAP)))
+    m_iconPath.clear();
+    m_spriteSheetPath.clear();
+
+    if (false == m_bitmapWidget.loadSpriteSheet(FILESYSTEM, spriteSheetFullPath, bitmapFullPath))
+    {
+        if (true == m_bitmapWidget.load(FILESYSTEM, bitmapFullPath))
+        {
+            m_iconPath = bitmapFullPath;
+        }
+    }
+    else
     {
-        (void)m_bitmapWidget.load(FILESYSTEM, getFileName(FILE_EXT_BITMAP));
+        m_iconPath          = bitmapFullPath;
+        m_spriteSheetPath   = spriteSheetFullPath;
     }
 
     /* The text canvas is left aligned to the icon canvas and it spans over
@@ -245,16 +324,20 @@ void IconTextPlugin::start(uint16_t width, uint16_t height)
 
 void IconTextPlugin::stop()
 {
-    MutexGuard<MutexRecursive> guard(m_mutex);
+    String                      bitmapFullPath       = getFileName(FILE_EXT_BITMAP);
+    String                      spriteSheetFullPath  = getFileName(FILE_EXT_SPRITE_SHEET);
+    MutexGuard<MutexRecursive>  guard(m_mutex);
 
-    if (false != FILESYSTEM.remove(getFileName(FILE_EXT_BITMAP)))
+    /* Remove icon which is specific for the plugin instance. */
+    if (false != FILESYSTEM.remove(bitmapFullPath))
     {
-        LOG_INFO("File %s removed", getFileName(FILE_EXT_BITMAP).c_str());
+        LOG_INFO("File %s removed", bitmapFullPath.c_str());
     }
 
-    if (false != FILESYSTEM.remove(getFileName(FILE_EXT_SPRITE_SHEET)))
+    /* Remove spritesheet which is specific for the plugin instance. */
+    if (false != FILESYSTEM.remove(spriteSheetFullPath))
     {
-        LOG_INFO("File %s removed", getFileName(FILE_EXT_SPRITE_SHEET).c_str());
+        LOG_INFO("File %s removed", spriteSheetFullPath.c_str());
     }
 }
 
@@ -294,36 +377,90 @@ bool IconTextPlugin::loadBitmap(const String& filename)
     bool                        status = false;
     MutexGuard<MutexRecursive>  guard(m_mutex);
 
-    if (0U != filename.endsWith(FILE_EXT_BITMAP))
+    if (m_iconPath != filename)
     {
-        status = m_bitmapWidget.load(FILESYSTEM, filename);
+        m_iconPath = filename;
 
-        /* Ensure that only the bitmap image file exists in the filesystem,
-         * otherwise after a restart, the obsolete sprite sheet will
-         * be loaded.
-         */
-        if (true == status)
-        {
-            (void)FILESYSTEM.remove(getFileName(FILE_EXT_SPRITE_SHEET));
-        }
+        m_hasTopicChanged = true;
     }
-    else if (0U != filename.endsWith(FILE_EXT_SPRITE_SHEET))
+
+    if (false == m_spriteSheetPath.isEmpty())
+    {
+        status = m_bitmapWidget.loadSpriteSheet(FILESYSTEM, m_spriteSheetPath, m_iconPath);
+    }
+    
+    if (false == status)
     {
-        String bmpFilename = filename;
+        status = m_bitmapWidget.load(FILESYSTEM, m_iconPath);
+    }
+
+    return status;
+}
+
+bool IconTextPlugin::loadSpriteSheet(const String& filename)
+{
+    bool                        status = false;
+    MutexGuard<MutexRecursive>  guard(m_mutex);
 
-        bmpFilename.replace(FILE_EXT_SPRITE_SHEET, FILE_EXT_BITMAP);
+    if (m_spriteSheetPath != filename)
+    {
+        m_spriteSheetPath = filename;
 
-        status = m_bitmapWidget.loadSpriteSheet(FILESYSTEM, filename,  bmpFilename);
+        m_hasTopicChanged = true;
     }
-    else
+
+    if (false == m_iconPath.isEmpty())
     {
-        /* Not supported. */
-        ;
+        status = m_bitmapWidget.loadSpriteSheet(FILESYSTEM, m_spriteSheetPath, m_iconPath);
     }
 
     return status;
 }
 
+void IconTextPlugin::clearBitmap()
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    if (false == m_iconPath.isEmpty())
+    {
+        m_iconPath.clear();
+        m_bitmapWidget.clear(ColorDef::BLACK);
+
+        m_hasTopicChanged = true;
+    }
+}
+
+void IconTextPlugin::clearSpriteSheet()
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    if (false == m_spriteSheetPath.isEmpty())
+    {
+        m_spriteSheetPath.clear();
+
+        m_hasTopicChanged = true;
+    }
+
+    if (false == m_iconPath.isEmpty())
+    {
+        (void)m_bitmapWidget.load(FILESYSTEM, m_iconPath);
+    }
+}
+
+void IconTextPlugin::getIconFilePath(String& fullPath) const
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    fullPath = m_iconPath;
+}
+
+void IconTextPlugin::getSpriteSheetFilePath(String& fullPath) const
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
+
+    fullPath = m_spriteSheetPath;
+}
+
 /******************************************************************************
  * Protected Methods
  *****************************************************************************/
diff --git a/lib/IconTextPlugin/src/IconTextPlugin.h b/lib/IconTextPlugin/src/IconTextPlugin.h
index e0221911..e0e583ed 100644
--- a/lib/IconTextPlugin/src/IconTextPlugin.h
+++ b/lib/IconTextPlugin/src/IconTextPlugin.h
@@ -81,6 +81,8 @@ class IconTextPlugin : public Plugin
         m_iconCanvas(),
         m_bitmapWidget(),
         m_textWidget(),
+        m_iconPath(),
+        m_spriteSheetPath(),
         m_isUploadError(false),
         m_mutex(),
         m_hasTopicChanged(false)
@@ -106,7 +108,7 @@ class IconTextPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new IconTextPlugin(name, uid);
+        return new(std::nothrow)IconTextPlugin(name, uid);
     }
 
     /**
@@ -191,7 +193,7 @@ class IconTextPlugin : public Plugin
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
@@ -258,18 +260,49 @@ class IconTextPlugin : public Plugin
     void setText(const String& formatText);
 
     /**
-     * Load bitmap image / sprite sheet from filesystem.
-     * If a bitmap image is loaded, it will remove a corresponding sprite
-     * sheet file from filesystem.
-     * If a sprite sheet is loaded, it will load the texture file from
-     * filesystem. This assumes that the texture file was uploaded before!
+     * Load bitmap image from filesystem. If a sprite sheet is available, the
+     * bitmap will be automatically used as texture for animation.
      *
-     * @param[in] filename  Bitmap image / Sprite sheet filename
+     * @param[in] filename  Bitmap image filename
      *
      * @return If successul, it will return true otherwise false.
      */
     bool loadBitmap(const String& filename);
 
+    /**
+     * Load sprite sheet from filesystem. If a bitmap is available, it will
+     * be automatically used as texture for animation.
+     *
+     * @param[in] filename  Sprite sheet filename
+     *
+     * @return If successul, it will return true otherwise false.
+     */
+    bool loadSpriteSheet(const String& filename);
+
+    /**
+     * Clear bitmap icon.
+     */
+    void clearBitmap();
+
+    /**
+     * Clear sprite sheet.
+     */
+    void clearSpriteSheet();
+
+    /**
+     * Get icon file path.
+     * 
+     * @param[out] Path to icon file.
+     */
+    void getIconFilePath(String& fullPath) const;
+
+    /**
+     * Get sprite sheet file path.
+     * 
+     * @param[out] Path to sprite sheet file.
+     */
+    void getSpriteSheetFilePath(String& fullPath) const;
+
 private:
 
     /**
@@ -282,6 +315,11 @@ class IconTextPlugin : public Plugin
      */
     static const char*      TOPIC_ICON;
 
+    /**
+     * Plugin topic, used for parameter exchange.
+     */
+    static const char*      TOPIC_SPRITESHEET;
+
     /**
      * Icon width in pixels.
      */
@@ -307,6 +345,8 @@ class IconTextPlugin : public Plugin
     WidgetGroup             m_iconCanvas;       /**< Canvas used for the bitmap widget. */
     BitmapWidget            m_bitmapWidget;     /**< Bitmap widget, used to show the icon. */
     TextWidget              m_textWidget;       /**< Text widget, used for showing the text. */
+    String                  m_iconPath;         /**< Full path to icon. */
+    String                  m_spriteSheetPath;  /**< Full path to spritesheet. */
     bool                    m_isUploadError;    /**< Flag to signal a upload error. */
     mutable MutexRecursive  m_mutex;            /**< Mutex to protect against concurrent access. */
     bool                    m_hasTopicChanged;  /**< Has the topic text content changed? */
diff --git a/lib/IconTextPlugin/web/IconTextPlugin.html b/lib/IconTextPlugin/web/IconTextPlugin.html
index 36325d1f..8fb86e00 100644
--- a/lib/IconTextPlugin/web/IconTextPlugin.html
+++ b/lib/IconTextPlugin/web/IconTextPlugin.html
@@ -57,23 +57,32 @@ <h3 class="mt-1">Get text</h3>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
                 </ul>
                 <h3 class="mt-1">Set text</h3>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/text?text=&lt;TEXT&gt;</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/text?text=&lt;TEXT&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/text?text=&lt;TEXT&gt;&AMP;ICONFULLPATH=&lt;ICON-FULL-PATH&gt;&AMP;SPRITESHEETFULLPATH=&lt;SPRITESHEET-FULL-PATH&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/text?text=&lt;TEXT&gt;&AMP;ICONFULLPATH=&lt;ICON-FULL-PATH&gt;&AMP;SPRITESHEETFULLPATH=&lt;SPRITESHEET-FULL-PATH&gt;</code></pre>
                 <ul>
                     <li>PLUGIN-UID: The plugin unique id.</li>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
                     <li>TEXT: The text to show on the display.</li>
+                    <li>ICON-FULL-PATH: Full path to the icon.</li>
+                    <li>SPRITESHEET-FULL-PATH: Full path to the sprite sheet.</li>
                 </ul>
-                <h3 class="mt-1">Set icon</h3>
+                <h3 class="mt-1">Upload icon</h3>
                 <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/bitmap</code></pre>
                 <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/bitmap</code></pre>
                 <ul>
                     <li>PLUGIN-UID: The plugin unique id.</li>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
                 </ul>
+                <h3 class="mt-1">Upload sprite sheet</h3>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/spritesheet</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/spritesheet</code></pre>
+                <ul>
+                    <li>PLUGIN-UID: The plugin unique id.</li>
+                    <li>PLUGIN-ALIAS: The plugin alias name.</li>
+                </ul>
                 <h2 class="mt-2">Configuration</h2>
                 <h3 class="mt-1">Icon</h3>
-                <form id="myFormIcon" enctype="multipart/form-data" action="javascript:setIcon(pluginUidIcon.options[pluginUidIcon.selectedIndex].value, icon.files[0])">
+                <form id="myFormIcon" enctype="multipart/form-data" action="javascript:uploadIcon(pluginUidIcon.options[pluginUidIcon.selectedIndex].value, icon.files[0])">
                     <div class="form-group">
                         <label for="pluginUid">Plugin UID:</label>
                         <select id="pluginUidIcon" name="pluginUid" size="1">
@@ -81,20 +90,41 @@ <h3 class="mt-1">Icon</h3>
                     </div>
                     <div class="form-group">
                         <label for="icon">Icon:</label>
-                        <input id="icon" type="file" />    
+                        <input id="icon" type="file" accept=".bmp" />    
+                    </div>
+                    <input name="submit" type="submit" value="Update"/>
+                </form>
+                <h3 class="mt-1">Sprite sheet</h3>
+                <form id="myFormSpriteSheet" enctype="multipart/form-data" action="javascript:uploadSpriteSheet(pluginUidSpriteSheet.options[pluginUidSpriteSheet.selectedIndex].value, spriteSheet.files[0])">
+                    <div class="form-group">
+                        <label for="pluginUid">Plugin UID:</label>
+                        <select id="pluginUidSpriteSheet" name="pluginUid" size="1">
+                        </select>    
+                    </div>
+                    <div class="form-group">
+                        <label for="spriteSheet">Sprite sheet:</label>
+                        <input id="spriteSheet" type="file" accept=".sprite"/>
                     </div>
                     <input name="submit" type="submit" value="Update"/>
                 </form>
                 <h3 class="mt-1">Text</h3>
-                <form id="myFormText" action="javascript:setText(pluginUidText.options[pluginUidText.selectedIndex].value, justText.value)">
+                <form id="myFormText" action="javascript:setText(pluginUidText.options[pluginUidText.selectedIndex].value, justText.value, iconFullPath.value, spriteSheetFullPath.value)">
                     <div class="form-group">
                         <label for="pluginUidText">Plugin UID:</label>
-                        <select id="pluginUidText" name="pluginUid" size="1" onChange="getText(pluginUidText.options[pluginUidText.selectedIndex].value, 'justText')">
+                        <select id="pluginUidText" name="pluginUid" size="1" onChange="getText(pluginUidText.options[pluginUidText.selectedIndex].value, 'justText', 'iconFullPath', 'spriteSheetFullPath')">
                         </select>    
                     </div>
                     <div class="form-group">
                         <label for="justText">Text:</label>
-                        <input type="text" id="justText" name="justText" value="" size="20" />    
+                        <input type="text" id="justText" name="justText" value="" size="20" />
+                    </div>
+                    <div class="form-group">
+                        <label for="iconFullPath">Icon full path:</label>
+                        <input type="text" id="iconFullPath" name="iconFullPath" value="" size="40" />    
+                    </div>
+                    <div class="form-group">
+                        <label for="spriteSheetFullPath">Sprite sheet full path:</label>
+                        <input type="text" id="spriteSheetFullPath" name="spriteSheetFullPath" value="" size="40" />    
                     </div>
                     <input name="submit" type="submit" value="Update"/>
                 </form>                      
@@ -128,11 +158,13 @@ <h3 class="mt-1">Text</h3>
 
             function enableUI() {
                 utils.enableForm("myFormIcon", true);
+                utils.enableForm("myFormSpriteSheet", true);
                 utils.enableForm("myFormText", true);
             }
 
             function disableUI() {
                 utils.enableForm("myFormIcon", false);
+                utils.enableForm("myFormSpriteSheet", false);
                 utils.enableForm("myFormText", false);
             }
 
@@ -179,12 +211,43 @@ <h3 class="mt-1">Text</h3>
                 });
             };
 
-            function setIcon(pluginUid, file) {
+            function uploadIcon(pluginUid, file) {
+                disableUI();
+
+                return utils.checkBMPFile(file).then(function() {
+                    return utils.makeRequest({
+                        method: "POST",
+                        url: "/rest/api/v1/display/uid/" + pluginUid + "/bitmap",
+                        isJsonResponse: true,
+                        parameter: {
+                            file: file
+                        },
+                        headers: {
+                            "X-File-Size": file.size
+                        }
+                    });
+                }).then(function(rsp) {
+                    updateForms();
+                    alert("Ok.");
+                }).catch(function(rsp) {
+                    if ("string" === typeof rsp) {
+                        alert("Error: " + rsp);
+                    } else if (("undefined" !== typeof rsp) && ("undefined" !== typeof rsp.error) && ("string" === typeof rsp.error.msg)) {
+                        alert("Error: " + rsp.error.msg);
+                    } else {
+                        alert("Failed.");
+                    }
+                }).finally(function() {
+                    enableUI();
+                });
+            }
+
+            function uploadSpriteSheet(pluginUid, file) {
                 disableUI();
 
                 return utils.makeRequest({
                     method: "POST",
-                    url: "/rest/api/v1/display/uid/" + pluginUid + "/bitmap",
+                    url: "/rest/api/v1/display/uid/" + pluginUid + "/spritesheet",
                     isJsonResponse: true,
                     parameter: {
                         file: file
@@ -193,15 +256,20 @@ <h3 class="mt-1">Text</h3>
                         "X-File-Size": file.size
                     }
                 }).then(function(rsp) {
+                    updateForms();
                     alert("Ok.");
                 }).catch(function(rsp) {
-                    alert("Failed.");
+                    if (("undefined" !== typeof rsp.error) && ("string" === typeof rsp.error.msg)) {
+                        alert("Error: " + rsp.error.msg);
+                    } else {
+                        alert("Failed.");
+                    }
                 }).finally(function() {
                     enableUI();
                 });
             }
 
-            function getText(pluginUid, justTextId) {
+            function getText(pluginUid, justTextId, iconFullPathId, spriteSheetFullPathId) {
                 disableUI();
                 return utils.makeRequest({
                     method: "GET",
@@ -209,8 +277,12 @@ <h3 class="mt-1">Text</h3>
                     isJsonResponse: true
                 }).then(function(rsp) {
                     var justTextInput = document.getElementById(justTextId);
+                    var iconFullPathInput = document.getElementById(iconFullPathId);
+                    var spriteSheetFullPathInput = document.getElementById(spriteSheetFullPathId);
 
                     justTextInput.value = rsp.data.text;
+                    iconFullPathInput.value = rsp.data.iconFullPath;
+                    spriteSheetFullPathInput.value = rsp.data.spriteSheetFullPath;
 
                 }).catch(function(rsp) {
                     alert("Internal error.");
@@ -219,7 +291,7 @@ <h3 class="mt-1">Text</h3>
                 });
             }
 
-            function setText(pluginUid, justText) {
+            function setText(pluginUid, justText, iconFullPath, spriteSheetFullPath) {
                 disableUI();
 
                 return utils.makeRequest({
@@ -227,7 +299,9 @@ <h3 class="mt-1">Text</h3>
                     url: "/rest/api/v1/display/uid/" + pluginUid + "/text",
                     isJsonResponse: true,
                     parameter: {
-                        text: justText
+                        text: justText,
+                        iconFullPath: iconFullPath,
+                        spriteSheetFullPath: spriteSheetFullPath
                     }
                 }).then(function(rsp) {
                     alert("Ok.");
@@ -238,6 +312,20 @@ <h3 class="mt-1">Text</h3>
                 });
             }
 
+            function updateForms() {
+                var selectText = document.getElementById("pluginUidText");
+
+                if (0 <= selectText.selectedIndex) {
+
+                    return getText(
+                        selectText.options[selectText.selectedIndex].value,
+                        "justText",
+                        "iconFullPath",
+                        "spriteSheetFullPath"
+                    );
+                }
+            }
+
             $(document).ready(function() {
                 menu.addSubMenu(menu.data, "Plugins", pluginSubMenu);
                 menu.create("menu", menu.data);
@@ -249,15 +337,7 @@ <h3 class="mt-1">Text</h3>
     
                 /* Load all plugin instances. */
                 getPluginInstances().then(function(cnt) {
-                    var selectText = document.getElementById("pluginUidText");
-
-                    if (0 < cnt) {
-
-                        return getText(
-                            selectText.options[selectText.selectedIndex].value,
-                            "justText"
-                        );
-                    }
+                    return updateForms();
                 });
             });
         </script>
diff --git a/lib/JustTextPlugin/src/JustTextPlugin.cpp b/lib/JustTextPlugin/src/JustTextPlugin.cpp
index c777fe56..62a8cb42 100644
--- a/lib/JustTextPlugin/src/JustTextPlugin.cpp
+++ b/lib/JustTextPlugin/src/JustTextPlugin.cpp
@@ -83,13 +83,14 @@ void JustTextPlugin::getTopics(JsonArray& topics) const
 {
     JsonObject jsonText = topics.createNestedObject();
  
-    jsonText["name"]                    = TOPIC_TEXT;
-
-    /* Home Assistant support of MQTT discovery */
-    jsonText["ha"]["component"]         = "text";
-    jsonText["ha"]["commandTemplate"]   = "{\"text\": \"{{ value }}\" }";
-    jsonText["ha"]["valueTemplate"]     = "{{ value_json.text }}";
-    jsonText["ha"]["icon"]              = "mdi:form-textbox";
+    jsonText["name"] = TOPIC_TEXT;
+
+    /* Home Assistant support of MQTT discovery (https://www.home-assistant.io/integrations/mqtt) */
+    jsonText["ha"]["component"]             = "text";                           /* MQTT integration */
+    jsonText["ha"]["discovery"]["name"]     = "MQTT text";                      /* Application that is the origin the discovered MQTT. */
+    jsonText["ha"]["discovery"]["cmd_tpl"]  = "{\"text\": \"{{ value }}\" }";   /* Command template */
+    jsonText["ha"]["discovery"]["val_tpl"]  = "{{ value_json.text }}";          /* Value template */
+    jsonText["ha"]["discovery"]["ic"]       = "mdi:form-textbox";               /* Icon (MaterialDesignIcons.com) */
 }
 
 bool JustTextPlugin::getTopic(const String& topic, JsonObject& value) const
@@ -108,18 +109,18 @@ bool JustTextPlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool JustTextPlugin::setTopic(const String& topic, const JsonObject& value)
+bool JustTextPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
     if (0U != topic.equals(TOPIC_TEXT))
     {
         String              text;
-        JsonVariantConst    jsonShow    = value["text"];
+        JsonVariantConst    jsonText    = value["text"];
 
-        if (false == jsonShow.isNull())
+        if (false == jsonText.isNull())
         {
-            text = jsonShow.as<String>();
+            text = jsonText.as<String>();
             isSuccessful = true;
         }
 
diff --git a/lib/JustTextPlugin/src/JustTextPlugin.h b/lib/JustTextPlugin/src/JustTextPlugin.h
index ae5beef7..39736710 100644
--- a/lib/JustTextPlugin/src/JustTextPlugin.h
+++ b/lib/JustTextPlugin/src/JustTextPlugin.h
@@ -99,7 +99,7 @@ class JustTextPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new JustTextPlugin(name, uid);
+        return new(std::nothrow)JustTextPlugin(name, uid);
     }
 
     /**
@@ -184,7 +184,7 @@ class JustTextPlugin : public Plugin
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
diff --git a/lib/MatrixPlugin/src/MatrixPlugin.h b/lib/MatrixPlugin/src/MatrixPlugin.h
index d81cda7b..bf0dc4bd 100644
--- a/lib/MatrixPlugin/src/MatrixPlugin.h
+++ b/lib/MatrixPlugin/src/MatrixPlugin.h
@@ -91,7 +91,7 @@ class MatrixPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new MatrixPlugin(name, uid);
+        return new(std::nothrow)MatrixPlugin(name, uid);
     }
 
     /**
diff --git a/lib/MqttApiTopicHandler/library.json b/lib/MqttApiTopicHandler/library.json
index 349d2091..dc643cac 100644
--- a/lib/MqttApiTopicHandler/library.json
+++ b/lib/MqttApiTopicHandler/library.json
@@ -17,9 +17,6 @@
     }, {
         "name": "MqttService",
         "version": "~0.1.0"
-    }, {
-        "name": "SettingsService",
-        "version": "~0.1.0"
     }],
     "frameworks": "*",
     "platforms": "*"
diff --git a/lib/MqttApiTopicHandler/src/HomeAssistantMqtt.cpp b/lib/MqttApiTopicHandler/src/HomeAssistantMqtt.cpp
index fe50b489..d99d9f96 100644
--- a/lib/MqttApiTopicHandler/src/HomeAssistantMqtt.cpp
+++ b/lib/MqttApiTopicHandler/src/HomeAssistantMqtt.cpp
@@ -72,7 +72,16 @@ const char* HomeAssistantMqtt::KEY_HA_DISCOVERY_PREFIX      = "ha_dp";
 const char* HomeAssistantMqtt::NAME_HA_DISCOVERY_PREFIX     = "Home Assistant Discovery Prefix";
 
 /* Initialize Home Assistant discovery prefix default value. */
-const char* HomeAssistantMqtt::DEFAULT_HA_DISCOVERY_PREFIX  = "";
+const char* HomeAssistantMqtt::DEFAULT_HA_DISCOVERY_PREFIX  = "homeassistant";
+
+/* Initialize Home Assistant discovery enable flag key */
+const char* HomeAssistantMqtt::KEY_HA_DISCOVERY_ENABLE      = "ha_ena";
+
+/* Initialize Home Assistant discovery enable flag name */
+const char* HomeAssistantMqtt::NAME_HA_DISCOVERY_ENABLE     = "Enable Home Assistant Discovery";
+
+/* Initialize Home Assistant discovery enable flag default value */
+const bool  HomeAssistantMqtt::DEFAULT_HA_DISCOVERY_ENABLE  = false;
 
 /******************************************************************************
  * Public Methods
@@ -86,13 +95,18 @@ void HomeAssistantMqtt::start()
     {
         LOG_ERROR("Couldn't register HA discovery prefix setting.");
     }
+    else if (false == settings.registerSetting(&m_haDiscoveryEnabledSetting))
+    {
+        LOG_ERROR("Couldn't register HA discovery enable setting.");
+    }
     else if (false == settings.open(true))
     {
         LOG_ERROR("Couldn't open settings.");
     }
     else
     {
-        m_haDiscoveryPrefix = m_haDiscoveryPrefixSetting.getValue();
+        m_haDiscoveryPrefix     = m_haDiscoveryPrefixSetting.getValue();
+        m_haDiscoveryEnabled    = m_haDiscoveryEnabledSetting.getValue();
 
         settings.close();
     }
@@ -103,43 +117,47 @@ void HomeAssistantMqtt::stop()
     SettingsService& settings = SettingsService::getInstance();
 
     settings.unregisterSetting(&m_haDiscoveryPrefixSetting);
+    settings.unregisterSetting(&m_haDiscoveryEnabledSetting);
 
     clearMqttDiscoveryInfoList();
 }
 
 void HomeAssistantMqtt::process(bool isConnected)
 {
-    if (true == isConnected)
+    /* The Home Assistant discovery must be enabled. */
+    if (true == m_haDiscoveryEnabled)
     {
-        if (false == m_isConnected)
+        if (true == isConnected)
         {
-            publishAllAutoDiscoveryInfo(true);
-        }
-        else
-        {
-            publishAllAutoDiscoveryInfo(false);
+            /* Connection to broker re-estiablished?
+             * All automatic discovery info's need to be published again.
+             */
+            if (false == m_isConnected)
+            {
+                requestToPublishAllAutoDiscoveryInfos();
+            }
+
+            publishAutoDiscoveryInfosOnDemand();
         }
     }
 
     m_isConnected = isConnected;
 }
 
-void HomeAssistantMqtt::registerMqttDiscovery(const String& nodeId, const String& objectId, const String& stateTopic, const String& cmdTopic, const String& availabilityTopic, JsonObjectConst& extra)
+void HomeAssistantMqtt::registerMqttDiscovery(const String& deviceId, const String& entityId, const String& stateTopic, const String& cmdTopic, const String& availabilityTopic, JsonObjectConst& extra)
 {
-    /* The Home Assistant discovery prefix must be available, otherwise this
+    /* The Home Assistant discovery must be enabled and the prefix must be available, otherwise this
      * feature is disabled.
      */
-    if (false == m_haDiscoveryPrefix.isEmpty())
+    if ((true == m_haDiscoveryEnabled) &&
+        (false == m_haDiscoveryPrefix.isEmpty()))
     {
         JsonVariantConst jsonHomeAssistant = extra["ha"];
 
         /* Configuration available? */
         if (false == jsonHomeAssistant.isNull())
         {
-            JsonVariantConst    jsonComponent       = jsonHomeAssistant["component"];
-            JsonVariantConst    jsonCommandTemplate = jsonHomeAssistant["commandTemplate"];
-            JsonVariantConst    jsonValueTemplate   = jsonHomeAssistant["valueTemplate"];
-            JsonVariantConst    jsonIcon            = jsonHomeAssistant["icon"];
+            JsonVariantConst jsonComponent = jsonHomeAssistant["component"];
 
             if (true == jsonComponent.is<String>())
             {
@@ -147,29 +165,27 @@ void HomeAssistantMqtt::registerMqttDiscovery(const String& nodeId, const String
 
                 if (nullptr != mqttDiscoveryInfo)
                 {
-                    mqttDiscoveryInfo->component            = jsonComponent.as<String>();
-                    mqttDiscoveryInfo->nodeId               = nodeId;
-                    mqttDiscoveryInfo->objectId             = objectId;
-                    mqttDiscoveryInfo->stateTopic           = stateTopic;
-                    mqttDiscoveryInfo->commandTopic         = cmdTopic;
-                    mqttDiscoveryInfo->availabilityTopic    = availabilityTopic;
-
-                    /* Command template is optional */
-                    if (true == jsonCommandTemplate.is<String>())
+                    mqttDiscoveryInfo->component        = jsonComponent.as<String>();
+                    mqttDiscoveryInfo->nodeId           = deviceId;
+                    mqttDiscoveryInfo->objectId         = getObjectId(entityId);
+                    mqttDiscoveryInfo->discoveryDetails = jsonHomeAssistant["discovery"];
+
+                    /* Readable topic? */
+                    if (false == stateTopic.isEmpty())
                     {
-                        mqttDiscoveryInfo->commandTemplate = jsonCommandTemplate.as<String>();
+                        mqttDiscoveryInfo->discoveryDetails["stat_t"] = stateTopic;
                     }
 
-                    /* Value template is optional */
-                    if (true == jsonValueTemplate.is<String>())
+                    /* Writeable topic? */
+                    if (false == cmdTopic.isEmpty())
                     {
-                        mqttDiscoveryInfo->valueTemplate = jsonValueTemplate.as<String>();
+                        mqttDiscoveryInfo->discoveryDetails["cmd_t"] = cmdTopic;
                     }
 
-                    /* Icon is optional */
-                    if (true == jsonIcon.is<String>())
+                    /* Availability? */
+                    if (false == availabilityTopic.isEmpty())
                     {
-                        mqttDiscoveryInfo->icon = jsonIcon.as<String>();
+                        mqttDiscoveryInfo->discoveryDetails["avty_t"] = availabilityTopic;
                     }
 
                     m_mqttDiscoveryInfoList.push_back(mqttDiscoveryInfo);
@@ -179,24 +195,68 @@ void HomeAssistantMqtt::registerMqttDiscovery(const String& nodeId, const String
     }
 }
 
-void HomeAssistantMqtt::unregisterMqttDiscovery(const String& nodeId, const String& objectId, const String& stateTopic, const String& cmdTopic)
+void HomeAssistantMqtt::unregisterMqttDiscovery(const String& deviceId, const String& entityId, const String& stateTopic, const String& cmdTopic)
 {
-    /* The Home Assistant discovery prefix must be available, otherwise this
+    /* The Home Assistant discovery must be enabled and the prefix must be available, otherwise this
      * feature is disabled.
      */
-    if (false == m_haDiscoveryPrefix.isEmpty())
+    if ((true == m_haDiscoveryEnabled) &&
+        (false == m_haDiscoveryPrefix.isEmpty()))
     {
-        ListOfMqttDiscoveryInfo::iterator listOfMqttDiscoveryInfoIt = m_mqttDiscoveryInfoList.begin();
+        ListOfMqttDiscoveryInfo::iterator   listOfMqttDiscoveryInfoIt   = m_mqttDiscoveryInfoList.begin();
+        String                              objectId                    = getObjectId(entityId);
 
         while(m_mqttDiscoveryInfoList.end() != listOfMqttDiscoveryInfoIt)
         {
-            MqttDiscoveryInfo* mqttDiscoveryInfo = *listOfMqttDiscoveryInfoIt;
-
+            MqttDiscoveryInfo*  mqttDiscoveryInfo   = *listOfMqttDiscoveryInfoIt;
+            bool                found               = false;
+            
             if ((nullptr != mqttDiscoveryInfo) &&
-                (nodeId == mqttDiscoveryInfo->nodeId) &&
-                (objectId == mqttDiscoveryInfo->objectId) &&
-                (stateTopic == mqttDiscoveryInfo->stateTopic) &&
-                (cmdTopic == mqttDiscoveryInfo->commandTopic))
+                (deviceId == mqttDiscoveryInfo->nodeId) &&
+                (objectId == mqttDiscoveryInfo->objectId))
+            {
+                JsonVariantConst    jsonStateTopic  = mqttDiscoveryInfo->discoveryDetails["stat_t"];
+                JsonVariantConst    jsonCmdTopic    = mqttDiscoveryInfo->discoveryDetails["cmd_t"];
+                
+                /* Topic only readable? */
+                if ((false == jsonStateTopic.isNull()) &&
+                    (true == jsonCmdTopic.isNull()))
+                {
+                    if (stateTopic == jsonStateTopic.as<String>())
+                    {
+                        found = true;
+                    }
+                }
+                /* Topic only writeable? */
+                else if ((true == jsonStateTopic.isNull()) &&
+                         (false == jsonCmdTopic.isNull()))
+                {
+                    if (cmdTopic == jsonCmdTopic.as<String>())
+                    {
+                        found = true;
+                    }
+                }
+                /* Topic is read- and writeable? */
+                else if ((false == jsonStateTopic.isNull()) &&
+                         (false == jsonCmdTopic.isNull()))
+                {
+                    if ((stateTopic == jsonStateTopic.as<String>()) &&
+                        (cmdTopic == jsonCmdTopic.as<String>()))
+                    {
+                        found = true;
+                    }
+                }
+                else
+                {
+                    ;
+                }
+            }
+
+            if (false == found)
+            {
+                ++listOfMqttDiscoveryInfoIt;
+            }
+            else
             {
                 MqttService&    mqttService = MqttService::getInstance();
                 String          mqttTopic;
@@ -206,11 +266,11 @@ void HomeAssistantMqtt::unregisterMqttDiscovery(const String& nodeId, const Stri
                 /* Purge discovery info. */
                 if (false == mqttService.publish(mqttTopic, ""))
                 {
-                    LOG_WARNING("[%s] Failed to purge HA discovery info.", mqttDiscoveryInfo->objectId.c_str());
+                    LOG_WARNING("Failed to purge HA discovery info of %s.", mqttDiscoveryInfo->objectId.c_str());
                 }
                 else
                 {
-                    LOG_INFO("[%s] HA discovery info purged.", mqttDiscoveryInfo->objectId.c_str());
+                    LOG_INFO("HA discovery info of %s purged.", mqttDiscoveryInfo->objectId.c_str());
                 }
 
                 listOfMqttDiscoveryInfoIt = m_mqttDiscoveryInfoList.erase(listOfMqttDiscoveryInfoIt);
@@ -218,10 +278,6 @@ void HomeAssistantMqtt::unregisterMqttDiscovery(const String& nodeId, const Stri
                 delete mqttDiscoveryInfo;
                 mqttDiscoveryInfo = nullptr;
             }
-            else
-            {
-                ++listOfMqttDiscoveryInfoIt;
-            }
         }
     }
 }
@@ -234,6 +290,17 @@ void HomeAssistantMqtt::unregisterMqttDiscovery(const String& nodeId, const Stri
  * Private Methods
  *****************************************************************************/
 
+String HomeAssistantMqtt::getObjectId(const String& entityId)
+{
+    String objectId = entityId;
+
+    /* Home Assistant MQTT discovery doesn't allow '/' and '.' in the object id. */
+    objectId.replace('/', '_');
+    objectId.replace('.', '_');
+
+    return objectId;
+}
+
 void HomeAssistantMqtt::clearMqttDiscoveryInfoList()
 {
     ListOfMqttDiscoveryInfo::iterator listOfMqttDiscoveryInfoIt = m_mqttDiscoveryInfoList.begin();
@@ -266,16 +333,15 @@ void HomeAssistantMqtt::getConfigTopic(String& haConfigTopic, const String& comp
 
 void HomeAssistantMqtt::publishAutoDiscoveryInfo(MqttDiscoveryInfo& mqttDiscoveryInfo)
 {
-    const size_t        JSON_DOC_SIZE               = 1024U;
-    DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
-    MqttService&        mqttService                 = MqttService::getInstance();
-    String              mqttTopic;
-    String              discoveryInfo;
+    const size_t            JSON_DOC_SIZE               = 1024U;
+    DynamicJsonDocument     jsonDoc(JSON_DOC_SIZE);
+    MqttService&            mqttService                 = MqttService::getInstance();
+    String                  mqttTopic;
+    String                  discoveryInfo;
+    JsonObjectConstIterator discoveryDetailsIt          = mqttDiscoveryInfo.discoveryDetails.as<JsonObjectConst>().begin();
 
     getConfigTopic(mqttTopic, mqttDiscoveryInfo.component, mqttDiscoveryInfo.nodeId, mqttDiscoveryInfo.objectId);
 
-    /* Entity name */
-    jsonDoc["name"]                 = "MQTT text";
     /* The object id (object_id) is used to generate the entity id. */
     jsonDoc["obj_id"]               = mqttDiscoveryInfo.objectId;
     /* The unique id (unique_id) identifies the device and its entity. */
@@ -293,54 +359,45 @@ void HomeAssistantMqtt::publishAutoDiscoveryInfo(MqttDiscoveryInfo& mqttDiscover
     /* SW version of the device (sw_version) */
     jsonDoc["dev"]["sw"]            = QUOTE(SW_VERSION);
 
-    /* Entity icon available? */
-    if (false == mqttDiscoveryInfo.icon.isEmpty())
-    {
-        jsonDoc["icon"] = mqttDiscoveryInfo.icon;
-    }
-
-    /* Readable topic? */
-    if (false == mqttDiscoveryInfo.stateTopic.isEmpty())
+    while(discoveryDetailsIt != mqttDiscoveryInfo.discoveryDetails.as<JsonObjectConst>().end())
     {
-        jsonDoc["stat_t"] = mqttDiscoveryInfo.stateTopic;
+        jsonDoc[discoveryDetailsIt->key()] = discoveryDetailsIt->value();
 
-        if (false == mqttDiscoveryInfo.valueTemplate.isEmpty())
-        {
-            jsonDoc["val_tpl"] = mqttDiscoveryInfo.valueTemplate;
-        }
-    }
-
-    /* Writeable topic? */
-    if (false == mqttDiscoveryInfo.commandTopic.isEmpty())
-    {
-        jsonDoc["cmd_t"] = mqttDiscoveryInfo.commandTopic;
-
-        if (false == mqttDiscoveryInfo.commandTemplate.isEmpty())
-        {
-            jsonDoc["cmd_tpl"] = mqttDiscoveryInfo.commandTemplate;
-        }
+        ++discoveryDetailsIt;
     }
 
-    /* Set availability topic (availability_topic) */
-    jsonDoc["avty_t"] = mqttDiscoveryInfo.availabilityTopic;
-
     /* Send the JSON as string. */
     if (0U < serializeJson(jsonDoc, discoveryInfo))
     {
         if (false == mqttService.publish(mqttTopic, discoveryInfo))
         {
-            LOG_WARNING("[%s] Failed to provide HA discovery info.", mqttDiscoveryInfo.objectId.c_str());
+            LOG_WARNING("Failed to provide HA discovery info of %s.", mqttDiscoveryInfo.objectId.c_str());
         }
         else
         {
-            LOG_INFO("[%s] HA discovery info published.", mqttDiscoveryInfo.objectId.c_str());
+            LOG_INFO("HA discovery info of %s published.", mqttDiscoveryInfo.objectId.c_str());
         }
     }
+}
+
+void HomeAssistantMqtt::requestToPublishAllAutoDiscoveryInfos()
+{
+    ListOfMqttDiscoveryInfo::iterator listOfMqttDiscoveryInfoIt = m_mqttDiscoveryInfoList.begin();
+
+    while(m_mqttDiscoveryInfoList.end() != listOfMqttDiscoveryInfoIt)
+    {
+        MqttDiscoveryInfo*  mqttDiscoveryInfo   = *listOfMqttDiscoveryInfoIt;
+
+        if (nullptr != mqttDiscoveryInfo)
+        {
+            mqttDiscoveryInfo->isReqToPublish = true;
+        }
 
-    mqttDiscoveryInfo.isReqToPublish = false;
+        ++listOfMqttDiscoveryInfoIt;
+    }
 }
 
-void HomeAssistantMqtt::publishAllAutoDiscoveryInfo(bool force)
+void HomeAssistantMqtt::publishAutoDiscoveryInfosOnDemand()
 {
     ListOfMqttDiscoveryInfo::iterator listOfMqttDiscoveryInfoIt = m_mqttDiscoveryInfoList.begin();
 
@@ -350,10 +407,14 @@ void HomeAssistantMqtt::publishAllAutoDiscoveryInfo(bool force)
 
         if (nullptr != mqttDiscoveryInfo)
         {
-            if ((true == force) ||
-                (true == mqttDiscoveryInfo->isReqToPublish))
+            if (true == mqttDiscoveryInfo->isReqToPublish)
             {
                 publishAutoDiscoveryInfo(*mqttDiscoveryInfo);
+
+                mqttDiscoveryInfo->isReqToPublish = false;
+
+                /* Continue with next call cycle. */
+                break;
             }
         }
 
diff --git a/lib/MqttApiTopicHandler/src/HomeAssistantMqtt.h b/lib/MqttApiTopicHandler/src/HomeAssistantMqtt.h
index 693f178e..62b39e7b 100644
--- a/lib/MqttApiTopicHandler/src/HomeAssistantMqtt.h
+++ b/lib/MqttApiTopicHandler/src/HomeAssistantMqtt.h
@@ -45,6 +45,7 @@
  *****************************************************************************/
 #include <stdint.h>
 #include <KeyValueString.h>
+#include <KeyValueBool.h>
 #include <ArduinoJson.h>
 #include <vector>
 
@@ -69,7 +70,9 @@ class HomeAssistantMqtt
      */
     HomeAssistantMqtt() :
         m_haDiscoveryPrefixSetting(KEY_HA_DISCOVERY_PREFIX, NAME_HA_DISCOVERY_PREFIX, DEFAULT_HA_DISCOVERY_PREFIX, MIN_VALUE_HA_DISCOVERY_PREFIX, MAX_VALUE_HA_DISCOVERY_PREFIX),
+        m_haDiscoveryEnabledSetting(KEY_HA_DISCOVERY_ENABLE, NAME_HA_DISCOVERY_ENABLE, DEFAULT_HA_DISCOVERY_ENABLE),
         m_haDiscoveryPrefix(),
+        m_haDiscoveryEnabled(false),
         m_isConnected(false)
     {
     }
@@ -104,24 +107,24 @@ class HomeAssistantMqtt
      * It will not publish, just prepare the MQTT discovery information
      * and hold it internally.
      * 
-     * @param[in]   nodeId              ID of the node providing the topic.
-     * @param[in]   objectId            ID of the object to divide between topics.
+     * @param[in]   deviceId            Device id.
+     * @param[in]   entityId            Entity id.
      * @param[in]   stateTopic          The MQTT status topic.
      * @param[in]   cmdTopic            The MQTT command topic.
      * @param[in]   availabilityTopic   The MQTT availability topic.
      * @param[in]   extra               Extra parameters used by this extension.
      */
-    void registerMqttDiscovery(const String& nodeId, const String& objectId, const String& stateTopic, const String& cmdTopic, const String& availabilityTopic, JsonObjectConst& extra);
+    void registerMqttDiscovery(const String& deviceId, const String& entityId, const String& stateTopic, const String& cmdTopic, const String& availabilityTopic, JsonObjectConst& extra);
 
     /**
      * Unregister Home Assistant MQTT discovery.
      * 
-     * @param[in]   nodeId      ID of the node providing the topic.
-     * @param[in]   objectId    ID of the object to divide between topics.
+     * @param[in]   deviceId    Device id.
+     * @param[in]   entityId    Entity id.
      * @param[in]   stateTopic  The MQTT status topic.
      * @param[in]   cmdTopic    The MQTT command topic.
      */
-    void unregisterMqttDiscovery(const String& nodeId, const String& objectId, const String& stateTopic, const String& cmdTopic);
+    void unregisterMqttDiscovery(const String& deviceId, const String& entityId, const String& stateTopic, const String& cmdTopic);
 
 private:
 
@@ -140,31 +143,30 @@ class HomeAssistantMqtt
     /** Home Assistant discovery prefix max. length */
     static const size_t MAX_VALUE_HA_DISCOVERY_PREFIX   = 64U;
 
+    /** Home Assistant discovery enable flag key */
+    static const char*  KEY_HA_DISCOVERY_ENABLE;
+
+    /** Home Assistant discovery enable flag name */
+    static const char*  NAME_HA_DISCOVERY_ENABLE;
+
+    /** Home Assistant discovery enable flag default value */
+    static const bool   DEFAULT_HA_DISCOVERY_ENABLE;
+
     /** Information necessary for Home Assistant MQTT discovery. */
     struct MqttDiscoveryInfo
     {
-        String  component;          /**< Home Assistant component */
-        String  nodeId;             /**< Home Assistant node id */
-        String  objectId;           /**< Home Assistant object id */
-        String  stateTopic;         /**< Status topic */
-        String  valueTemplate;      /**< Value template to extract the text state value */
-        String  commandTopic;       /**< Command topic */
-        String  commandTemplate;    /**< Command template to generate payload to send to command topic */
-        String  availabilityTopic;  /**< Availability topic */
-        String  icon;               /**< Icon name from MaterialDesignIcons.com */
-        bool    isReqToPublish;     /**< Is requested to publish this discovery info? */
+        String              component;          /**< Home Assistant component */
+        String              nodeId;             /**< Home Assistant node id */
+        String              objectId;           /**< Home Assistant object id */
+        DynamicJsonDocument discoveryDetails;   /**< Additional discovery information. */
+        bool                isReqToPublish;     /**< Is requested to publish this discovery info? */
 
         /** Construct Home Assistant MQTT discovery information. */
         MqttDiscoveryInfo() :
             component(),
             nodeId(),
             objectId(),
-            stateTopic(),
-            valueTemplate(),
-            commandTopic(),
-            commandTemplate(),
-            availabilityTopic(),
-            icon(),
+            discoveryDetails(368U),
             isReqToPublish(true)
         {
         }
@@ -173,14 +175,25 @@ class HomeAssistantMqtt
     /** List of Home Assistant MQTT discovery information. */
     typedef std::vector<MqttDiscoveryInfo*> ListOfMqttDiscoveryInfo;
 
-    KeyValueString          m_haDiscoveryPrefixSetting; /**< Setting for the Home Assistant MQTT discovery prefix. */
-    String                  m_haDiscoveryPrefix;        /**< Home Assistant MQTT discovery prefix. */
-    ListOfMqttDiscoveryInfo m_mqttDiscoveryInfoList;    /**< List of Home Assistant MQTT discovery informations. */
-    bool                    m_isConnected;              /**< Is MQTT broker connection established? */
+    KeyValueString          m_haDiscoveryPrefixSetting;     /**< Setting for the Home Assistant MQTT discovery prefix. */
+    KeyValueBool            m_haDiscoveryEnabledSetting;    /**< Setting for the Home Assistant MQTT discovery enable flag. */
+    String                  m_haDiscoveryPrefix;            /**< Home Assistant MQTT discovery prefix. */
+    bool                    m_haDiscoveryEnabled;           /**< Is the Home Assistant MQTT discovery enabled or not. */
+    ListOfMqttDiscoveryInfo m_mqttDiscoveryInfoList;        /**< List of Home Assistant MQTT discovery informations. */
+    bool                    m_isConnected;                  /**< Is MQTT broker connection established? */
 
     HomeAssistantMqtt(const HomeAssistantMqtt& ext);
     HomeAssistantMqtt& operator=(const HomeAssistantMqtt& ext);
 
+    /**
+     * Get the object id from the entity id.
+     * 
+     * @param[in] entityId  The entity id.
+     * 
+     * @return Object id
+     */
+    String getObjectId(const String& entityId);
+
     /**
      * Clear MQTT discovery info list.
      */
@@ -202,11 +215,17 @@ class HomeAssistantMqtt
     void publishAutoDiscoveryInfo(MqttDiscoveryInfo& mqttDiscoveryInfo);
 
     /**
-     * Publish all MQTT auto discovery informations, which are requested.
+     * Request to publish all automatic discovery info's.
+     */
+    void requestToPublishAllAutoDiscoveryInfos();
+
+    /**
+     * Publish MQTT auto discovery informations, which are requested.
      * 
-     * @param[in] force If set to true, all will be published independed whether requested or not.
+     * Note: Need to be called continously and will only publish one info per
+     *       call cycle.
      */
-    void publishAllAutoDiscoveryInfo(bool force);
+    void publishAutoDiscoveryInfosOnDemand();
 };
 
 /******************************************************************************
diff --git a/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.cpp b/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.cpp
index 1f301167..d282126c 100644
--- a/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.cpp
+++ b/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.cpp
@@ -37,7 +37,6 @@
 
 #include <Logging.h>
 #include <MqttService.h>
-#include <SettingsService.h>
 #include <mbedtls/base64.h>
 
 /******************************************************************************
@@ -80,54 +79,141 @@ void MqttApiTopicHandler::stop()
     m_haExtension.stop();
 }
 
-void MqttApiTopicHandler::registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra)
+void MqttApiTopicHandler::registerTopic(const String& deviceId, const String& entityId, const String& topic, JsonObjectConst& extra, GetTopicFunc getTopicFunc, SetTopicFunc setTopicFunc, UploadReqFunc uploadReqFunc)
 {
-    if ((nullptr != plugin) &&
+    if ((false == deviceId.isEmpty()) &&
+        (false == entityId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
-        String baseUri;
+        String      mqttTopicNameBase   = deviceId + "/" + entityId + topic;
+        TopicState* topicState          = new(std::nothrow) TopicState();
 
-        /* If plugin has no alias, use the plugin UID for the base URI otherwise use the alias. */
-        if (false == plugin->getAlias().isEmpty())
-        {
-            baseUri = getBaseUriByAlias(plugin->getAlias());
-        }
-        else
+        LOG_INFO("Register: %s", mqttTopicNameBase.c_str());
+
+        if (nullptr != topicState)
         {
-            baseUri = getBaseUriByUid(plugin->getUID());
-        }
+            String  topicUriReadable;
+            String  topicUriWriteable;
+
+            topicState->deviceId        = deviceId;
+            topicState->entityId        = entityId;
+            topicState->topic           = topic;
+            topicState->getTopicFunc    = getTopicFunc;
+            topicState->setTopicFunc    = setTopicFunc;
+            topicState->uploadReqFunc   = uploadReqFunc;
+            topicState->isPublishReq    = false;
+
+            /* Is the topic readable? */
+            if (nullptr != getTopicFunc)
+            {
+                topicUriReadable = mqttTopicNameBase + MQTT_ENDPOINT_READ_ACCESS;
+
+                /* Publish initially. */
+                topicState->isPublishReq = true;
+            }
+
+            /* Is the topic writeable? */
+            if (nullptr != setTopicFunc)
+            {
+                MqttService&                mqttService = MqttService::getInstance();
+                MqttService::TopicCallback  setCallback =
+                    [this, topicState](const String& mqttTopic, const uint8_t* payload, size_t size)
+                    {
+                        if (0U != mqttTopic.endsWith(topicState->topic + MQTT_ENDPOINT_WRITE_ACCESS))
+                        {
+                            this->write(topicState->deviceId, topicState->entityId, topicState->topic, payload, size, topicState->setTopicFunc, topicState->uploadReqFunc);
+                        }
+                    };
+
+                topicUriWriteable = mqttTopicNameBase + MQTT_ENDPOINT_WRITE_ACCESS;
+
+                LOG_INFO("Subscribe: %s", topicUriWriteable.c_str());
+                if (false == mqttService.subscribe(topicUriWriteable, setCallback))
+                {
+                    LOG_WARNING("Couldn't subscribe %s.", topicUriWriteable.c_str());
+                }
+            }
+
+            /* Handle Home Assistant extension */
+            {
+                String willTopic = deviceId + "/status";
+
+                m_haExtension.registerMqttDiscovery(deviceId, entityId, topicUriReadable, topicUriWriteable, willTopic, extra);
+            }
 
-        registerTopic(plugin, topic, access, extra, baseUri);
+            m_listOfTopicStates.push_back(topicState);
+        }
     }
 }
 
-void MqttApiTopicHandler::unregisterTopic(IPluginMaintenance* plugin, const String& topic)
+void MqttApiTopicHandler::unregisterTopic(const String& deviceId, const String& entityId, const String& topic)
 {
-    if ((nullptr != plugin) &&
+    if ((false == deviceId.isEmpty()) &&
+        (false == entityId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
-        String baseUri;
+        String                      mqttTopicNameBase   = deviceId + "/" + entityId + topic;
+        MqttService&                mqttService         = MqttService::getInstance();
+        ListOfTopicStates::iterator topicStateIt        = m_listOfTopicStates.begin();
 
-        /* If plugin has no alias, use the plugin UID for the base URI otherwise use the alias. */
-        if (false == plugin->getAlias().isEmpty())
-        {
-            baseUri = getBaseUriByAlias(plugin->getAlias());
-        }
-        else
+        LOG_INFO("Unregister: %s", mqttTopicNameBase.c_str());
+
+        while(m_listOfTopicStates.end() != topicStateIt)
         {
-            baseUri = getBaseUriByUid(plugin->getUID());
-        }
+            TopicState* topicState = *topicStateIt;
+
+            if ((nullptr != topicState) &&
+                (deviceId == topicState->deviceId) &&
+                (entityId == topicState->entityId) &&
+                (topic == topicState->topic))
+            {
+                String topicUriReadable;
+                String topicUriWriteable;
+
+                if (nullptr != topicState->getTopicFunc)
+                {
+                    topicUriReadable = mqttTopicNameBase + MQTT_ENDPOINT_READ_ACCESS;
 
-        unregisterTopic(plugin, topic, baseUri);
+                    /* Purge topic */
+                    if (false == mqttService.publish(topicUriReadable, ""))
+                    {
+                        LOG_WARNING("Failed to purge: %s", topicUriReadable.c_str());
+                    }
+                    else
+                    {
+                        LOG_INFO("Purged: %s", topicUriReadable.c_str());
+                    }
+                }
+                
+                if (nullptr != topicState->setTopicFunc)
+                {
+                    topicUriWriteable = mqttTopicNameBase + MQTT_ENDPOINT_WRITE_ACCESS;
+
+                    LOG_INFO("Unsubscribe: %s", topicUriWriteable.c_str());
+
+                    mqttService.unsubscribe(topicUriWriteable);
+                }
+
+                /* Handle Home Assistant extension */
+                m_haExtension.unregisterMqttDiscovery(deviceId, entityId, topicUriReadable, topicUriWriteable);
+
+                topicStateIt = m_listOfTopicStates.erase(topicStateIt);
+
+                delete topicState;
+                topicState = nullptr;
+            }
+            else
+            {
+                ++topicStateIt;
+            }
+        }
     }
 }
 
 void MqttApiTopicHandler::process()
 {
-    MqttService&                mqttService     = MqttService::getInstance();
-    bool                        publishAll      = false;
-    ListOfTopicStates::iterator topicStateIt    = m_listOfTopicStates.begin();
-
+    MqttService& mqttService = MqttService::getInstance();
+    
     /* If connection to MQTT broker is the first time established or reconnected,
      * all topics will be published to be up-to-date.
      */
@@ -138,7 +224,7 @@ void MqttApiTopicHandler::process()
         m_isMqttConnected = true;
         
         /* Publish after connection establishment. */
-        publishAll = true;
+        requestToPublishAllTopicStates();
     }
     else if ((true == m_isMqttConnected) &&
              (MqttService::STATE_CONNECTED != mqttService.getState()))
@@ -152,38 +238,24 @@ void MqttApiTopicHandler::process()
 
     if (true == m_isMqttConnected)
     {
-        /* If necessary, the topic state will be published. */
-        while(m_listOfTopicStates.end() != topicStateIt)
-        {
-            TopicState* topicState = *topicStateIt;
-
-            if ((nullptr != topicState) &&
-                (nullptr != topicState->plugin) &&
-                (
-                    (ACCESS_READ_ONLY == topicState->access) ||
-                    (ACCESS_READ_WRITE == topicState->access)
-                ))
-            {
-                if ((true == publishAll) ||
-                    (true == topicState->isPublishReq))
-                {
-                    publish(topicState->topicUri, topicState->plugin, topicState->topic);
-
-                    topicState->isPublishReq = false;
-                }
-            }
-
-            ++topicStateIt;
-        }
+        /* If necessary, a topic state will be published.
+         *
+         * Don't publish all of them at once, only one per process cycle.
+         * This has the advantage to detect lost MQTT connection, because remember
+         * its cooperative! As long as the MQTT service is not called, no update
+         * about the connection status will appear.
+         */
+        publishTopicStatesOnDemand();
     }
 
     /* Process Home Assistant extension. */
     m_haExtension.process(m_isMqttConnected);
 }
 
-void MqttApiTopicHandler::notify(IPluginMaintenance* plugin, const String& topic)
+void MqttApiTopicHandler::notify(const String& deviceId, const String& entityId, const String& topic)
 {
-    if ((nullptr != plugin) &&
+    if ((false == deviceId.isEmpty()) &&
+        (false == entityId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
         ListOfTopicStates::iterator topicStateIt = m_listOfTopicStates.begin();
@@ -193,7 +265,8 @@ void MqttApiTopicHandler::notify(IPluginMaintenance* plugin, const String& topic
             TopicState* topicState = *topicStateIt;
 
             if ((nullptr != topicState) &&
-                (plugin == topicState->plugin) &&
+                (deviceId == topicState->deviceId) &&
+                (entityId == topicState->entityId) &&
                 (topic == topicState->topic))
             {
                 topicState->isPublishReq = true;
@@ -212,141 +285,56 @@ void MqttApiTopicHandler::notify(IPluginMaintenance* plugin, const String& topic
  * Private Methods
  *****************************************************************************/
 
-String MqttApiTopicHandler::getBaseUriByUid(uint16_t uid)
+void MqttApiTopicHandler::requestToPublishAllTopicStates()
 {
-    String  baseUri;
+    ListOfTopicStates::iterator topicStateIt = m_listOfTopicStates.begin();
 
-    if (true == m_hostname.isEmpty())
+    /* Set the publish request flag for all topic states. */
+    while(m_listOfTopicStates.end() != topicStateIt)
     {
-        SettingsService& settingsService = SettingsService::getInstance();
+        TopicState* topicState = *topicStateIt;
 
-        if (false == settingsService.open(true))
+        if ((nullptr != topicState) &&
+            (false == topicState->deviceId.isEmpty()) &&
+            (false == topicState->entityId.isEmpty()) &&
+            (nullptr != topicState->getTopicFunc))
         {
-            m_hostname = settingsService.getHostname().getDefault();
+            topicState->isPublishReq = true;
         }
-        else
-        {
-            m_hostname = settingsService.getHostname().getValue();
-            settingsService.close();
-        }
-    }
 
-    if (false == m_hostname.isEmpty())
-    {
-        baseUri += m_hostname;
-        baseUri += "/";
+        ++topicStateIt;
     }
-    
-    baseUri += "uid/";
-    baseUri += uid;
-
-    return baseUri;
 }
 
-String MqttApiTopicHandler::getBaseUriByAlias(const String& alias)
+void MqttApiTopicHandler::publishTopicStatesOnDemand()
 {
-    String  baseUri;
+    ListOfTopicStates::iterator topicStateIt = m_listOfTopicStates.begin();
 
-    if (true == m_hostname.isEmpty())
-    {
-        SettingsService& settingsService = SettingsService::getInstance();
-
-        if (false == settingsService.open(true))
-        {
-            m_hostname = settingsService.getHostname().getDefault();
-        }
-        else
-        {
-            m_hostname = settingsService.getHostname().getValue();
-            settingsService.close();
-        }
-    }
-
-    if (false == m_hostname.isEmpty())
-    {
-        baseUri += m_hostname;
-        baseUri += "/";
-    }
-
-    baseUri += "alias/";
-    baseUri += alias;
-
-    return baseUri;
-}
-
-void MqttApiTopicHandler::registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra, const String& baseUri)
-{
-    if (nullptr != plugin)
+    while(m_listOfTopicStates.end() != topicStateIt)
     {
-        String      topicUri    = baseUri + topic;
-        TopicState* topicState  = new(std::nothrow) TopicState();
-
-        LOG_INFO("[%s][%u] Register: %s", plugin->getName(), plugin->getUID(), topicUri.c_str());
+        TopicState* topicState = *topicStateIt;
 
-        if (nullptr != topicState)
+        if ((nullptr != topicState) &&
+            (false == topicState->deviceId.isEmpty()) &&
+            (false == topicState->entityId.isEmpty()) &&
+            (nullptr != topicState->getTopicFunc))
         {
-            String  topicUriReadable;
-            String  topicUriWriteable;
-
-            topicState->plugin          = plugin;
-            topicState->topic           = topic;
-            topicState->access          = access;
-            topicState->topicUri        = topicUri;
-            topicState->isPublishReq    = false;
-
-            /* Is the topic readable? */
-            if ((ACCESS_READ_ONLY == access) ||
-                (ACCESS_READ_WRITE == access))
+            if (true == topicState->isPublishReq)
             {
-                topicUriReadable = topicUri + MQTT_ENDPOINT_READ_ACCESS;
+                publish(topicState->deviceId, topicState->entityId, topicState->topic, topicState->getTopicFunc);
 
-                /* Publish initially. */
-                topicState->isPublishReq = true;
-            }
-
-            /* Is the topic writeable? */
-            if ((ACCESS_READ_WRITE == access) ||
-                (ACCESS_WRITE_ONLY == access))
-            {
-                MqttService&                mqttService = MqttService::getInstance();
-                MqttService::TopicCallback  setCallback = [this, plugin, topic](const String& topicUri, const uint8_t* payload, size_t size) {
-                    if (0U != topicUri.endsWith(topic + MQTT_ENDPOINT_WRITE_ACCESS))
-                    {
-                        this->write(plugin, topic, payload, size);
-                    }
-                };
+                topicState->isPublishReq = false;
 
-                topicUriWriteable = topicUri + MQTT_ENDPOINT_WRITE_ACCESS;
-
-                if (false == mqttService.subscribe(topicUriWriteable, setCallback))
-                {
-                    LOG_WARNING("Couldn't subscribe %s.", topicUriWriteable.c_str());
-                }
-                else
-                {
-                    LOG_INFO("[%u] Subscribed: %s", plugin->getUID(), topicUriWriteable.c_str());
-                }
+                /* Continue next process cycle. */
+                break;
             }
-
-            /* Handle Home Assistant extension */
-            {
-                int dividerIdx  = baseUri.lastIndexOf("/");
-
-                if (0 <= dividerIdx)
-                {
-                    String  haObjectId   = baseUri.substring(dividerIdx + 1);
-                    String  willTopic    = m_hostname + "/status";
-
-                    m_haExtension.registerMqttDiscovery(m_hostname, haObjectId, topicUriReadable, topicUriWriteable, willTopic, extra);
-                }
-            }
-
-            m_listOfTopicStates.push_back(topicState);
         }
+
+        ++topicStateIt;
     }
 }
 
-void MqttApiTopicHandler::write(IPluginMaintenance* plugin, const String& topic, const uint8_t* payload, size_t size)
+void MqttApiTopicHandler::write(const String& deviceId, const String& entityId, const String& topic, const uint8_t* payload, size_t size, SetTopicFunc setTopicFunc, UploadReqFunc uploadReqFunc)
 {
     const size_t            JSON_DOC_SIZE   = 1024U;
     DynamicJsonDocument     jsonDoc(JSON_DOC_SIZE);
@@ -358,8 +346,8 @@ void MqttApiTopicHandler::write(IPluginMaintenance* plugin, const String& topic,
     }
     else
     {
-        JsonVariantConst jsonFileName   = jsonDoc["fileName"];
-        JsonVariantConst jsonFileBase64 = jsonDoc["file"];
+        JsonVariantConst    jsonFileName   = jsonDoc["fileName"];
+        JsonVariantConst    jsonFileBase64 = jsonDoc["file"];
 
         /* File transfer? */
         if ((true == jsonFileName.is<String>()) &&
@@ -368,9 +356,10 @@ void MqttApiTopicHandler::write(IPluginMaintenance* plugin, const String& topic,
             String dstFullPath;
 
             /* Ask plugin, whether the upload is allowed or not. */
-            if (false == plugin->isUploadAccepted(topic, jsonFileName.as<String>(), dstFullPath))
+            if ((nullptr == uploadReqFunc) ||
+                (false == uploadReqFunc(topic, jsonFileName.as<String>(), dstFullPath)))
             {
-                LOG_WARNING("[%s][%u] Upload not supported.", plugin->getName(), plugin->getUID());
+                LOG_WARNING("Upload not supported  by %s.", entityId.c_str());
             }
             else
             {
@@ -380,12 +369,12 @@ void MqttApiTopicHandler::write(IPluginMaintenance* plugin, const String& topic,
 
                 if (MBEDTLS_ERR_BASE64_INVALID_CHARACTER == decodeRet)
                 {
-                    LOG_WARNING("[%s][%u] File encoding contains invalid character.", plugin->getName(), plugin->getUID(), fileSize);
+                    LOG_WARNING("File encoding contains invalid character.");
                 }
                 else if ((MAX_FILE_SIZE < fileSize) ||
                          (0U == fileSize))
                 {
-                    LOG_WARNING("[%s][%u] File size %u not supported.", plugin->getName(), plugin->getUID(), fileSize);
+                    LOG_WARNING("File size %u not supported.", fileSize);
                 }
                 else
                 {
@@ -399,7 +388,7 @@ void MqttApiTopicHandler::write(IPluginMaintenance* plugin, const String& topic,
 
                         if (0U != decodeRet)
                         {
-                            LOG_WARNING("[%s][%u] File decode error: %d", plugin->getName(), plugin->getUID(), decodeRet);
+                            LOG_WARNING("File decode error: %d", decodeRet);
                         }
                         else
                         {
@@ -428,104 +417,30 @@ void MqttApiTopicHandler::write(IPluginMaintenance* plugin, const String& topic,
             }
         }
 
-        if (false == plugin->setTopic(topic, jsonDoc.as<JsonObject>()))
-        {
-            LOG_WARNING("Plugin %u rejected payload.", plugin->getUID());
-        }
-    }
-}
-
-void MqttApiTopicHandler::unregisterTopic(IPluginMaintenance* plugin, const String& topic, const String& baseUri)
-{
-    if (nullptr != plugin)
-    {
-        String                      topicUri        = baseUri + topic;
-        MqttService&                mqttService     = MqttService::getInstance();
-        ListOfTopicStates::iterator topicStateIt    = m_listOfTopicStates.begin();
-
-        LOG_INFO("[%s][%u] Unregister: %s", plugin->getName(), plugin->getUID(), topicUri.c_str());
-
-        while(m_listOfTopicStates.end() != topicStateIt)
+        if (false == setTopicFunc(topic, jsonDoc.as<JsonObjectConst>()))
         {
-            TopicState* topicState = *topicStateIt;
-
-            if ((nullptr != topicState) &&
-                (plugin == topicState->plugin) &&
-                (topic == topicState->topic))
-            {
-                String topicUriReadable;
-                String topicUriWriteable;
-
-                if ((ACCESS_READ_ONLY == topicState->access) ||
-                    (ACCESS_READ_WRITE == topicState->access))
-                {
-                    topicUriReadable = topicUri + MQTT_ENDPOINT_READ_ACCESS;
-
-                    /* Purge topic */
-                    if (false == mqttService.publish(topicUriReadable, ""))
-                    {
-                        LOG_WARNING("[%u] Failed to purge: %s", plugin->getUID(), topicUriReadable.c_str());
-                    }
-                    else
-                    {
-                        LOG_INFO("[%u] Purged: %s", plugin->getUID(), topicUriReadable.c_str());
-                    }
-                }
-                
-                if ((ACCESS_READ_WRITE == topicState->access) ||
-                    (ACCESS_WRITE_ONLY == topicState->access))
-                {
-                    topicUriWriteable = topicUri + MQTT_ENDPOINT_WRITE_ACCESS;
-
-                    mqttService.unsubscribe(topicUriWriteable);
-
-                    LOG_INFO("[%u] Unsubscribed: %s", plugin->getUID(), topicUriWriteable.c_str());
-                }
-
-                /* Handle Home Assistant extension */
-                {
-                    /* The object id is the last directory of the base URI.
-                    * Its the plugin UID or the plugin alias.
-                    */
-                    int dividerIdx  = baseUri.lastIndexOf("/");
-
-                    if (0 <= dividerIdx)
-                    {
-                        String haObjectId = baseUri.substring(dividerIdx + 1);
-
-                        m_haExtension.unregisterMqttDiscovery(m_hostname, haObjectId, topicUriReadable, topicUriWriteable);
-                    }
-                }
-
-                topicStateIt = m_listOfTopicStates.erase(topicStateIt);
-
-                delete topicState;
-                topicState = nullptr;
-            }
-            else
-            {
-                ++topicStateIt;
-            }
+            LOG_WARNING("Payload rejected by %s.", entityId.c_str());
         }
     }
 }
 
-void MqttApiTopicHandler::publish(const String& baseUri, IPluginMaintenance* plugin, const String& topic)
+void MqttApiTopicHandler::publish(const String& deviceId, const String& entityId, const String& topic, GetTopicFunc getTopicFunc)
 {
-    if (nullptr != plugin)
+    if (nullptr != getTopicFunc)
     {
-        const size_t        JSON_DOC_SIZE   = 1024U;
+        const size_t        JSON_DOC_SIZE       = 1024U;
         DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
-        JsonObject          jsonObj         = jsonDoc.createNestedObject("data");
+        JsonObject          jsonObj             = jsonDoc.createNestedObject("data");
+        String              mqttTopicNameBase   = deviceId + "/" + entityId + topic;
 
-        if (true == plugin->getTopic(topic, jsonObj))
+        if (true == getTopicFunc(topic, jsonObj))
         {
             String topicContent;
 
             if (0U < serializeJson(jsonDoc["data"], topicContent))
             {
                 MqttService&    mqttService     = MqttService::getInstance();
-                String          topicStateUri   = baseUri + MQTT_ENDPOINT_READ_ACCESS;
+                String          topicStateUri   = mqttTopicNameBase + MQTT_ENDPOINT_READ_ACCESS;
 
                 if (false == mqttService.publish(topicStateUri, topicContent))
                 {
@@ -533,7 +448,7 @@ void MqttApiTopicHandler::publish(const String& baseUri, IPluginMaintenance* plu
                 }
                 else
                 {
-                    LOG_INFO("[%s][%u] Published: %s", plugin->getName(), plugin->getUID(), topicStateUri.c_str());
+                    LOG_INFO("Published: %s", topicStateUri.c_str());
                 }
             }
         }
@@ -551,12 +466,12 @@ void MqttApiTopicHandler::clearTopicStates()
 
         if (nullptr != topicState)
         {
-            if ((ACCESS_READ_WRITE == topicState->access) ||
-                (ACCESS_WRITE_ONLY == topicState->access))
+            if (nullptr != topicState->setTopicFunc)
             {
-                String topicUri = topicState->topicUri + MQTT_ENDPOINT_WRITE_ACCESS;
+                String mqttTopicNameBase    = topicState->deviceId + "/" + topicState->entityId + topicState->topic;
+                String topicStateUri        = mqttTopicNameBase + MQTT_ENDPOINT_WRITE_ACCESS;
 
-                mqttService.unsubscribe(topicUri);
+                mqttService.unsubscribe(topicStateUri);
             }
 
             topicStateIt = m_listOfTopicStates.erase(topicStateIt);
diff --git a/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.h b/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.h
index 86dc5e73..10b9ea9c 100644
--- a/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.h
+++ b/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.h
@@ -45,7 +45,6 @@
  *****************************************************************************/
 #include <stdint.h>
 #include <ITopicHandler.h>
-#include <IPluginMaintenance.hpp>
 #include <vector>
 
 #include "HomeAssistantMqtt.h"
@@ -70,7 +69,6 @@ class MqttApiTopicHandler : public ITopicHandler
      */
     MqttApiTopicHandler() :
         ITopicHandler(),
-        m_hostname(),
         m_listOfTopicStates(),
         m_isMqttConnected(false),
         m_haExtension()
@@ -96,22 +94,26 @@ class MqttApiTopicHandler : public ITopicHandler
     void stop() final;
 
     /**
-     * Register a single topic of the given plugin.
+     * Register the topic.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
-     * @param[in] topic     The topic name.
-     * @param[in] access    The topic accessibility.
-     * @param[in] extra     Extra parameters, which depend on the topic handler.
+     * @param[in] deviceId      The device id which represents the physical device.
+     * @param[in] entityId      The entity id which represents the entity of the device.
+     * @param[in] topic         The topic name.
+     * @param[in] extra         Extra parameters, which depend on the topic handler.
+     * @param[in] getTopicFunc  Function to get the topic content.
+     * @param[in] setTopicFunc  Function to set the topic content.
+     * @param[in] uploadReqFunc Function used for requesting whether an file upload is allowed.
      */
-    void registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra) final;
+    void registerTopic(const String& deviceId, const String& entityId, const String& topic, JsonObjectConst& extra, GetTopicFunc getTopicFunc, SetTopicFunc setTopicFunc, UploadReqFunc uploadReqFunc) final;
 
     /**
-     * Unregister the topic of the given plugin.
+     * Unregister the topic.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
      * @param[in] topic     The topic name.
      */
-    void unregisterTopic(IPluginMaintenance* plugin, const String& topic) final;
+    void unregisterTopic(const String& deviceId, const String& entityId, const String& topic) final;
 
     /**
      * Process the topic handler.
@@ -121,28 +123,33 @@ class MqttApiTopicHandler : public ITopicHandler
     /**
      * Notify that the topic has changed.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
      * @param[in] topic     The topic name.
      */
-    void notify(IPluginMaintenance* plugin, const String& topic) final;
+    void notify(const String& deviceId, const String& entityId, const String& topic) final;
 
 private:
 
     /** A topic state is published by a plugin. */
     struct TopicState
     {
-        IPluginMaintenance* plugin;         /**< The plugin which provides the topic. */
-        String              topic;          /**< The topic which provides its state. */
-        String              topicUri;       /**< The topic MQTT URI without endpoint. */
-        Access              access;         /**< The topic accessibility. */
-        bool                isPublishReq;   /**< Is it required to publish the state? */
+        String          deviceId;       /**< The device id. */
+        String          entityId;       /**< The entity id. */
+        String          topic;          /**< The topic which provides its state. */
+        GetTopicFunc    getTopicFunc;   /**< Function used to get topic content. */
+        SetTopicFunc    setTopicFunc;   /**< Function used to set topic content. */
+        UploadReqFunc   uploadReqFunc;  /**< Function used to check whether a file upload is allowed. */
+        bool            isPublishReq;   /**< Is it required to publish the state? */
 
         /** Construct topic state. */
         TopicState() :
-            plugin(nullptr),
+            deviceId(),
+            entityId(),
             topic(),
-            topicUri(),
-            access(ACCESS_READ_WRITE),
+            getTopicFunc(nullptr),
+            setTopicFunc(nullptr),
+            uploadReqFunc(nullptr),
             isPublishReq(false)
         {
         }
@@ -162,8 +169,7 @@ class MqttApiTopicHandler : public ITopicHandler
     /** MQTT path endpoint for write access. */
     static const char*  MQTT_ENDPOINT_WRITE_ACCESS;
 
-    String              m_hostname;             /**< Hostname cache used for the base URI */
-    ListOfTopicStates   m_listOfTopicStates;    /**< List of registered plugins. */
+    ListOfTopicStates   m_listOfTopicStates;    /**< List of registered topic states. */
     bool                m_isMqttConnected;      /**< Is the MQTT connection to the broker established? */
     HomeAssistantMqtt   m_haExtension;          /**< Home Assistant extension */
 
@@ -171,61 +177,40 @@ class MqttApiTopicHandler : public ITopicHandler
     MqttApiTopicHandler& operator=(const MqttApiTopicHandler& adapter);
 
     /**
-     * Get plugin MQTT base URI to identify plugin by UID.
-     *
-     * @param[in] uid   Plugin UID
-     *
-     * @return Plugin MQTT API base URI
+     * Request to publish all topic states.
      */
-    String getBaseUriByUid(uint16_t uid);
+    void requestToPublishAllTopicStates();
 
     /**
-     * Get plugin MQTT base URI to identify plugin by alias name.
-     *
-     * @param[in] alias Plugin alias name
-     *
-     * @return Plugin MQTT API base URI
-     */
-    String getBaseUriByAlias(const String& alias);
-
-    /**
-     * Register a single topic of the given plugin.
+     * Publish topic states, which are requested.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
-     * @param[in] topic     The topic name.
-     * @param[in] access    The topic accessibility.
-     * @param[in] extra     Extra parameters, which depend on the topic handler.
-     * @param[in] baseUri   The REST API base URI which to use.
+     * Note: Need to be called continously and will only publish one info per
+     *       call cycle.
      */
-    void registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra, const String& baseUri);
+    void publishTopicStatesOnDemand();
 
     /**
      * Write topic data.
      * 
-     * @param[in] plugin    The plugin which relates to the topic.
-     * @param[in] topicUri  The topic URI
-     * @param[in] payload   The payload data.
-     * @param[in] size      The payload size in byte.
-     */
-    void write(IPluginMaintenance* plugin, const String& topicUri, const uint8_t* payload, size_t size);
-
-    /**
-     * Unregister a single topic of the given plugin.
-     * 
-     * @param[in] plugin    The related plugin.
-     * @param[in] topic     The topic.
-     * @param[in] baseUri   The MQTT API base URI.
+     * @param[in] deviceId      The device id which represents the physical device.
+     * @param[in] entityId      The entity id which represents the entity of the device.
+     * @param[in] topic         The topic name.
+     * @param[in] payload       The payload data.
+     * @param[in] size          The payload size in byte.
+     * @param[in] setTopicFunc  Function to set the topic content.
+     * @param[in] uploadReqFunc Function used for requesting whether an file upload is allowed.
      */
-    void unregisterTopic(IPluginMaintenance* plugin, const String& topic, const String& baseUri);
+    void write(const String& deviceId, const String& entityId, const String& topic, const uint8_t* payload, size_t size, SetTopicFunc setTopicFunc, UploadReqFunc uploadReqFunc);
 
     /**
-     * Publish plugin specific topic data.
+     * Publish topic data.
      * 
-     * @param[in] baseUri   The MQTT API base URI.
-     * @param[in] plugin    The related plugin.
-     * @param[in] topic     The topic.
+     * @param[in] deviceId      The device id which represents the physical device.
+     * @param[in] entityId      The entity id which represents the entity of the device.
+     * @param[in] topic         The topic name.
+     * @param[in] getTopicFunc  Function to get the topic content.
      */
-    void publish(const String& baseUri, IPluginMaintenance* plugin, const String& topic);
+    void publish(const String& deviceId, const String& entityId, const String& topic, GetTopicFunc getTopicFunc);
 
     /**
      * Clear all topic states.
diff --git a/lib/MqttService/src/MqttService.cpp b/lib/MqttService/src/MqttService.cpp
index 27399757..6c08d337 100644
--- a/lib/MqttService/src/MqttService.cpp
+++ b/lib/MqttService/src/MqttService.cpp
@@ -324,8 +324,6 @@ void MqttService::disconnectedState()
             /* Connection to broker successful. */
             else
             {
-                String willTopic = m_hostname + "/status";
-
                 LOG_INFO("Connection to MQTT broker established.");
 
                 m_state = STATE_CONNECTED;
@@ -343,7 +341,7 @@ void MqttService::disconnectedState()
 void MqttService::connectedState()
 {
     /* Connection with broker lost? */
-    if (false == m_mqttClient.connected())
+    if (false == m_mqttClient.loop())
     {
         LOG_INFO("Connection to MQTT broker disconnected.");
         m_state = STATE_DISCONNECTED;
@@ -351,11 +349,6 @@ void MqttService::connectedState()
         /* Try to reconnect later. */
         m_reconnectTimer.restart();
     }
-    /* Connection to broker still established. */
-    else
-    {
-        (void)m_mqttClient.loop();
-    }
 }
 
 void MqttService::idleState()
@@ -367,8 +360,6 @@ void MqttService::rxCallback(char* topic, uint8_t* payload, uint32_t length)
 {
     SubscriberList::const_iterator it;
 
-    LOG_DEBUG("MQTT Rx: %s", topic);
-
     for(it = m_subscriberList.begin(); it != m_subscriberList.end(); ++it)
     {
         if (nullptr != (*it))
@@ -440,7 +431,7 @@ void MqttService::parseMqttBrokerUrl(const String& mqttBrokerUrl)
             /* Password not empty? */
             if (idx > (dividerIdx + 1))
             {
-                m_password = m_url.substring(dividerIdx + 1, idx - dividerIdx - 1);
+                m_password = m_url.substring(dividerIdx + 1, idx);
             }
         }
 
diff --git a/lib/MqttService/src/MqttService.h b/lib/MqttService/src/MqttService.h
index 40b76e0c..eff53d25 100644
--- a/lib/MqttService/src/MqttService.h
+++ b/lib/MqttService/src/MqttService.h
@@ -215,7 +215,7 @@ class MqttService : public IService
      * Max. MQTT client buffer size in byte.
      * Received MQTT messages greather than this will be skipped.
      */
-    static const size_t     MAX_BUFFER_SIZE             = 1024U;
+    static const size_t     MAX_BUFFER_SIZE             = 2048U;
 
     KeyValueString          m_mqttBrokerUrlSetting; /**< URL of the MQTT broker setting */
     String                  m_url;                  /**< URL of the MQTT broker */
diff --git a/lib/OpenWeatherPlugin/src/IOpenWeatherSource.h b/lib/OpenWeatherPlugin/src/IOpenWeatherSource.h
new file mode 100644
index 00000000..f5e85ae0
--- /dev/null
+++ b/lib/OpenWeatherPlugin/src/IOpenWeatherSource.h
@@ -0,0 +1,203 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  OpenWeather source interface
+ * @author Andreas Merkle <web@blue-andi.de>
+ *
+ * @addtogroup plugin
+ *
+ * @{
+ */
+
+#ifndef IOPENWEATHERSOURCE_H
+#define IOPENWEATHERSOURCE_H
+
+/******************************************************************************
+ * Compile Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include <WString.h>
+#include <stdint.h>
+#include <ArduinoJson.h>
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/** Default latitude (Berlin) */
+#define DEFAULT_LATITUDE    "52.519"
+
+/** Default longitude (Berlin) */
+#define DEFAULT_LONGITUDE   "13.376"
+
+/** Default units */
+#define DEFAULT_UNITS       "metric"
+
+/******************************************************************************
+ * Types and Classes
+ *****************************************************************************/
+
+/** This type is the abstract interface for a OpenWeather source. */
+class IOpenWeatherSource
+{
+public:
+
+    /**
+     * Get the API key.
+     * 
+     * @return API key
+     */
+    virtual const String& getApiKey() const = 0;
+
+    /**
+     * Set the API key.
+     * 
+     * @param[in] apiKey    The API key which to set.
+     */
+    virtual void setApiKey(const String& apiKey) = 0;
+
+    /**
+     * Get the latitude.
+     * 
+     * @return Latitude
+     */
+    virtual const String& getLatitude() const = 0;
+
+    /**
+     * Set thel latidue.
+     * 
+     * @param[in] latitude  The latitude which to set.
+     */
+    virtual void setLatitude(const String& latitude) = 0;
+
+    /**
+     * Get the longitude.
+     * 
+     * @return Longitude
+     */
+    virtual const String& getLongitude() const = 0;
+
+    /**
+     * Set the longitude.
+     * 
+     * @param[in] longitude The longitude which to set.
+     */
+    virtual void setLongitude(const String& longitude) = 0;
+
+    /**
+     * Get the units which are used for temperature and
+     * wind speed.
+     * 
+     * @return Units
+     */
+    virtual const String& getUnits() const = 0;
+
+    /**
+     * Set the units to use temperature and wind speed.
+     * 
+     * @param[in] units The units which to set.
+     */
+    virtual void setUnits(const String& units) = 0;
+
+    /**
+     * Adds the URI to the base URL.
+     * 
+     * @param[out] url  The base URL to use.
+     */
+    virtual void getUrl(String& url) const = 0;
+
+    /**
+     * Get the filter which to apply on the response from the weather source.
+     * Its a positive filter, which means everything marked with true, will
+     * be used. Everything else will not be considered.
+     * 
+     * @param[out] jsonFilterDoc    The filter which to use.
+     */
+    virtual void getFilter(JsonDocument& jsonFilterDoc) const = 0;
+    
+    /**
+     * Parse a response from the weather source and will update its internal
+     * data.
+     * 
+     * @param[out] jsonDoc  The JSON response which to parse.
+     */
+    virtual void parse(const JsonDocument& jsonDoc) = 0;
+
+    /**
+     * Get the temperature.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return Temperature, the unit is according to configuration.
+     */
+    virtual float getTemperature() const = 0;
+
+    /**
+     * Get the weather icon id.
+     * 
+     * @return Weather icon id
+     */
+    virtual const String& getWeatherIconId() const = 0;
+
+    /**
+     * Get the UV-index.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return UV-index.
+     */
+    virtual float getUvIndex() const = 0;
+
+    /**
+     * Get the humidity.
+     * 
+     * @return Humidity in %.
+     */
+    virtual int getHumidity() const = 0;
+
+    /**
+     * Get the wind speed.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return Wind speed, the unit is according to configuration.
+     */
+    virtual float getWindSpeed() const = 0;
+
+protected:
+};
+
+/******************************************************************************
+ * Functions
+ *****************************************************************************/
+
+#endif  /* IOPENWEATHERSOURCE_H */
+
+/** @} */
\ No newline at end of file
diff --git a/lib/OpenWeatherPlugin/src/OpenWeatherCurrent.cpp b/lib/OpenWeatherPlugin/src/OpenWeatherCurrent.cpp
new file mode 100644
index 00000000..a1d63a1c
--- /dev/null
+++ b/lib/OpenWeatherPlugin/src/OpenWeatherCurrent.cpp
@@ -0,0 +1,177 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  OpenWeather source for current weather data
+ * @author Andreas Merkle <web@blue-andi.de>
+ */
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "OpenWeatherCurrent.h"
+
+/******************************************************************************
+ * Compiler Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and classes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Prototypes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Variables
+ *****************************************************************************/
+
+/******************************************************************************
+ * Public Methods
+ *****************************************************************************/
+
+void OpenWeatherCurrent::getUrl(String& url) const
+{
+    url += "/data/2.5/weather?lat=";
+    url += m_latitude;
+    url += "&lon=";
+    url += m_longitude;
+    url += "&units=";
+    url += m_units;
+    url += "&appid=";
+    url += m_apiKey;
+}
+
+void OpenWeatherCurrent::getFilter(JsonDocument& jsonFilterDoc) const
+{
+    /*
+    
+        {
+        "coord": {
+            "lon": 10.99,
+            "lat": 44.34
+        },
+        "weather": [
+            {
+            "id": 501,
+            "main": "Rain",
+            "description": "moderate rain",
+            "icon": "10d"
+            }
+        ],
+        "base": "stations",
+        "main": {
+            "temp": 298.48,
+            "feels_like": 298.74,
+            "temp_min": 297.56,
+            "temp_max": 300.05,
+            "pressure": 1015,
+            "humidity": 64,
+            "sea_level": 1015,
+            "grnd_level": 933
+        },
+        "visibility": 10000,
+        "wind": {
+            "speed": 0.62,
+            "deg": 349,
+            "gust": 1.18
+        },
+        "rain": {
+            "1h": 3.16
+        },
+        "clouds": {
+            "all": 100
+        },
+        "dt": 1661870592,
+        "sys": {
+            "type": 2,
+            "id": 2075663,
+            "country": "IT",
+            "sunrise": 1661834187,
+            "sunset": 1661882248
+        },
+        "timezone": 7200,
+        "id": 3163858,
+        "name": "Zocca",
+        "cod": 200
+        }
+    
+    */
+
+    jsonFilterDoc["main"]["temp"]       = true;
+    jsonFilterDoc["main"]["humidity"]   = true;
+    jsonFilterDoc["wind"]["speed"]      = true;
+    jsonFilterDoc["weather"][0]["icon"] = true;
+}
+
+void OpenWeatherCurrent::parse(const JsonDocument& jsonDoc)
+{
+    JsonVariantConst    jsonTemperature = jsonDoc["main"]["temp"];
+    JsonVariantConst    jsonHumidity    = jsonDoc["main"]["humidity"];
+    JsonVariantConst    jsonWindSpeed   = jsonDoc["wind"]["speed"];
+    JsonVariantConst    jsonIcon        = jsonDoc["weather"][0]["icon"];
+
+    if (false == jsonTemperature.isNull())
+    {
+        m_temperature = jsonTemperature.as<float>();
+    }
+
+    if (false == jsonHumidity.isNull())
+    {
+        m_humidity = jsonHumidity.as<int>();
+    }
+
+    if (false == jsonWindSpeed.isNull())
+    {
+        m_windSpeed = jsonWindSpeed.as<float>();
+    }
+
+    if (false == jsonIcon.isNull())
+    {
+        m_weatherIconId = jsonIcon.as<String>();
+    }
+}
+
+/******************************************************************************
+ * Protected Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Private Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * External Functions
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Functions
+ *****************************************************************************/
diff --git a/lib/OpenWeatherPlugin/src/OpenWeatherCurrent.h b/lib/OpenWeatherPlugin/src/OpenWeatherCurrent.h
new file mode 100644
index 00000000..ba2413d8
--- /dev/null
+++ b/lib/OpenWeatherPlugin/src/OpenWeatherCurrent.h
@@ -0,0 +1,273 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  OpenWeather source for current weather data
+ * @author Andreas Merkle <web@blue-andi.de>
+ *
+ * @addtogroup plugin
+ *
+ * @{
+ */
+
+#ifndef OPENWEATHERCURRENT_H
+#define OPENWEATHERCURRENT_H
+
+/******************************************************************************
+ * Compile Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "IOpenWeatherSource.h"
+#include <limits.h>
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and Classes
+ *****************************************************************************/
+
+/**
+ * The OpenWeather source for current weather data.
+ * https://openweathermap.org/current
+ */
+class OpenWeatherCurrent : public IOpenWeatherSource
+{
+public:
+
+    /**
+     * Constructs the OpenWeather source.
+     */
+    OpenWeatherCurrent() :
+        IOpenWeatherSource(),
+        m_apiKey(),
+        m_latitude(DEFAULT_LATITUDE),
+        m_longitude(DEFAULT_LONGITUDE),
+        m_units(DEFAULT_UNITS),
+        m_temperature(std::numeric_limits<float>::quiet_NaN()),
+        m_weatherIconId(),
+        m_uvIndex(std::numeric_limits<float>::quiet_NaN()),
+        m_humidity(0),
+        m_windSpeed(std::numeric_limits<float>::quiet_NaN())
+    {
+    }
+
+    /**
+     * Destroys the OpenWeather source.
+     */
+    virtual ~OpenWeatherCurrent()
+    {
+    }
+
+    /**
+     * Get the API key.
+     * 
+     * @return API key
+     */
+    const String& getApiKey() const final
+    {
+        return m_apiKey;
+    }
+
+    /**
+     * Set the API key.
+     * 
+     * @param[in] apiKey    The API key which to set.
+     */
+    void setApiKey(const String& apiKey) final
+    {
+        m_apiKey = apiKey;
+    }
+
+    /**
+     * Get the latitude.
+     * 
+     * @return Latitude
+     */
+    const String& getLatitude() const final
+    {
+        return m_latitude;
+    }
+
+    /**
+     * Set thel latidue.
+     * 
+     * @param[in] latitude  The latitude which to set.
+     */
+    void setLatitude(const String& latitude) final
+    {
+        m_latitude = latitude;
+    }
+
+    /**
+     * Get the longitude.
+     * 
+     * @return Longitude
+     */
+    const String& getLongitude() const final
+    {
+        return m_longitude;
+    }
+
+    /**
+     * Set the longitude.
+     * 
+     * @param[in] longitude The longitude which to set.
+     */
+    void setLongitude(const String& longitude) final
+    {
+        m_longitude = longitude;
+    }
+
+    /**
+     * Get the units which are used for temperature and
+     * wind speed.
+     * 
+     * @return Units
+     */
+    const String& getUnits() const final
+    {
+        return m_units;
+    }
+
+    /**
+     * Set the units to use temperature and wind speed.
+     * 
+     * @param[in] units The units which to set.
+     */
+    void setUnits(const String& units) final
+    {
+        m_units = units;
+    }
+
+    /**
+     * Adds the URI to the base URL.
+     * 
+     * @param[out] url  The base URL to use.
+     */
+    void getUrl(String& url) const final;
+
+    /**
+     * Get the filter which to apply on the response from the weather source.
+     * Its a positive filter, which means everything marked with true, will
+     * be used. Everything else will not be considered.
+     * 
+     * @param[out] jsonFilterDoc    The filter which to use.
+     */
+    void getFilter(JsonDocument& jsonFilterDoc) const final;
+
+    /**
+     * Parse a response from the weather source and will update its internal
+     * data.
+     * 
+     * @param[out] jsonDoc  The JSON response which to parse.
+     */
+    void parse(const JsonDocument& jsonDoc) final;
+
+    /**
+     * Get the temperature.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return Temperature, the unit is according to configuration.
+     */
+    float getTemperature() const final
+    {
+        return m_temperature;
+    }
+
+    /**
+     * Get the weather icon id.
+     * 
+     * @return Weather icon id
+     */
+    const String& getWeatherIconId() const final
+    {
+        return m_weatherIconId;
+    }
+
+    /**
+     * Get the UV-index.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return UV-index.
+     */
+    float getUvIndex() const final
+    {
+        return m_uvIndex;
+    }
+
+    /**
+     * Get the humidity.
+     * 
+     * @return Humidity in %.
+     */
+    int getHumidity() const final
+    {
+        return m_humidity;
+    }
+
+    /**
+     * Get the wind speed.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return Wind speed, the unit is according to configuration.
+     */
+    float getWindSpeed() const final
+    {
+        return m_windSpeed;
+    }
+
+private:
+
+    String  m_apiKey;           /**< OpenWeather API Key */
+    String  m_latitude;         /**< The latitude. */
+    String  m_longitude;        /**< The longitude. */
+    String  m_units;            /**< The units to use for temperature and wind speed. */
+    float   m_temperature;      /**< Temperature, unit according to configuration. */
+    String  m_weatherIconId;    /**< Weather icon id. */
+    float   m_uvIndex;          /**< UV-index */
+    int     m_humidity;         /**< Humidity in %. */
+    float   m_windSpeed;        /**< Wind speed, unit according to configuration. */
+
+    /* Not allowed. */
+    OpenWeatherCurrent(const OpenWeatherCurrent& other);
+    OpenWeatherCurrent& operator=(const OpenWeatherCurrent& other);
+};
+
+/******************************************************************************
+ * Functions
+ *****************************************************************************/
+
+#endif  /* OPENWEATHERCURRENT_H */
+
+/** @} */
\ No newline at end of file
diff --git a/lib/OpenWeatherPlugin/src/OpenWeatherOneCall.cpp b/lib/OpenWeatherPlugin/src/OpenWeatherOneCall.cpp
new file mode 100644
index 00000000..93583247
--- /dev/null
+++ b/lib/OpenWeatherPlugin/src/OpenWeatherOneCall.cpp
@@ -0,0 +1,172 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  OpenWeather source for One-Call API
+ * @author Andreas Merkle <web@blue-andi.de>
+ */
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "OpenWeatherOneCall.h"
+
+/******************************************************************************
+ * Compiler Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and classes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Prototypes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Variables
+ *****************************************************************************/
+
+/******************************************************************************
+ * Public Methods
+ *****************************************************************************/
+
+void OpenWeatherOneCall::getUrl(String& url) const
+{
+    url += "/data/";
+    url += m_oneCallApiVersion;
+    url += "/onecall?lat=";
+    url += m_latitude;
+    url += "&lon=";
+    url += m_longitude;
+    url += "&units=";
+    url += m_units;
+    url += "&appid=";
+    url += m_apiKey;
+    url += "&exclude=minutely,hourly,daily,alerts";
+}
+
+void OpenWeatherOneCall::getFilter(JsonDocument& jsonFilterDoc) const
+{
+    JsonObject jsonCurrent = jsonFilterDoc.createNestedObject("current");
+
+    /*
+    
+        {
+        "lat": 33.44,
+        "lon": -94.04,
+        "timezone": "America/Chicago",
+        "timezone_offset": -21600,
+        "current": {
+            "dt": 1618317040,
+            "sunrise": 1618282134,
+            "sunset": 1618333901,
+            "temp": 284.07,
+            "feels_like": 282.84,
+            "pressure": 1019,
+            "humidity": 62,
+            "dew_point": 277.08,
+            "uvi": 0.89,
+            "clouds": 0,
+            "visibility": 10000,
+            "wind_speed": 6,
+            "wind_deg": 300,
+            "weather": [
+            {
+                "id": 500,
+                "main": "Rain",
+                "description": "light rain",
+                "icon": "10d"
+            }
+            ],
+            "rain": {
+            "1h": 0.21
+            }
+        }
+    
+    */
+
+    jsonCurrent["temp"]                 = true;
+    jsonCurrent["uvi"]                  = true;
+    jsonCurrent["humidity"]             = true;
+    jsonCurrent["wind_speed"]           = true;
+    jsonCurrent["weather"][0]["icon"]   = true;
+}
+
+void OpenWeatherOneCall::parse(const JsonDocument& jsonDoc)
+{
+    JsonVariantConst    jsonCurrent     = jsonDoc["current"];
+    JsonVariantConst    jsonTemperature = jsonCurrent["temp"];
+    JsonVariantConst    jsonUvi         = jsonCurrent["uvi"];
+    JsonVariantConst    jsonHumidity    = jsonCurrent["humidity"];
+    JsonVariantConst    jsonWindSpeed   = jsonCurrent["wind_speed"];
+    JsonVariantConst    jsonIcon        = jsonCurrent["weather"][0]["icon"];
+
+    if (false == jsonTemperature.isNull())
+    {
+        m_temperature = jsonTemperature.as<float>();
+    }
+
+    if (false == jsonUvi.isNull())
+    {
+        m_uvIndex = jsonUvi.as<float>();
+    }
+
+    if (false == jsonHumidity.isNull())
+    {
+        m_humidity = jsonHumidity.as<int>();
+    }
+
+    if (false == jsonWindSpeed.isNull())
+    {
+        m_windSpeed = jsonWindSpeed.as<float>();
+    }
+
+    if (false == jsonIcon.isNull())
+    {
+        m_weatherIconId = jsonIcon.as<String>();
+    }
+}
+
+/******************************************************************************
+ * Protected Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Private Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * External Functions
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Functions
+ *****************************************************************************/
diff --git a/lib/OpenWeatherPlugin/src/OpenWeatherOneCall.h b/lib/OpenWeatherPlugin/src/OpenWeatherOneCall.h
new file mode 100644
index 00000000..cab0893a
--- /dev/null
+++ b/lib/OpenWeatherPlugin/src/OpenWeatherOneCall.h
@@ -0,0 +1,279 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  OpenWeather source for One-Call API
+ * @author Andreas Merkle <web@blue-andi.de>
+ *
+ * @addtogroup plugin
+ *
+ * @{
+ */
+
+#ifndef OPENWEATHER_ONECALL_H
+#define OPENWEATHER_ONECALL_H
+
+/******************************************************************************
+ * Compile Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "IOpenWeatherSource.h"
+#include <limits.h>
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and Classes
+ *****************************************************************************/
+
+/**
+ * The OpenWeather source for One-Call API
+ * v2.5 see https://openweathermap.org/api/one-call-api
+ * v3.0 see https://openweathermap.org/api/one-call-3
+ */
+class OpenWeatherOneCall : public IOpenWeatherSource
+{
+public:
+
+    /**
+     * Constructs the OpenWeather source.
+     * 
+     * @param[in] oneCallApiVersion Version of the One-Call API to use. Supported: "2.5" and "3.0"
+     */
+    OpenWeatherOneCall(const String& oneCallApiVersion) :
+        IOpenWeatherSource(),
+        m_oneCallApiVersion(oneCallApiVersion),
+        m_apiKey(),
+        m_latitude(DEFAULT_LATITUDE),
+        m_longitude(DEFAULT_LONGITUDE),
+        m_units(DEFAULT_UNITS),
+        m_temperature(std::numeric_limits<float>::quiet_NaN()),
+        m_weatherIconId(),
+        m_uvIndex(std::numeric_limits<float>::quiet_NaN()),
+        m_humidity(0),
+        m_windSpeed(std::numeric_limits<float>::quiet_NaN())
+    {
+    }
+
+    /**
+     * Destroys the OpenWeather source.
+     */
+    virtual ~OpenWeatherOneCall()
+    {
+    }
+
+    /**
+     * Get the API key.
+     * 
+     * @return API key
+     */
+    const String& getApiKey() const final
+    {
+        return m_apiKey;
+    }
+
+    /**
+     * Set the API key.
+     * 
+     * @param[in] apiKey    The API key which to set.
+     */
+    void setApiKey(const String& apiKey) final
+    {
+        m_apiKey = apiKey;
+    }
+
+    /**
+     * Get the latitude.
+     * 
+     * @return Latitude
+     */
+    const String& getLatitude() const final
+    {
+        return m_latitude;
+    }
+
+    /**
+     * Set thel latidue.
+     * 
+     * @param[in] latitude  The latitude which to set.
+     */
+    void setLatitude(const String& latitude) final
+    {
+        m_latitude = latitude;
+    }
+
+    /**
+     * Get the longitude.
+     * 
+     * @return Longitude
+     */
+    const String& getLongitude() const final
+    {
+        return m_longitude;
+    }
+
+    /**
+     * Set the longitude.
+     * 
+     * @param[in] longitude The longitude which to set.
+     */
+    void setLongitude(const String& longitude) final
+    {
+        m_longitude = longitude;
+    }
+
+    /**
+     * Get the units which are used for temperature and
+     * wind speed.
+     * 
+     * @return Units
+     */
+    const String& getUnits() const final
+    {
+        return m_units;
+    }
+
+    /**
+     * Set the units to use temperature and wind speed.
+     * 
+     * @param[in] units The units which to set.
+     */
+    void setUnits(const String& units) final
+    {
+        m_units = units;
+    }
+
+    /**
+     * Adds the URI to the base URL.
+     * 
+     * @param[out] url  The base URL to use.
+     */
+    void getUrl(String& url) const final;
+
+    /**
+     * Get the filter which to apply on the response from the weather source.
+     * Its a positive filter, which means everything marked with true, will
+     * be used. Everything else will not be considered.
+     * 
+     * @param[out] jsonFilterDoc    The filter which to use.
+     */
+    void getFilter(JsonDocument& jsonFilterDoc) const final;
+
+    /**
+     * Parse a response from the weather source and will update its internal
+     * data.
+     * 
+     * @param[out] jsonDoc  The JSON response which to parse.
+     */
+    void parse(const JsonDocument& jsonDoc) final;
+
+    /**
+     * Get the temperature.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return Temperature, the unit is according to configuration.
+     */
+    float getTemperature() const final
+    {
+        return m_temperature;
+    }
+
+    /**
+     * Get the weather icon id.
+     * 
+     * @return Weather icon id
+     */
+    const String& getWeatherIconId() const final
+    {
+        return m_weatherIconId;
+    }
+
+    /**
+     * Get the UV-index.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return UV-index.
+     */
+    float getUvIndex() const final
+    {
+        return m_uvIndex;
+    }
+
+    /**
+     * Get the humidity.
+     * 
+     * @return Humidity in %.
+     */
+    int getHumidity() const final
+    {
+        return m_humidity;
+    }
+
+    /**
+     * Get the wind speed.
+     * Might be NaN in case no response was never parsed
+     * or its not supported by the OpenWeather source.
+     * 
+     * @return Wind speed, the unit is according to configuration.
+     */
+    float getWindSpeed() const final
+    {
+        return m_windSpeed;
+    }
+
+private:
+
+    String  m_oneCallApiVersion;    /**< OpenWeather One-Call API version */
+    String  m_apiKey;               /**< OpenWeather API Key */
+    String  m_latitude;             /**< The latitude. */
+    String  m_longitude;            /**< The longitude. */
+    String  m_units;                /**< The units to use for temperature and wind speed. */
+    float   m_temperature;          /**< Temperature, unit according to configuration. */
+    String  m_weatherIconId;        /**< Weather icon id. */
+    float   m_uvIndex;              /**< UV-index */
+    int     m_humidity;             /**< Humidity in %. */
+    float   m_windSpeed;            /**< Wind speed, unit according to configuration. */
+
+    /* Not allowed. */
+    OpenWeatherOneCall();
+    OpenWeatherOneCall(const OpenWeatherOneCall& other);
+    OpenWeatherOneCall& operator=(const OpenWeatherOneCall& other);
+};
+
+/******************************************************************************
+ * Functions
+ *****************************************************************************/
+
+#endif  /* OPENWEATHER_ONECALL_H */
+
+/** @} */
\ No newline at end of file
diff --git a/lib/OpenWeatherPlugin/src/OpenWeatherPlugin.cpp b/lib/OpenWeatherPlugin/src/OpenWeatherPlugin.cpp
index 138cec57..551d99e5 100644
--- a/lib/OpenWeatherPlugin/src/OpenWeatherPlugin.cpp
+++ b/lib/OpenWeatherPlugin/src/OpenWeatherPlugin.cpp
@@ -33,10 +33,14 @@
  * Includes
  *****************************************************************************/
 #include "OpenWeatherPlugin.h"
+#include "OpenWeatherCurrent.h"
+#include "OpenWeatherOneCall.h"
 
 #include <Logging.h>
 #include <ArduinoJson.h>
 #include <Util.h>
+#include <math.h>
+#include <HttpStatus.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -91,8 +95,10 @@ const char* OpenWeatherPlugin::IMAGE_PATH_WIND_ICON     = "/plugins/OpenWeatherP
 /* Initialize image path for the weather condition icons. */
 const char* OpenWeatherPlugin::IMAGE_PATH               = "/plugins/OpenWeatherPlugin/";
 
-/* Initialize OpenWeather base URI */
-const char* OpenWeatherPlugin::OPEN_WEATHER_BASE_URI    = "https://api.openweathermap.org";
+/* Initialize OpenWeather base URI.
+ * Use http:// instead of https:// for less required heap memory for SSL connection.
+ */
+const char* OpenWeatherPlugin::OPEN_WEATHER_BASE_URI    = "http://api.openweathermap.org";
 
 /* Initialize plugin topic. */
 const char* OpenWeatherPlugin::TOPIC_CONFIG             = "/weather";
@@ -134,7 +140,7 @@ bool OpenWeatherPlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool OpenWeatherPlugin::setTopic(const String& topic, const JsonObject& value)
+bool OpenWeatherPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
@@ -143,6 +149,8 @@ bool OpenWeatherPlugin::setTopic(const String& topic, const JsonObject& value)
         const size_t        JSON_DOC_SIZE           = 512U;
         DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
         JsonObject          jsonCfg                 = jsonDoc.to<JsonObject>();
+        JsonVariantConst    jsonSourceId            = value["sourceId"];
+        JsonVariantConst    jsonUpdatePeriod        = value["updatePeriod"];
         JsonVariantConst    jsonApiKey              = value["apiKey"];
         JsonVariantConst    jsonLatitude            = value["latitude"];
         JsonVariantConst    jsonLongitude           = value["longitude"];
@@ -160,6 +168,18 @@ bool OpenWeatherPlugin::setTopic(const String& topic, const JsonObject& value)
          * The type check will follow in the setConfiguration().
          */
 
+        if (false == jsonSourceId.isNull())
+        {
+            jsonCfg["sourceId"] = jsonSourceId.as<int>();
+            isSuccessful = true;
+        }
+
+        if (false == jsonUpdatePeriod.isNull())
+        {
+            jsonCfg["updatePeriod"] = jsonUpdatePeriod.as<uint32_t>();
+            isSuccessful = true;
+        }
+
         if (false == jsonApiKey.isNull())
         {
             jsonCfg["apiKey"] = jsonApiKey.as<String>();
@@ -347,7 +367,7 @@ void OpenWeatherPlugin::process(bool isConnected)
             }
             else
             {
-                m_requestTimer.start(UPDATE_PERIOD);
+                m_requestTimer.start(m_updatePeriod);
             }
         }
     }
@@ -373,7 +393,7 @@ void OpenWeatherPlugin::process(bool isConnected)
             }
             else
             {
-                m_requestTimer.start(UPDATE_PERIOD);
+                m_requestTimer.start(m_updatePeriod);
             }
         }
     }
@@ -472,6 +492,38 @@ void OpenWeatherPlugin::update(YAGfx& gfx)
  * Private Methods
  *****************************************************************************/
 
+void OpenWeatherPlugin::createOpenWeatherSource(OpenWeatherSource id)
+{
+    destroyOpenWeatherSource();
+
+    switch(id)
+    {
+    case OPENWEATHER_SOURCE_CURRENT:
+        m_source = new(std::nothrow) OpenWeatherCurrent();
+        break;
+
+    case OPENWEATHER_SOURCE_ONE_CALL_25:
+        m_source = new(std::nothrow) OpenWeatherOneCall("2.5");
+        break;
+
+    case OPENWEATHER_SOURCE_ONE_CALL_30:
+        m_source = new(std::nothrow) OpenWeatherOneCall("3.0");
+        break;
+
+    default:
+        break;
+    }
+}
+
+void OpenWeatherPlugin::destroyOpenWeatherSource()
+{
+    if (nullptr != m_source)
+    {
+        delete m_source;
+        m_source = nullptr;
+    }
+}
+
 void OpenWeatherPlugin::requestStoreToPersistentMemory()
 {
     MutexGuard<MutexRecursive> guard(m_mutex);
@@ -483,23 +535,45 @@ void OpenWeatherPlugin::getConfiguration(JsonObject& jsonCfg) const
 {
     MutexGuard<MutexRecursive> guard(m_mutex);
 
-    jsonCfg["apiKey"]       = m_apiKey;
-    jsonCfg["latitude"]     = m_latitude;
-    jsonCfg["longitude"]    = m_longitude;
-    jsonCfg["other"]        = static_cast<int>(m_additionalInformation);
-    jsonCfg["units"]        = m_units;
+    if (nullptr == m_source)
+    {
+        LOG_ERROR("No OpenWeather source available.");
+    }
+    else
+    {
+        jsonCfg["sourceId"]     = static_cast<int>(m_sourceId);
+        jsonCfg["updatePeriod"] = m_updatePeriod / (60U * 1000U); /* Conversion from ms to minutes. */
+        jsonCfg["apiKey"]       = m_source->getApiKey();
+        jsonCfg["latitude"]     = m_source->getLatitude();
+        jsonCfg["longitude"]    = m_source->getLongitude();
+        jsonCfg["units"]        = m_source->getUnits();
+        jsonCfg["other"]        = static_cast<int>(m_additionalInformation);
+    }
 }
 
 bool OpenWeatherPlugin::setConfiguration(JsonObjectConst& jsonCfg)
 {
-    bool                status          = false;
-    JsonVariantConst    jsonApiKey      = jsonCfg["apiKey"];
-    JsonVariantConst    jsonLatitude    = jsonCfg["latitude"];
-    JsonVariantConst    jsonLongitude   = jsonCfg["longitude"];
-    JsonVariantConst    jsonOther       = jsonCfg["other"];
-    JsonVariantConst    jsonUnits       = jsonCfg["units"];
-
-    if (false == jsonApiKey.is<String>())
+    bool                status              = false;
+    JsonVariantConst	jsonSourceId        = jsonCfg["sourceId"];
+    JsonVariantConst    jsonUpdatePeriod    = jsonCfg["updatePeriod"];
+    JsonVariantConst    jsonApiKey          = jsonCfg["apiKey"];
+    JsonVariantConst    jsonLatitude        = jsonCfg["latitude"];
+    JsonVariantConst    jsonLongitude       = jsonCfg["longitude"];
+    JsonVariantConst    jsonOther           = jsonCfg["other"];
+    JsonVariantConst    jsonUnits           = jsonCfg["units"];
+
+    const uint32_t      UPDATE_PERIOD_LOWER_LIMIT   = 1U;   /* minutes */
+    const uint32_t      UPDATE_PERIOD_UPPER_LIMIT   = 120U; /* minutes */
+
+    if (false == jsonSourceId.is<int>())
+    {
+        LOG_WARNING("Source id not found or invalid type.");
+    }
+    else if (false == jsonUpdatePeriod.is<uint32_t>())
+    {
+        LOG_WARNING("Update period not found or invalid type.");
+    }
+    else if (false == jsonApiKey.is<String>())
     {
         LOG_WARNING("API key not found or invalid type.");
     }
@@ -521,13 +595,41 @@ bool OpenWeatherPlugin::setConfiguration(JsonObjectConst& jsonCfg)
     }
     else
     {
-        MutexGuard<MutexRecursive> guard(m_mutex);
+        MutexGuard<MutexRecursive>  guard(m_mutex);
+        OpenWeatherSource           sourceId        = static_cast<OpenWeatherSource>(jsonSourceId.as<int>());
+
+        if (m_sourceId != sourceId)
+        {
+            destroyOpenWeatherSource();
+            m_sourceId = sourceId;
+            createOpenWeatherSource(m_sourceId);
+        }
+
+        m_updatePeriod = jsonUpdatePeriod.as<uint32_t>();
+
+        if ((UPDATE_PERIOD_LOWER_LIMIT > m_updatePeriod) ||
+            (UPDATE_PERIOD_UPPER_LIMIT < m_updatePeriod))
+        {
+            m_updatePeriod = UPDATE_PERIOD;
+        }
+        else
+        {
+            m_updatePeriod = SIMPLE_TIMER_MINUTES(m_updatePeriod);
+        }
+
+        if (nullptr == m_source)
+        {
+            LOG_ERROR("No OpenWeather source available.");
+        }
+        else
+        {
+            m_source->setApiKey(jsonApiKey.as<String>());
+            m_source->setLatitude(jsonLatitude.as<String>());
+            m_source->setLongitude(jsonLongitude.as<String>());
+            m_source->setUnits(jsonUnits.as<String>());
+        }
 
-        m_apiKey                = jsonApiKey.as<String>();
-        m_latitude              = jsonLatitude.as<String>();
-        m_longitude             = jsonLongitude.as<String>();
         m_additionalInformation = static_cast<OtherWeatherInformation>(jsonOther.as<int>());
-        m_units                 = jsonUnits.as<String>();
 
         /* Force update on display */
         m_requestTimer.start(UPDATE_PERIOD_SHORT);
@@ -623,17 +725,17 @@ void OpenWeatherPlugin::updateDisplay(bool force)
         {
             if (true == m_hasWeatherIconChanged)
             {
-                String spriteSheetPath = m_currentWeatherIcon.substring(0U, m_currentWeatherIcon.length() - strlen(FILE_EXT_BITMAP)) + FILE_EXT_SPRITE_SHEET;
+                String spriteSheetPath = m_currentWeatherIconFullPath.substring(0U, m_currentWeatherIconFullPath.length() - strlen(FILE_EXT_BITMAP)) + FILE_EXT_SPRITE_SHEET;
 
                 /* If there is an icon in the filesystem, it will be loaded otherwise
                  * the standard icon. First check whether it is a animated sprite sheet
                  * and if not, try to load just the bitmap image.
                  */
-                if (false == m_bitmapWidget.loadSpriteSheet(FILESYSTEM, spriteSheetPath, m_currentWeatherIcon))
+                if (false == m_bitmapWidget.loadSpriteSheet(FILESYSTEM, spriteSheetPath, m_currentWeatherIconFullPath))
                 {
-                    if (false == m_bitmapWidget.load(FILESYSTEM, m_currentWeatherIcon))
+                    if (false == m_bitmapWidget.load(FILESYSTEM, m_currentWeatherIconFullPath))
                     {
-                        LOG_WARNING("Icon doesn't exists: %s", m_currentWeatherIcon.c_str());
+                        LOG_WARNING("Icon doesn't exists: %s", m_currentWeatherIconFullPath.c_str());
 
                         (void)m_bitmapWidget.load(FILESYSTEM, IMAGE_PATH_STD_ICON);
                     }
@@ -701,23 +803,15 @@ bool OpenWeatherPlugin::startHttpRequest()
 {
     bool status = false;
 
-    if ((false == m_latitude.isEmpty()) &&
-        (false == m_longitude.isEmpty()) &&
-        (false == m_units.isEmpty()) &&
-        (false == m_apiKey.isEmpty()))
+    if ((nullptr != m_source) &&
+        (false == m_source->getApiKey().isEmpty()) &&
+        (false == m_source->getLatitude().isEmpty()) &&
+        (false == m_source->getLongitude().isEmpty()) &&
+        (false == m_source->getUnits().isEmpty()))
     {
         String url = OPEN_WEATHER_BASE_URI;
 
-        /* Get current weather information: https://openweathermap.org/api/one-call-api */
-        url += "/data/2.5/onecall?lat=";
-        url += m_latitude;
-        url += "&lon=";
-        url += m_longitude;
-        url += "&units=";
-        url += m_units;
-        url += "&appid=";
-        url += m_apiKey;
-        url += "&exclude=minutely,hourly,daily,alerts";
+        m_source->getUrl(url);
 
         if (true == m_client.begin(url))
         {
@@ -744,50 +838,7 @@ void OpenWeatherPlugin::initHttpClient()
     m_client.regOnResponse(
         [this](const HttpResponse& rsp)
         {
-            const size_t            JSON_DOC_SIZE   = 256U;
-            DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
-
-            if (nullptr != jsonDoc)
-            {
-                size_t                          payloadSize     = 0U;
-                const char*                     payload         = reinterpret_cast<const char*>(rsp.getPayload(payloadSize));
-                const size_t                    FILTER_SIZE     = 128U;
-                StaticJsonDocument<FILTER_SIZE> filter;
-                JsonObject                      filterCurrent   = filter.createNestedObject("current");
-                DeserializationError            error;
-
-                /* See https://openweathermap.org/api/one-call-api for an example of API response. */
-                filterCurrent["temp"]                  = true;
-                filterCurrent["uvi"]                   = true;
-                filterCurrent["humidity"]              = true;
-                filterCurrent["wind_speed"]            = true;
-                filterCurrent["weather"][0]["icon"]    = true;
-                
-                if (true == filter.overflowed())
-                {
-                    LOG_ERROR("Less memory for filter available.");
-                }
-
-                error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
-
-                if (DeserializationError::Ok != error.code())
-                {
-                    LOG_WARNING("JSON parse error: %s", error.c_str());
-                }
-                else
-                {
-                    Msg msg;
-
-                    msg.type    = MSG_TYPE_RSP;
-                    msg.rsp     = jsonDoc;
-
-                    if (false == this->m_taskProxy.send(msg))
-                    {
-                        delete jsonDoc;
-                        jsonDoc = nullptr;
-                    }
-                }
-            }
+            handleAsyncWebResponse(rsp);
         }
     );
 
@@ -814,60 +865,110 @@ void OpenWeatherPlugin::initHttpClient()
     );
 }
 
-void OpenWeatherPlugin::handleWebResponse(DynamicJsonDocument& jsonDoc)
+void OpenWeatherPlugin::handleAsyncWebResponse(const HttpResponse& rsp)
 {
-    JsonVariantConst    jsonCurrent     = jsonDoc["current"];
-    JsonVariantConst    jsonTemperature = jsonCurrent["temp"];
-    JsonVariantConst    jsonUvi         = jsonCurrent["uvi"];
-    JsonVariantConst    jsonHumidity    = jsonCurrent["humidity"];
-    JsonVariantConst    jsonWindSpeed   = jsonCurrent["wind_speed"];
-    JsonVariantConst    jsonIcon        = jsonCurrent["weather"][0]["icon"];
-
-    if (false == jsonTemperature.is<float>())
+    if (HttpStatus::STATUS_CODE_OK == rsp.getStatusCode())
     {
-        LOG_WARNING("JSON temp type mismatch or missing.");
-    }
-    else if (false == jsonUvi.is<float>())
-    {
-        LOG_WARNING("JSON uvi type mismatch or missing.");
-    }
-    else if (false == jsonHumidity.is<int>())
-    {
-        LOG_WARNING("JSON humidity type mismatch or missing.");
-    }
-    else if (false == jsonWindSpeed.is<float>())
-    {
-        LOG_WARNING("JSON wind_speed type mismatch or missing.");
+        if (nullptr != m_source)
+        {
+            const size_t            JSON_DOC_SIZE   = 512U;
+            DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
+
+            if (nullptr != jsonDoc)
+            {
+                size_t                          payloadSize     = 0U;
+                const void*                     vPayload        = rsp.getPayload(payloadSize);
+                const char*                     payload         = static_cast<const char*>(vPayload);
+                const size_t                    FILTER_SIZE     = 128U;
+                StaticJsonDocument<FILTER_SIZE> jsonFilterDoc;
+
+                m_source->getFilter(jsonFilterDoc);
+
+                if (true == jsonFilterDoc.overflowed())
+                {
+                    LOG_ERROR("Less memory for filter available.");
+                }
+                else if ((nullptr == payload) ||
+                         (0U == payloadSize))
+                {
+                    LOG_ERROR("No payload.");
+                }
+                else
+                {
+                    DeserializationError error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(jsonFilterDoc));
+
+                    if (DeserializationError::Ok != error.code())
+                    {
+                        LOG_WARNING("JSON parse error: %s", error.c_str());
+                    }
+                    else
+                    {
+                        Msg msg;
+
+                        msg.type    = MSG_TYPE_RSP;
+                        msg.rsp     = jsonDoc;
+
+                        if (false == this->m_taskProxy.send(msg))
+                        {
+                            delete jsonDoc;
+                            jsonDoc = nullptr;
+                        }
+                    }
+                }
+            }
+        }
     }
-    else if (false == jsonIcon.is<String>())
+}
+
+void OpenWeatherPlugin::handleWebResponse(const DynamicJsonDocument& jsonDoc)
+{
+    if (nullptr != m_source)
     {
-        LOG_WARNING("JSON weather icon id type mismatch or missing.");
+        m_source->parse(jsonDoc);
+        prepareDataToShow();
     }
-    else
+}
+
+void OpenWeatherPlugin::prepareDataToShow()
+{
+    if (nullptr != m_source)
     {
-        float   temperature             = jsonTemperature.as<float>();
-        String  weatherIconId           = jsonIcon.as<String>();
-        float   uvIndex                 = jsonUvi.as<float>();
-        int     humidity                = jsonHumidity.as<int>();
-        float   windSpeed               = jsonWindSpeed.as<float>();
-        char    tempReducedPrecison[6]  = { 0 };
-        char    windReducedPrecison[5]  = { 0 };
-        String  weatherConditionIcon;
+        float   temperature                     = m_source->getTemperature();
+        String  weatherIconId                   = m_source->getWeatherIconId();
+        float   uvIndex                         = m_source->getUvIndex();
+        int     humidity                        = m_source->getHumidity();
+        float   windSpeed                       = m_source->getWindSpeed();
+        String  weatherConditionIconFullPath;
 
         /* Generate UV-Index string and adapt color of string accordingly. */
-        m_currentUvIndex = "\\calign";
-        m_currentUvIndex += uvIndexToColor(static_cast<uint8_t>(uvIndex));
-        m_currentUvIndex += uvIndex;
+        if (true == std::isnan(uvIndex))
+        {
+            m_currentUvIndex = "\\calignN/A";
+        }
+        else
+        {
+            m_currentUvIndex = "\\calign";
+            m_currentUvIndex += uvIndexToColor(static_cast<uint8_t>(uvIndex));
+            m_currentUvIndex += uvIndex;
+        }
 
-        const char* reducePrecision = (temperature < -9.9F) ? "%.0f" : "%.1f";
+        if (true == std::isnan(temperature))
+        {
+            m_currentUvIndex = "\\calignN/A";
+        }
+        else
+        {
+            const char* reducePrecision         = (temperature < -9.9F) ? "%.0f" : "%.1f";
+            char        tempReducedPrecison[6]  = { 0 };
 
-        /* Generate temperature string with reduced precision and add unit °C/°F. */
-        (void)snprintf(tempReducedPrecison, sizeof(tempReducedPrecison), reducePrecision, temperature);
+            /* Generate temperature string with reduced precision and add unit °C/°F. */
+            (void)snprintf(tempReducedPrecison, sizeof(tempReducedPrecison), reducePrecision, temperature);
 
-        m_currentTemp  = "\\calign";
-        m_currentTemp += tempReducedPrecison;
-        m_currentTemp += "\x8E";
-        m_currentTemp += (m_units == "metric")?"C":"F";
+            m_currentTemp  = "\\calign";
+            m_currentTemp += tempReducedPrecison;
+            m_currentTemp += "\x8E";
+            m_currentTemp += (m_source->getUnits() == "metric") ? "C" : "F";
+        }
 
         /* Generate humidity string */
         m_currentHumidity = "\\calign";
@@ -875,10 +976,20 @@ void OpenWeatherPlugin::handleWebResponse(DynamicJsonDocument& jsonDoc)
         m_currentHumidity += "%";
 
         /* Generate windapeed string and add unit.*/
-        (void)snprintf(windReducedPrecison, sizeof(windReducedPrecison), "%.1f", windSpeed);
-        m_currentWindspeed = "\\calign";
-        m_currentWindspeed += windReducedPrecison;
-        m_currentWindspeed += "m/s";
+        if (true == std::isnan(windSpeed))
+        {
+            m_currentUvIndex = "\\calignN/A";
+        }
+        else
+        {
+            char windReducedPrecison[5] = { 0 };
+
+            (void)snprintf(windReducedPrecison, sizeof(windReducedPrecison), "%.1f", windSpeed);
+
+            m_currentWindspeed = "\\calign";
+            m_currentWindspeed += windReducedPrecison;
+            m_currentWindspeed += "m/s";
+        }
 
         /* Handle icon depended on weather icon id.
          * See https://openweathermap.org/weather-conditions
@@ -887,20 +998,20 @@ void OpenWeatherPlugin::handleWebResponse(DynamicJsonDocument& jsonDoc)
          * If not, check for a generic weather icon.
          * If this is not available too, use the standard OpenWeather icon.
          */
-        weatherConditionIcon = IMAGE_PATH + weatherIconId + FILE_EXT_BITMAP;
-        if (false == FILESYSTEM.exists(weatherConditionIcon))
+        weatherConditionIconFullPath = IMAGE_PATH + weatherIconId + FILE_EXT_BITMAP;
+        if (false == FILESYSTEM.exists(weatherConditionIconFullPath))
         {
-            weatherConditionIcon  = IMAGE_PATH + weatherIconId.substring(0U, weatherIconId.length() - 1U);
-            weatherConditionIcon += FILE_EXT_BITMAP;
+            weatherConditionIconFullPath  = IMAGE_PATH + weatherIconId.substring(0U, weatherIconId.length() - 1U);
+            weatherConditionIconFullPath += FILE_EXT_BITMAP;
         }
 
         /* If there is really a change, the display shall be updated otherwise
          * not to not destroy running animations.
          */
-        if (weatherConditionIcon != m_currentWeatherIcon)
+        if (weatherConditionIconFullPath != m_currentWeatherIconFullPath)
         {
             m_hasWeatherIconChanged = true;
-            m_currentWeatherIcon = weatherConditionIcon;
+            m_currentWeatherIconFullPath = weatherConditionIconFullPath;
         }
 
         updateDisplay(true);
diff --git a/lib/OpenWeatherPlugin/src/OpenWeatherPlugin.h b/lib/OpenWeatherPlugin/src/OpenWeatherPlugin.h
index b7817407..345aba42 100644
--- a/lib/OpenWeatherPlugin/src/OpenWeatherPlugin.h
+++ b/lib/OpenWeatherPlugin/src/OpenWeatherPlugin.h
@@ -46,6 +46,7 @@
 #include <stdint.h>
 #include "Plugin.hpp"
 #include "AsyncHttpClient.h"
+#include "IOpenWeatherSource.h"
 
 #include <WidgetGroup.h>
 #include <BitmapWidget.h>
@@ -69,6 +70,27 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
 {
 public:
 
+    /**
+     * The supported OpenWeather sources.
+     */
+    enum OpenWeatherSource
+    {
+        OPENWEATHER_SOURCE_CURRENT = 0, /**< Current weather data */
+        OPENWEATHER_SOURCE_ONE_CALL_25, /**< OpenWeather One-Call API v2.5 */
+        OPENWEATHER_SOURCE_ONE_CALL_30, /**< OpenWeather One-Call API v3.0 */
+    };
+
+    /**
+     * Enumeration to choose an additional weather information to be displayed.
+     */
+    enum OtherWeatherInformation
+    {
+        OTHER_WEATHER_INFO_UVI = 0,     /**< Display UV Index as additional information. */
+        OTHER_WEATHER_INFO_HUMIDITY,    /**< Display humidity in % as additional information. */
+        OTHER_WEATHER_INFO_WIND,        /**< Display windspeed in m/s as additional information. */
+        OTHER_WEATHER_INFO_OFF          /**< Display only general weather information. */
+    };
+
     /**
      * Constructs the plugin.
      *
@@ -83,11 +105,10 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
         m_iconCanvas(),
         m_bitmapWidget(),
         m_textWidget("\\calign?"),
-        m_apiKey(""),
-        m_latitude("48.858"),/* Example data */
-        m_longitude("2.295"),/* Example data */
+        m_sourceId(OPENWEATHER_SOURCE_ONE_CALL_25),
+        m_updatePeriod(UPDATE_PERIOD),
+        m_source(nullptr),
         m_additionalInformation(OTHER_WEATHER_INFO_OFF),
-        m_units("metric"),
         m_configurationFilename(),
         m_client(),
         m_requestTimer(),
@@ -95,7 +116,7 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
         m_mutex(),
         m_isConnectionError(false),
         m_currentTemp("\\calign?"),
-        m_currentWeatherIcon(IMAGE_PATH_STD_ICON),
+        m_currentWeatherIconFullPath(IMAGE_PATH_STD_ICON),
         m_currentUvIndex("\\calign?"),
         m_currentHumidity("\\calign?"),
         m_currentWindspeed("\\calign?"),
@@ -110,19 +131,9 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
         m_taskProxy()
     {
         (void)m_mutex.create();
+        createOpenWeatherSource(m_sourceId); /* Default */
     }
 
-    /**
-     * Enumeration to choose an additional weather information to be displayed.
-     */
-    enum OtherWeatherInformation
-    {
-        OTHER_WEATHER_INFO_UVI = 0,     /**< Display UV Index as additional information. */
-        OTHER_WEATHER_INFO_HUMIDITY,    /**< Display humidity in % as additional information. */
-        OTHER_WEATHER_INFO_WIND,        /**< Display windspeed in m/s as additional information. */
-        OTHER_WEATHER_INFO_OFF          /**< Display only general weather information. */
-    };
-
     /**
      * Destroys the plugin.
      */
@@ -138,6 +149,7 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
         m_client.end();
         
         clearQueue();
+        destroyOpenWeatherSource();
         
         m_mutex.destroy();
     }
@@ -152,7 +164,7 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new OpenWeatherPlugin(name, uid);
+        return new(std::nothrow)OpenWeatherPlugin(name, uid);
     }
 
     /**
@@ -230,7 +242,7 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
@@ -457,35 +469,34 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
      */
     static const uint32_t   CFG_RELOAD_PERIOD   = SIMPLE_TIMER_SECONDS(30U);
     
-    Fonts::FontType             m_fontType;                 /**< Font type which shall be used if there is no conflict with the layout. */
-    WidgetGroup                 m_textCanvas;               /**< Canvas used for the text widget. */
-    WidgetGroup                 m_iconCanvas;               /**< Canvas used for the bitmap widget. */
-    BitmapWidget                m_bitmapWidget;             /**< Bitmap widget, used to show the icon. */
-    TextWidget                  m_textWidget;               /**< Text widget, used for showing the text. */
-    String                      m_apiKey;                   /**< OpenWeather API Key */
-    String                      m_latitude;                 /**< The latitude. */
-    String                      m_longitude;                /**< The longitude. */
-    OtherWeatherInformation     m_additionalInformation;    /**< The configured additional weather information. */
-    String                      m_units;                    /**< The units. */
-    String                      m_configurationFilename;    /**< String used for specifying the configuration filename. */
-    AsyncHttpClient             m_client;                   /**< Asynchronous HTTP client. */
-    SimpleTimer                 m_requestTimer;             /**< Timer used for cyclic request of new data. */
-    SimpleTimer                 m_updateContentTimer;       /**< Timer used for duration ticks in [s]. */
-    mutable MutexRecursive      m_mutex;                    /**< Mutex to protect against concurrent access. */
-    bool                        m_isConnectionError;        /**< Is connection error happened? */
-    String                      m_currentTemp;              /**< The current temperature. */
-    String                      m_currentWeatherIcon;       /**< The current weather condition icon. */
-    String                      m_currentUvIndex;           /**< The current UV index. */
-    String                      m_currentHumidity;          /**< The current humidity. */
-    String                      m_currentWindspeed;         /**< The current wind speed. */
-    bool                        m_hasWeatherIconChanged;    /**< Has weather icon changed? If yes, it will be updated otherwise skipped to not disturb running animations. */
-    const ISlotPlugin*          m_slotInterf;               /**< Slot interface */
-    uint8_t                     m_durationCounter;          /**< Variable to count the Plugin duration in DURATION_TICK_PERIOD ticks. */
-    bool                        m_isUpdateAvailable;        /**< Flag to indicate an updated date value. */
-    SimpleTimer                 m_cfgReloadTimer;           /**< Timer is used to cyclic reload the configuration from persistent memory. */
-    bool                        m_storeConfigReq;           /**< Is requested to store the configuration in persistent memory? */
-    bool                        m_reloadConfigReq;          /**< Is requested to reload the configuration from persistent memory? */
-    bool                        m_hasTopicChanged;          /**< Has the topic content changed? */
+    Fonts::FontType             m_fontType;                     /**< Font type which shall be used if there is no conflict with the layout. */
+    WidgetGroup                 m_textCanvas;                   /**< Canvas used for the text widget. */
+    WidgetGroup                 m_iconCanvas;                   /**< Canvas used for the bitmap widget. */
+    BitmapWidget                m_bitmapWidget;                 /**< Bitmap widget, used to show the icon. */
+    TextWidget                  m_textWidget;                   /**< Text widget, used for showing the text. */
+    OpenWeatherSource           m_sourceId;                     /**< OpenWeather source id. */
+    uint32_t                    m_updatePeriod;                 /**< Period in ms for requesting data from server. This is used in case the last request to the server was successful. */
+    IOpenWeatherSource*         m_source;                       /**< OpenWeather source to use to retrieve weather information. */
+    OtherWeatherInformation     m_additionalInformation;        /**< The configured additional weather information. */
+    String                      m_configurationFilename;        /**< String used for specifying the configuration filename. */
+    AsyncHttpClient             m_client;                       /**< Asynchronous HTTP client. */
+    SimpleTimer                 m_requestTimer;                 /**< Timer used for cyclic request of new data. */
+    SimpleTimer                 m_updateContentTimer;           /**< Timer used for duration ticks in [s]. */
+    mutable MutexRecursive      m_mutex;                        /**< Mutex to protect against concurrent access. */
+    bool                        m_isConnectionError;            /**< Is connection error happened? */
+    String                      m_currentTemp;                  /**< The current temperature. */
+    String                      m_currentWeatherIconFullPath;   /**< The current weather condition icon full path. */
+    String                      m_currentUvIndex;               /**< The current UV index. */
+    String                      m_currentHumidity;              /**< The current humidity. */
+    String                      m_currentWindspeed;             /**< The current wind speed. */
+    bool                        m_hasWeatherIconChanged;        /**< Has weather icon changed? If yes, it will be updated otherwise skipped to not disturb running animations. */
+    const ISlotPlugin*          m_slotInterf;                   /**< Slot interface */
+    uint8_t                     m_durationCounter;              /**< Variable to count the Plugin duration in DURATION_TICK_PERIOD ticks. */
+    bool                        m_isUpdateAvailable;            /**< Flag to indicate an updated date value. */
+    SimpleTimer                 m_cfgReloadTimer;               /**< Timer is used to cyclic reload the configuration from persistent memory. */
+    bool                        m_storeConfigReq;               /**< Is requested to store the configuration in persistent memory? */
+    bool                        m_reloadConfigReq;              /**< Is requested to reload the configuration from persistent memory? */
+    bool                        m_hasTopicChanged;              /**< Has the topic content changed? */
 
     /**
      * Defines the message types, which are necessary for HTTP client/server handling.
@@ -521,6 +532,18 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
      */
     TaskProxy<Msg, 2U, 0U> m_taskProxy;
 
+    /**
+     * Create OpenWeather source according to id.
+     * 
+     * @param[in] id    OpenWeather source id
+     */
+    void createOpenWeatherSource(OpenWeatherSource id);
+
+    /**
+     * Destroy OpenWeatherSource.
+     */
+    void destroyOpenWeatherSource();
+
     /**
      * Request to store configuration to persistent memory.
      */
@@ -566,12 +589,25 @@ class OpenWeatherPlugin : public Plugin, private PluginConfigFsHandler
      */
     void initHttpClient(void);
 
+    /**
+     * Handle asynchronous web response from the server.
+     * This will be called in LwIP context! Don't modify any member here directly!
+     * 
+     * @param[in] jsonDoc   Web response as JSON document
+     */
+    void handleAsyncWebResponse(const HttpResponse& rsp);
+
     /**
      * Handle a web response from the server.
      * 
      * @param[in] jsonDoc   Web response as JSON document
      */
-    void handleWebResponse(DynamicJsonDocument& jsonDoc);
+    void handleWebResponse(const DynamicJsonDocument& jsonDoc);
+
+    /**
+     * Prepares the data to show from the OpenWeather source data.
+     */
+    void prepareDataToShow();
 
     /**
      * Clear the task proxy queue.
diff --git a/lib/OpenWeatherPlugin/web/OpenWeatherPlugin.html b/lib/OpenWeatherPlugin/web/OpenWeatherPlugin.html
index 7cf62a51..282817f6 100644
--- a/lib/OpenWeatherPlugin/web/OpenWeatherPlugin.html
+++ b/lib/OpenWeatherPlugin/web/OpenWeatherPlugin.html
@@ -44,11 +44,13 @@ <h3 class="mt-1">Get the OpenWeather related configuration .</h3>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
                 </ul>
                 <h3 class="mt-1">Set OpenWeather related configuration.</h3>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/weather?apiKey=&lt;API-KEY&gt;&latitude=&lt;LATITUDE&gt;&longitude=&lt;LONGITUDE&gt;&other=&lt;OTHER&gt;&units=&lt;UNITS&gt;</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/weather?apiKey=&lt;API-KEY&gt;&latitude=&lt;LATITUDE&gt;&longitude=&lt;LONGITUDE&gt;&other=&lt;OTHER&gt;&units=&lt;UNITS&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/weather?sourceId=&lt;SOURCE-ID&gt;&updatePeriod=&lt;UPDATE-PERIOD&gt;&apiKey=&lt;API-KEY&gt;&latitude=&lt;LATITUDE&gt;&longitude=&lt;LONGITUDE&gt;&other=&lt;OTHER&gt;&units=&lt;UNITS&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/weather?sourceId=&lt;SOURCE-ID&gt;&updatePeriod=&lt;UPDATE-PERIOD&gt;&apiKey=&lt;API-KEY&gt;&latitude=&lt;LATITUDE&gt;&longitude=&lt;LONGITUDE&gt;&other=&lt;OTHER&gt;&units=&lt;UNITS&gt;</code></pre>
                 <ul>
                     <li>PLUGIN-UID: The plugin unique id.</li>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
+                    <li>SOURCE-ID: The OpenWeather source id - 0: Current weather / 1: One-Call API v2.5 / 2: One-Call API v3.0</li>
+                    <li>UPDATE-PERIOD: The period in minutes for updating the weather information. Please consider your limits, see <a href="https://m.openweathermap.org/price" target="_blank">professional collections price table</a>.</li>
                     <li>API-KEY: The OpenWeather api key.</li>
                     <li>LATITUDE: The latitude of the location.</li>
                     <li>LONGITUDE: The longitude of the location.</li>
@@ -61,19 +63,31 @@ <h3 class="mt-2">Configuration</h3>
                     <div class="form-group">
                         <label for="pluginUid">Plugin UID:</label>
                         <select id="pluginUid" size="1" onChange="getConfig(pluginUid.options[pluginUid.selectedIndex].value)">
-                        </select>    
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="sourceId">OpenWeather source id:</label>
+                        <select id="sourceId" size="1">
+                            <option value="0">Current weather</option>
+                            <option value="1">One-Call API v2.5</option>
+                            <option value="2">One-Call API v3.0</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="updatePeriod">Update period in minutes:</label>
+                        <input type="number" id="updatePeriod" name="updatePeriod" value="10" min="1" max="120" />
                     </div>
                     <div class="form-group">
                         <label for="apiKey">API key:</label>
-                        <input type="text" id="apiKey" name="apiKey" value="Your API key" />    
+                        <input type="text" id="apiKey" name="apiKey" value="Your API key" />
                     </div>
                     <div class="form-group">
                         <label for="latitude">Latitude:</label>
-                        <input type="text" id="latitude" name="latitude" value="The latitude" />    
+                        <input type="text" id="latitude" name="latitude" value="The latitude" />
                     </div>
                     <div class="form-group">
                         <label for="longitude">Longitude:</label>
-                        <input type="text" id="longitude" name="longitude" value="The longitude" />    
+                        <input type="text" id="longitude" name="longitude" value="The longitude" />
                     </div>
                     <div class="form-group">
                         <label for="other">Additional information:</label>
@@ -82,15 +96,15 @@ <h3 class="mt-2">Configuration</h3>
                             <option value="1">humidity</option>
                             <option value="2">windspeed</option>
                             <option value="3">off</option>
-                        </select>    
+                        </select>
                     </div>
                     <div class="form-group">
                         <label for="units">Units:</label>
                         <select id="units" size="1">
                             <option value="metric">metric</option>
                             <option value="imperial">imperial</option>
-                        </select>    
-                    </div>                    
+                        </select>
+                    </div>
                     <input name="submit" type="submit" value="Update"/>
                 </form>
             </div>
@@ -120,15 +134,15 @@ <h3 class="mt-2">Configuration</h3>
 
             var pluginName  = "OpenWeatherPlugin";
             var restClient  = new pixelix.rest.Client();
-    
+
             function enableUI() {
                 utils.enableForm("myForm", true);
             }
-    
+
             function disableUI() {
                 utils.enableForm("myForm", false);
             }
-    
+
             function getPluginInstances() {
                 return restClient.getPluginInstances().then(function(rsp) {
                     var slotIndex   = 0;
@@ -141,7 +155,7 @@ <h3 class="mt-2">Configuration</h3>
 
                             optionText = rsp.data.slots[slotIndex].uid;
                             optionText += " (";
-                            
+
                             if (0 === rsp.data.slots[slotIndex].alias.length) {
                                 optionText += "-"
                             } else {
@@ -153,7 +167,7 @@ <h3 class="mt-2">Configuration</h3>
                             $option = $("<option>")
                                         .attr("value", "" + rsp.data.slots[slotIndex].uid)
                                         .text(optionText);
-                            
+
                             $("#pluginUid").append($option);
 
                             ++cnt;
@@ -166,7 +180,7 @@ <h3 class="mt-2">Configuration</h3>
                     return Promise.resolve(0);
                 });
             };
-    
+
             function getConfig(pluginUid) {
                 disableUI();
                 return utils.makeRequest({
@@ -174,6 +188,8 @@ <h3 class="mt-2">Configuration</h3>
                     url: "/rest/api/v1/display/uid/" + pluginUid + "/weather",
                     isJsonResponse: true
                 }).then(function(rsp) {
+                    $("#sourceId").val(rsp.data.sourceId);
+                    $("#updatePeriod").val(rsp.data.updatePeriod);
                     $("#apiKey").val(rsp.data.apiKey);
                     $("#latitude").val(rsp.data.latitude);
                     $("#longitude").val(rsp.data.longitude);
@@ -185,15 +201,17 @@ <h3 class="mt-2">Configuration</h3>
                     enableUI();
                 });
             }
-    
+
             function setConfig(pluginUid) {
                 disableUI();
-    
+
                 return utils.makeRequest({
                     method: "POST",
                     url: "/rest/api/v1/display/uid/" + pluginUid + "/weather",
                     isJsonResponse: true,
                     parameter: {
+                        sourceId: $("#sourceId").val(),
+                        updatePeriod: $("#updatePeriod").val(),
                         apiKey: $("#apiKey").val(),
                         latitude: $("#latitude").val(),
                         longitude: $("#longitude").val(),
@@ -212,18 +230,18 @@ <h3 class="mt-2">Configuration</h3>
             $(document).ready(function() {
                 menu.addSubMenu(menu.data, "Plugins", pluginSubMenu);
                 menu.create("menu", menu.data);
-                
+
                 utils.injectOrigin("injectOrigin", "{{ORIGIN}}");
 
                 /* Disable all forms, until the plugin instances are loaded. */
                 disableUI();
-    
+
                 /* Load all plugin instances. */
                 getPluginInstances().then(function(cnt) {
                     var select = document.getElementById("pluginUid");
-    
+
                     if (0 < cnt) {
-    
+
                         return getConfig(
                             select.options[select.selectedIndex].value
                         );
diff --git a/lib/Os/library.json b/lib/Os/library.json
new file mode 100644
index 00000000..29d77108
--- /dev/null
+++ b/lib/Os/library.json
@@ -0,0 +1,15 @@
+{
+    "name": "Os",
+    "version": "0.1.0",
+    "description": "....",
+    "authors": [{
+        "name": "Andreas Merkle",
+        "email": "web@blue-andi.de",
+        "url": "https://github.com/BlueAndi",
+        "maintainer": true
+    }],
+    "license": "MIT",
+    "dependencies": [],
+    "frameworks": "*",
+    "platforms": "*"
+}
diff --git a/lib/Os/CriticalSection.hpp b/lib/Os/src/CriticalSection.hpp
similarity index 100%
rename from lib/Os/CriticalSection.hpp
rename to lib/Os/src/CriticalSection.hpp
diff --git a/lib/Os/Mutex.hpp b/lib/Os/src/Mutex.hpp
similarity index 100%
rename from lib/Os/Mutex.hpp
rename to lib/Os/src/Mutex.hpp
diff --git a/lib/Os/Queue.hpp b/lib/Os/src/Queue.hpp
similarity index 100%
rename from lib/Os/Queue.hpp
rename to lib/Os/src/Queue.hpp
diff --git a/lib/Plugin/IPluginMaintenance.hpp b/lib/Plugin/src/IPluginMaintenance.hpp
similarity index 96%
rename from lib/Plugin/IPluginMaintenance.hpp
rename to lib/Plugin/src/IPluginMaintenance.hpp
index 42524a3b..de065fcb 100644
--- a/lib/Plugin/IPluginMaintenance.hpp
+++ b/lib/Plugin/src/IPluginMaintenance.hpp
@@ -173,7 +173,7 @@ class IPluginMaintenance
      * 
      * @return If successful it will return true otherwise false.
      */
-    virtual bool setTopic(const String& topic, const JsonObject& value) = 0;
+    virtual bool setTopic(const String& topic, const JsonObjectConst& value) = 0;
 
     /**
      * Has the topic content changed since last time?
diff --git a/lib/Plugin/ISlotPlugin.hpp b/lib/Plugin/src/ISlotPlugin.hpp
similarity index 100%
rename from lib/Plugin/ISlotPlugin.hpp
rename to lib/Plugin/src/ISlotPlugin.hpp
diff --git a/lib/Plugin/Plugin.hpp b/lib/Plugin/src/Plugin.hpp
similarity index 96%
rename from lib/Plugin/Plugin.hpp
rename to lib/Plugin/src/Plugin.hpp
index f9e89a77..15696c4d 100644
--- a/lib/Plugin/Plugin.hpp
+++ b/lib/Plugin/src/Plugin.hpp
@@ -199,7 +199,7 @@ class Plugin : public IPluginMaintenance
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) override
+    bool setTopic(const String& topic, const JsonObjectConst& value) override
     {
         PLUGIN_NOT_USED(topic);
         PLUGIN_NOT_USED(value);
diff --git a/lib/RainbowPlugin/src/RainbowPlugin.h b/lib/RainbowPlugin/src/RainbowPlugin.h
index 8ccbd636..b9d94f1e 100644
--- a/lib/RainbowPlugin/src/RainbowPlugin.h
+++ b/lib/RainbowPlugin/src/RainbowPlugin.h
@@ -90,7 +90,7 @@ class RainbowPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new RainbowPlugin(name, uid);
+        return new(std::nothrow)RainbowPlugin(name, uid);
     }
 
     /**
diff --git a/lib/RestApiTopicHandler/src/RestApiTopicHandler.cpp b/lib/RestApiTopicHandler/src/RestApiTopicHandler.cpp
index 141c94bf..16c62c6c 100644
--- a/lib/RestApiTopicHandler/src/RestApiTopicHandler.cpp
+++ b/lib/RestApiTopicHandler/src/RestApiTopicHandler.cpp
@@ -66,56 +66,80 @@
  * Public Methods
  *****************************************************************************/
 
-void RestApiTopicHandler::registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra)
+void RestApiTopicHandler::registerTopic(const String& deviceId, const String& entityId, const String& topic, JsonObjectConst& extra, GetTopicFunc getTopicFunc, SetTopicFunc setTopicFunc, UploadReqFunc uploadReqFunc)
 {
-    if ((nullptr != plugin) &&
+    if ((false == deviceId.isEmpty()) &&
+        (false == entityId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
-        String baseUriByUid = getBaseUriByUid(plugin->getUID());
+        TopicMetaData* topicMetaData = new(std::nothrow) TopicMetaData();
 
-        registerTopic(plugin, topic, access, extra, baseUriByUid);
-
-        if (false == plugin->getAlias().isEmpty())
+        if (nullptr != topicMetaData)
         {
-            String baseUriByAlias = getBaseUriByAlias(plugin->getAlias());
+            String                      baseUri     = getBaseUri(entityId);
+            ArRequestHandlerFunction    onRequest   =
+                                            [this, topicMetaData](AsyncWebServerRequest *request)
+                                            {
+                                                this->webReqHandler(request, topicMetaData);
+                                            };
+            ArUploadHandlerFunction     onUpload    =
+                                            [this, topicMetaData](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final)
+                                            {
+                                                this->uploadHandler(request, filename, index, data, len, final, topicMetaData);
+                                            };
+
+            topicMetaData->deviceId         = deviceId;
+            topicMetaData->entityId         = entityId;
+            topicMetaData->topic            = topic;
+            topicMetaData->getTopicFunc     = getTopicFunc;
+            topicMetaData->setTopicFunc     = setTopicFunc;
+            topicMetaData->uploadReqFunc    = uploadReqFunc;
+            topicMetaData->uri              = baseUri + topic;
+            topicMetaData->webHandler       = &MyWebServer::getInstance().on(topicMetaData->uri.c_str(), HTTP_ANY, onRequest, onUpload);
+
+            UTIL_NOT_USED(extra);
 
-            registerTopic(plugin, topic, access, extra, baseUriByAlias);
+            LOG_INFO("Register: %s", topicMetaData->uri.c_str());
+
+            m_listOfTopicMetaData.push_back(topicMetaData);
         }
     }
 }
 
-void RestApiTopicHandler::unregisterTopic(IPluginMaintenance* plugin, const String& topic)
+void RestApiTopicHandler::unregisterTopic(const String& deviceId, const String& entityId, const String& topic)
 {
-    if ((nullptr != plugin) &&
+    if ((false == deviceId.isEmpty()) &&
+        (false == entityId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
-        PluginTopicList::iterator pluginTopicListIt = m_pluginTopicList.begin();
+        ListOfTopicMetaData::iterator topicMetaDataIt = m_listOfTopicMetaData.begin();
 
-        while(m_pluginTopicList.end() != pluginTopicListIt)
+        while(m_listOfTopicMetaData.end() != topicMetaDataIt)
         {
-            PluginTopic* pluginTopic = *pluginTopicListIt;
+            TopicMetaData* topicMetaData = *topicMetaDataIt;
 
-            if ((nullptr != pluginTopic) &&
-                (plugin == pluginTopic->plugin) &&
-                (topic == pluginTopic->topic))
+            if ((nullptr != topicMetaData) &&
+                (deviceId == topicMetaData->deviceId) &&
+                (entityId == topicMetaData->entityId) &&
+                (topic == topicMetaData->topic))
             {
-                if (false == MyWebServer::getInstance().removeHandler(pluginTopic->webHandler))
+                if (false == MyWebServer::getInstance().removeHandler(topicMetaData->webHandler))
                 {
-                    LOG_WARNING("[%s][%u] Failed to unregister: %s", pluginTopic->plugin->getName(), pluginTopic->plugin->getUID(), pluginTopic->uri.c_str());
+                    LOG_WARNING("Failed to unregister: %s", topicMetaData->uri.c_str());
                 }
                 else
                 {
-                    LOG_INFO("[%s][%u] Unregistered: %s", pluginTopic->plugin->getName(), pluginTopic->plugin->getUID(), pluginTopic->uri.c_str());
+                    LOG_INFO("Unregister: %s", topicMetaData->uri.c_str());
                 }
 
-                pluginTopicListIt = m_pluginTopicList.erase(pluginTopicListIt);
+                topicMetaDataIt = m_listOfTopicMetaData.erase(topicMetaDataIt);
                 
-                delete pluginTopic;
-                pluginTopic = nullptr;
+                delete topicMetaData;
+                topicMetaData = nullptr;
             }
             else
             {
-                ++pluginTopicListIt;
+                ++topicMetaDataIt;
             }
         }
     }
@@ -129,83 +153,37 @@ void RestApiTopicHandler::unregisterTopic(IPluginMaintenance* plugin, const Stri
  * Private Methods
  *****************************************************************************/
 
-String RestApiTopicHandler::getBaseUriByUid(uint16_t uid)
-{
-    String  baseUri = RestApi::BASE_URI;
-    baseUri += "/display";
-    baseUri += "/uid/";
-    baseUri += uid;
-
-    return baseUri;
-}
-
-String RestApiTopicHandler::getBaseUriByAlias(const String& alias)
+String RestApiTopicHandler::getBaseUri(const String& entityId)
 {
     String  baseUri = RestApi::BASE_URI;
-    baseUri += "/display";
-    baseUri += "/alias/";
-    baseUri += alias;
+    baseUri += "/";
+    baseUri += entityId;
 
     return baseUri;
 }
 
-void RestApiTopicHandler::registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra, const String& baseUri)
-{
-    if (nullptr != plugin)
-    {
-        PluginTopic* pluginTopic = new(std::nothrow) PluginTopic();
-
-        if (nullptr != pluginTopic)
-        {
-            pluginTopic->plugin     = plugin;
-            pluginTopic->topic      = topic;
-            pluginTopic->access     = access;
-            pluginTopic->uri        = baseUri + topic;
-            pluginTopic->webHandler = &MyWebServer::getInstance().on(
-                                        pluginTopic->uri.c_str(),
-                                        HTTP_ANY,
-                                        [this, pluginTopic](AsyncWebServerRequest *request)
-                                        {
-                                            this->webReqHandler(request, pluginTopic);
-                                        },
-                                        [this, pluginTopic](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final)
-                                        {
-                                            this->uploadHandler(request, filename, index, data, len, final, pluginTopic);
-                                        });
-
-            UTIL_NOT_USED(extra);
-
-            m_pluginTopicList.push_back(pluginTopic);
-
-            LOG_INFO("[%s][%u] Registered: %s", pluginTopic->plugin->getName(), pluginTopic->plugin->getUID(), pluginTopic->uri.c_str());
-        }
-    }
-}
-
-void RestApiTopicHandler::webReqHandler(AsyncWebServerRequest *request, PluginTopic* pluginTopic)
+void RestApiTopicHandler::webReqHandler(AsyncWebServerRequest *request, TopicMetaData* topicMetaData)
 {
     String              content;
-    const size_t        JSON_DOC_SIZE   = 1024U;
+    const size_t        JSON_DOC_SIZE   = 2048U;
     DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
     JsonObject          dataObj         = jsonDoc.createNestedObject("data");
     uint32_t            httpStatusCode  = HttpStatus::STATUS_CODE_OK;
 
     if ((nullptr == request) ||
-        (nullptr == pluginTopic) ||
-        (nullptr == pluginTopic->plugin))
+        (nullptr == topicMetaData))
     {
         return;
     }
 
     if ((HTTP_GET == request->method()) &&
-        (
-            (ACCESS_READ_ONLY == pluginTopic->access) ||
-            (ACCESS_READ_WRITE == pluginTopic->access)
-        ))
+        (nullptr != topicMetaData->getTopicFunc))
     {
         /* Topic data will be transported in the HTTP body as JSON. */
-        if (false == pluginTopic->plugin->getTopic(pluginTopic->topic, dataObj))
+        if (false == topicMetaData->getTopicFunc(topicMetaData->topic, dataObj))
         {
+            LOG_WARNING("Topic \"%s\" not supported by %s.", topicMetaData->topic.c_str(), topicMetaData->entityId.c_str());
+
             RestUtil::prepareRspError(jsonDoc, "Requested topic not supported.");
 
             jsonDoc.remove("data");
@@ -218,34 +196,35 @@ void RestApiTopicHandler::webReqHandler(AsyncWebServerRequest *request, PluginTo
             httpStatusCode      = HttpStatus::STATUS_CODE_OK;
         }
     }
-    else if ((HTTP_POST == request->method())&&
-        (
-            (ACCESS_READ_WRITE == pluginTopic->access) ||
-            (ACCESS_WRITE_ONLY == pluginTopic->access)
-        ))
+    else if ((HTTP_POST == request->method()) &&
+             (nullptr != topicMetaData->setTopicFunc))
     {
         DynamicJsonDocument jsonDocPar(JSON_DOC_SIZE);
+        JsonObjectConst     jsonValue;
         
         /* Topic data is in the HTTP parameters and needs to be converted to JSON. */
         par2Json(jsonDocPar, request);
 
         /* Add uploaded file */
-        if ((false == pluginTopic->isUploadError) &&
-            (false == pluginTopic->fullPath.isEmpty()))
+        if ((false == topicMetaData->isUploadError) &&
+            (false == topicMetaData->fullPath.isEmpty()))
         {
-            jsonDocPar["fullPath"] = pluginTopic->fullPath;
+            jsonDocPar["fullPath"] = topicMetaData->fullPath;
         }
 
-        if (false == pluginTopic->plugin->setTopic(pluginTopic->topic, jsonDocPar.as<JsonObject>()))
+        jsonValue = jsonDocPar.as<JsonObjectConst>(); /* Assign after par2Json conversion! Otherwise there will be a empty object. */
+        if (false == topicMetaData->setTopicFunc(topicMetaData->topic, jsonValue))
         {
+            LOG_WARNING("Topic \"%s\" not supported by %s or invalid data.", topicMetaData->topic.c_str(), topicMetaData->entityId.c_str());
+
             RestUtil::prepareRspError(jsonDoc, "Requested topic not supported or invalid data.");
 
             jsonDoc.remove("data");
 
             /* If a file is available, it will be removed now. */
-            if (false == pluginTopic->fullPath.isEmpty())
+            if (false == topicMetaData->fullPath.isEmpty())
             {
-                (void)FILESYSTEM.remove(pluginTopic->fullPath);
+                (void)FILESYSTEM.remove(topicMetaData->fullPath);
             }
 
             httpStatusCode = HttpStatus::STATUS_CODE_NOT_FOUND;
@@ -268,7 +247,7 @@ void RestApiTopicHandler::webReqHandler(AsyncWebServerRequest *request, PluginTo
     RestUtil::sendJsonRsp(request, jsonDoc, httpStatusCode);
 }
 
-void RestApiTopicHandler::uploadHandler(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final, PluginTopic* pluginTopic)
+void RestApiTopicHandler::uploadHandler(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final, TopicMetaData* topicMetaData)
 {
     /* Begin of upload? */
     if (0 == index)
@@ -291,48 +270,49 @@ void RestApiTopicHandler::uploadHandler(AsyncWebServerRequest *request, const St
         if (fileSystemSpace <= fileSize)
         {
             LOG_WARNING("Upload of %s aborted. Not enough space.", filename.c_str());
-            pluginTopic->isUploadError = true;
-            pluginTopic->fullPath.clear();
+            topicMetaData->isUploadError = true;
+            topicMetaData->fullPath.clear();
         }
         else
         {
             LOG_INFO("Upload of %s (%d bytes) starts.", filename.c_str(), fileSize);
-            pluginTopic->isUploadError = false;
-            pluginTopic->fullPath.clear();
+            topicMetaData->isUploadError = false;
+            topicMetaData->fullPath.clear();
 
             /* Ask plugin, whether the upload is allowed or not. */
-            if (false == pluginTopic->plugin->isUploadAccepted(pluginTopic->topic, filename, pluginTopic->fullPath))
+            if ((nullptr == topicMetaData->uploadReqFunc) ||
+                (false == topicMetaData->uploadReqFunc(topicMetaData->topic, filename, topicMetaData->fullPath)))
             {
-                LOG_WARNING("[%s][%u] Upload not supported.", pluginTopic->plugin->getName(), pluginTopic->plugin->getUID());
-                pluginTopic->isUploadError = true;
-                pluginTopic->fullPath.clear();
+                LOG_WARNING("Upload not supported by %s.", topicMetaData->entityId.c_str());
+                topicMetaData->isUploadError = true;
+                topicMetaData->fullPath.clear();
             }
             else
             {
                 /* Create a new file and overwrite a existing one. */
-                pluginTopic->fd = FILESYSTEM.open(pluginTopic->fullPath, "w");
+                request->_tempFile = FILESYSTEM.open(topicMetaData->fullPath, "w");
 
-                if (false == pluginTopic->fd)
+                if (false == request->_tempFile)
                 {
-                    LOG_ERROR("Couldn't create file: %s", pluginTopic->fullPath.c_str());
-                    pluginTopic->isUploadError = true;
-                    pluginTopic->fullPath.clear();
+                    LOG_ERROR("Couldn't create file: %s", topicMetaData->fullPath.c_str());
+                    topicMetaData->isUploadError = true;
+                    topicMetaData->fullPath.clear();
                 }
             }
         }
     }
 
-    if (false == pluginTopic->isUploadError)
+    if (false == topicMetaData->isUploadError)
     {
         /* If file is open, write data to it. */
-        if (true == pluginTopic->fd)
+        if (true == request->_tempFile)
         {
-            if (len != pluginTopic->fd.write(data, len))
+            if (len != request->_tempFile.write(data, len))
             {
                 LOG_ERROR("Less data written, upload aborted.");
-                pluginTopic->isUploadError = true;
-                pluginTopic->fullPath.clear();
-                pluginTopic->fd.close();
+                topicMetaData->isUploadError = true;
+                topicMetaData->fullPath.clear();
+                request->_tempFile.close();
             }
         }
 
@@ -341,7 +321,7 @@ void RestApiTopicHandler::uploadHandler(AsyncWebServerRequest *request, const St
         {
             LOG_INFO("Upload of %s finished.", filename.c_str());
 
-            pluginTopic->fd.close();
+            request->_tempFile.close();
         }
     }
 }
@@ -413,24 +393,24 @@ void RestApiTopicHandler::par2Json(JsonDocument& jsonDocPar, AsyncWebServerReque
 
 void RestApiTopicHandler::clearPluginTopics()
 {
-    PluginTopicList::iterator pluginTopicListIt = m_pluginTopicList.begin();
+    ListOfTopicMetaData::iterator topicMetaDataIt = m_listOfTopicMetaData.begin();
 
-    while(m_pluginTopicList.end() != pluginTopicListIt)
+    while(m_listOfTopicMetaData.end() != topicMetaDataIt)
     {
-        PluginTopic* pluginTopic = *pluginTopicListIt;
+        TopicMetaData* topicMetaData = *topicMetaDataIt;
 
-        if (nullptr != pluginTopic)
+        if (nullptr != topicMetaData)
         {
-            (void)MyWebServer::getInstance().removeHandler(pluginTopic->webHandler);
+            (void)MyWebServer::getInstance().removeHandler(topicMetaData->webHandler);
 
-            pluginTopicListIt = m_pluginTopicList.erase(pluginTopicListIt);
+            topicMetaDataIt = m_listOfTopicMetaData.erase(topicMetaDataIt);
 
-            delete pluginTopic;
-            pluginTopic = nullptr;
+            delete topicMetaData;
+            topicMetaData = nullptr;
         }
         else
         {
-            ++pluginTopicListIt;
+            ++topicMetaDataIt;
         }
     }
 }
diff --git a/lib/RestApiTopicHandler/src/RestApiTopicHandler.h b/lib/RestApiTopicHandler/src/RestApiTopicHandler.h
index 4c92fb93..643c65aa 100644
--- a/lib/RestApiTopicHandler/src/RestApiTopicHandler.h
+++ b/lib/RestApiTopicHandler/src/RestApiTopicHandler.h
@@ -45,7 +45,6 @@
  *****************************************************************************/
 #include <stdint.h>
 #include <ITopicHandler.h>
-#include <IPluginMaintenance.hpp>
 #include <vector>
 #include <ESPAsyncWebServer.h>
 
@@ -69,7 +68,7 @@ class RestApiTopicHandler : public ITopicHandler
      */
     RestApiTopicHandler() :
         ITopicHandler(),
-        m_pluginTopicList()
+        m_listOfTopicMetaData()
     {
     }
 
@@ -98,22 +97,26 @@ class RestApiTopicHandler : public ITopicHandler
     }
 
     /**
-     * Register a single topic of the given plugin.
+     * Register the topic.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
-     * @param[in] topic     The topic name.
-     * @param[in] access    The topic accessibility.
-     * @param[in] extra     Extra parameters, which depend on the topic handler.
+     * @param[in] deviceId      The device id which represents the physical device.
+     * @param[in] entityId      The entity id which represents the entity of the device.
+     * @param[in] topic         The topic name.
+     * @param[in] extra         Extra parameters, which depend on the topic handler.
+     * @param[in] getTopicFunc  Function to get the topic content.
+     * @param[in] setTopicFunc  Function to set the topic content.
+     * @param[in] uploadReqFunc Function used for requesting whether an file upload is allowed.
      */
-    void registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra) final;
+    void registerTopic(const String& deviceId, const String& entityId, const String& topic, JsonObjectConst& extra, GetTopicFunc getTopicFunc, SetTopicFunc setTopicFunc, UploadReqFunc uploadReqFunc) final;
 
     /**
-     * Unregister the topic of the given plugin.
+     * Unregister the topic.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
      * @param[in] topic     The topic name.
      */
-    void unregisterTopic(IPluginMaintenance* plugin, const String& topic) final;
+    void unregisterTopic(const String& deviceId, const String& entityId, const String& topic) final;
 
     /**
      * Process the topic handler.
@@ -126,105 +129,93 @@ class RestApiTopicHandler : public ITopicHandler
     /**
      * Notify that the topic has changed.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
      * @param[in] topic     The topic name.
      */
-    void notify(IPluginMaintenance* plugin, const String& topic) final
+    void notify(const String& deviceId, const String& entityId, const String& topic) final
     {
         /* Nothing to do. */
+        (void)deviceId;
+        (void)entityId;
+        (void)topic;
     }
 
 private:
 
     /**
-     * Plugin topic relevant data.
+     * Topic meta data.
      */
-    struct PluginTopic
+    struct TopicMetaData
     {
-        IPluginMaintenance*         plugin;         /**< The plugin which provides the topic. */
+        String                      deviceId;       /**< The device id. */
+        String                      entityId;       /**< The entity id. */
         String                      topic;          /**< The plugin topic. */
+        GetTopicFunc                getTopicFunc;   /**< Function used to get topic content. */
+        SetTopicFunc                setTopicFunc;   /**< Function used to set topic content. */
+        UploadReqFunc               uploadReqFunc;  /**< Function used to check whether a file upload is allowed. */
         AsyncCallbackWebHandler*    webHandler;     /**< Webhandler callback, necessary to remove it later again. */
         String                      uri;            /**< URI where the handler is registered. */
         bool                        isUploadError;  /**< If upload error happened, it will be true otherwise false. */
         String                      fullPath;       /**< Full path of uploaded file. If empty, there is no file available. */
-        File                        fd;             /**< Upload file descriptor */
-        Access                      access;         /**< Access to the topic (r, rw, w) */
 
         /**
-         * Initialize the web handler data.
+         * Initialize topic meta data.
          */
-        PluginTopic() :
-            plugin(nullptr),
+        TopicMetaData() :
+            deviceId(),
+            entityId(),
             topic(),
+            getTopicFunc(nullptr),
+            setTopicFunc(nullptr),
+            uploadReqFunc(nullptr),
             webHandler(nullptr),
             uri(),
             isUploadError(false),
-            fullPath(),
-            fd(),
-            access(ACCESS_READ_WRITE)
+            fullPath()
         {
         }
     };
 
     /**
-     * List of plugin object data.
+     * List of topic meta data.
      */
-    typedef std::vector<PluginTopic*> PluginTopicList;
+    typedef std::vector<TopicMetaData*> ListOfTopicMetaData;
 
-    PluginTopicList m_pluginTopicList;  /**< List of plugin topics with webhandler data. */
+    ListOfTopicMetaData m_listOfTopicMetaData;  /**< List of topic meta data. */
 
     RestApiTopicHandler(const RestApiTopicHandler& adapter);
     RestApiTopicHandler& operator=(const RestApiTopicHandler& adapter);
 
     /**
-     * Get plugin REST base URI to identify plugin by UID.
-     *
-     * @param[in] uid   Plugin UID
-     *
-     * @return Plugin REST API base URI
-     */
-    String getBaseUriByUid(uint16_t uid);
-
-    /**
-     * Get plugin REST base URI to identify plugin by alias name.
+     * Get plugin REST base URI to identify plugin.
      *
-     * @param[in] alias Plugin alias name
+     * @param[in] entityId  The entity id which represents the entity of the device.
      *
      * @return Plugin REST API base URI
      */
-    String getBaseUriByAlias(const String& alias);
-
-    /**
-     * Register a single topic of the given plugin.
-     * 
-     * @param[in] plugin    The plugin which provides the topic.
-     * @param[in] topic     The topic name.
-     * @param[in] access    The topic accessibility.
-     * @param[in] extra     Extra parameters, which depend on the topic handler.
-     * @param[in] baseUri   The REST API base URI which to use.
-     */
-    void registerTopic(IPluginMaintenance* plugin, const String& topic, Access access, JsonObjectConst& extra, const String& baseUri);
+    String getBaseUri(const String& entityId);
 
     /**
      * The web request handler handles all incoming HTTP requests for every plugin topic.
      * 
      * @param[in] request       The web request information from the client.
-     * @param[in] pluginTopic   The related plugin topic data.
+     * @param[in] topicMetaData The related topic meta data.
      */
-    void webReqHandler(AsyncWebServerRequest *request, PluginTopic* pluginTopic);
+    void webReqHandler(AsyncWebServerRequest *request, TopicMetaData* topicMetaData);
 
     /**
      * File upload handler.
      *
-     * @param[in] request           HTTP request.
-     * @param[in] filename          Name of the uploaded file.
-     * @param[in] index             Current file offset.
-     * @param[in] data              Next data part of file, starting at offset.
-     * @param[in] len               Data part size in byte.
-     * @param[in] final             Is final packet or not.
-     * @param[in] pluginTopic   The related plugin topic data.
-     */
-    void uploadHandler(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final, PluginTopic* pluginTopic);
+     * @param[in] request       HTTP request.
+     * @param[in] filename      Name of the uploaded file.
+     * @param[in] index         Current file offset.
+     * @param[in] data          Next data part of file, starting at offset.
+     * @param[in] len           Data part size in byte.
+     * @param[in] final         Is final packet or not.
+     * @param[in] topicMetaData The related topic meta data.
+     */
+    void uploadHandler(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final, TopicMetaData* topicMetaData);
 
     /**
      * Convert HTTP parameters to JSON format.
diff --git a/lib/Rtc1307/library.json b/lib/Rtc1307/library.json
new file mode 100644
index 00000000..75f57e05
--- /dev/null
+++ b/lib/Rtc1307/library.json
@@ -0,0 +1,25 @@
+{
+    "name": "Rtc1307",
+    "version": "0.1.0",
+    "description": "....",
+    "authors": [{
+        "name": "Andreas Merkle",
+        "email": "web@blue-andi.de",
+        "url": "https://github.com/BlueAndi",
+        "maintainer": true
+    }],
+    "license": "MIT",
+    "dependencies": [{
+        "name": "IRtc"
+    }, {
+        "owner": "Adafruit",
+        "name": "RTClib",
+        "version": "~2.1.1"
+    }, {
+        "owner": "Adafruit",
+        "name": "Adafruit BusIO",
+        "version": "~1.14.1"
+    }],
+    "frameworks": "*",
+    "platforms": "*"
+}
diff --git a/src/StateMachine/OffState.cpp b/lib/Rtc1307/src/Rtc1307Drv.cpp
similarity index 59%
rename from src/StateMachine/OffState.cpp
rename to lib/Rtc1307/src/Rtc1307Drv.cpp
index b0397db2..56ce2175 100644
--- a/src/StateMachine/OffState.cpp
+++ b/lib/Rtc1307/src/Rtc1307Drv.cpp
@@ -25,29 +25,14 @@
     DESCRIPTION
 *******************************************************************************/
 /**
- * @brief  System state: Off
+ * @brief  RTC 1307 driver
  * @author Andreas Merkle <web@blue-andi.de>
  */
 
 /******************************************************************************
  * Includes
  *****************************************************************************/
-#include "OffState.h"
-#include "RestartState.h"
-#include "DisplayMgr.h"
-#include "Display.h"
-#include "ButtonDrv.h"
-
-#include <Util.h>
-#include <Logging.h>
-#include <Board.h>
-#include <esp_sleep.h>
-#include <esp_wifi.h>
-
-#if 0
-#include <esp_bt.h>
-#include <esp_bt_main.h>
-#endif
+#include "Rtc1307Drv.h"
 
 /******************************************************************************
  * Compiler Switches
@@ -73,75 +58,65 @@
  * Public Methods
  *****************************************************************************/
 
-void OffState::entry(StateMachine& sm)
+bool Rtc1307Drv::begin()
 {
-    UTIL_NOT_USED(sm);
-
-    LOG_INFO("Going in off state.");
-
-    /* Before entering light sleep mode, WiFi and BT must be disabled by using
-     * appropriate calls (esp_bluedroid_disable(), esp_bt_controller_disable(), esp_wifi_stop()).
-     * WiFi and BT connections will not be maintained in deep sleep or light sleep,
-     * even if these functions are not called.
-     */
-    (void)esp_wifi_stop();
-#if 0
-    (void)esp_bluedroid_disable();
-    (void)esp_bt_controller_disable();
-#endif
-
-    /* Stop display manager and clear the display to minimize power consumption.
-     * Additional clearing will show the user that he can stop pressing the "off"
-     * button.
-     */
-    DisplayMgr::getInstance().end();
-    Display::getInstance().clear();
-    Display::getInstance().show();
-
-    /* Wait until the LED matrix is updated to avoid artifacts on the
-     * display.
-     */
-    while(false == Display::getInstance().isReady())
-    {
-        /* Just wait and give other tasks a chance. */
-        delay(1U);
-    }
-}
-
-void OffState::process(StateMachine& sm)
-{
-    UTIL_NOT_USED(sm);
+    bool isSuccess = false;
 
-    /* Prepare wakeup sources.
-     * Use all available buttons as wakeup sources.
-     */
-    if (true == ButtonDrv::getInstance().enableWakeUpSources())
+    if (false == m_isInitialized)
     {
-        esp_sleep_wakeup_cause_t wakeupCause = ESP_SLEEP_WAKEUP_UNDEFINED;
+        isSuccess = m_rtc.begin();
 
-        while(ESP_SLEEP_WAKEUP_GPIO != wakeupCause)
+        if (true == isSuccess)
         {
-            /* Enter sleep mode. The function will return by wakeup. */
-            if (ESP_OK != esp_light_sleep_start())
+            /* If RTC doesn't run, the RTC will be set. */
+            if (false == m_rtc.isrunning())
             {
-                LOG_ERROR("Enter light sleep mode not possible.");
-            }
-            else
-            {
-                wakeupCause = esp_sleep_get_wakeup_cause();
+                /* Set explicit to date & time this version of Pixelix was compiled. */
+                m_rtc.adjust(DateTime(F(__DATE__), F(__TIME__)));
             }
         }
 
-        /* Restart the device. */
-        sm.setState(RestartState::getInstance());
+        m_isInitialized = isSuccess;
     }
+
+    return isSuccess;
 }
 
-void OffState::exit(StateMachine& sm)
+bool Rtc1307Drv::getTime(struct tm& timeInfo)
 {
-    UTIL_NOT_USED(sm);
+    bool isSuccess = false;
+
+    if (true == m_isInitialized)
+    {
+        DateTime dateTime = m_rtc.now();
+
+        memset(&timeInfo, 0, sizeof(struct tm));
 
-    /* Nothing to do. */
+        timeInfo.tm_sec     = dateTime.second();
+        timeInfo.tm_min     = dateTime.minute();
+        timeInfo.tm_hour    = dateTime.hour();
+        timeInfo.tm_mday    = dateTime.day();
+        timeInfo.tm_mon     = dateTime.month() - 1;
+        timeInfo.tm_year    = dateTime.year() - 1900;
+    }
+
+    return isSuccess;
+}
+
+void Rtc1307Drv::setTime(const struct tm& timeInfo)
+{
+    if (true == m_isInitialized)
+    {
+        DateTime    time(
+            timeInfo.tm_year + 1900,
+            timeInfo.tm_mon + 1,
+            timeInfo.tm_mday,
+            timeInfo.tm_hour,
+            timeInfo.tm_min,
+            timeInfo.tm_sec
+        );
+        m_rtc.adjust(time);
+    }
 }
 
 /******************************************************************************
diff --git a/lib/Rtc1307/src/Rtc1307Drv.h b/lib/Rtc1307/src/Rtc1307Drv.h
new file mode 100644
index 00000000..96ce07b6
--- /dev/null
+++ b/lib/Rtc1307/src/Rtc1307Drv.h
@@ -0,0 +1,124 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  RTC 1307 driver
+ * @author Andreas Merkle <web@blue-andi.de>
+ *
+ * @addtogroup Hal
+ *
+ * @{
+ */
+
+#ifndef RTC1307_DRV_H
+#define RTC1307_DRV_H
+
+/******************************************************************************
+ * Compile Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "Arduino.h"
+#include <IRtc.h>
+
+#include <RTClib.h>
+#include <SimpleTimer.hpp>
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and Classes
+ *****************************************************************************/
+
+/**
+ * The RTC 1307 driver provides the abstract RTC interface and realizes
+ * its functionality.
+ */
+class Rtc1307Drv : public IRtc
+{
+public:
+
+    /**
+     * Constructs the driver.
+     */
+    Rtc1307Drv() :
+        IRtc(),
+        m_isInitialized(false),
+        m_rtc()
+    {
+    }
+
+    /**
+     * Destroys the driver.
+     */
+    ~Rtc1307Drv()
+    {
+    }
+
+    /**
+     * Checks for the RTC and if available, it will be initialized
+     * and started.
+     * 
+     * @return If no RTC is available, it will return false.
+     */
+    bool begin() final;
+
+    /**
+     * Get the time from the RTC.
+     * 
+     * @param[out] timeInfo Time destination
+     * 
+     * @return If time info is updated, it will return true otherwise false.
+     */
+    bool getTime(struct tm& timeInfo) final;
+
+    /**
+     * Set the RTC by time.
+     * 
+     * @param[in] timeInfo Time source
+     */
+    void setTime(const struct tm& timeInfo) final;
+
+private:
+
+    bool        m_isInitialized;    /**< Already initialized or not. */
+    RTC_DS1307  m_rtc;              /**< Specific RTC driver. */
+
+    Rtc1307Drv(const Rtc1307Drv& drv);
+    Rtc1307Drv& operator=(const Rtc1307Drv& drv);
+};
+
+/******************************************************************************
+ * Functions
+ *****************************************************************************/
+
+#endif  /* RTC1307_DRV_H */
+
+/** @} */
\ No newline at end of file
diff --git a/lib/SensorPlugin/src/SensorPlugin.cpp b/lib/SensorPlugin/src/SensorPlugin.cpp
index 0b521fb0..057b1158 100644
--- a/lib/SensorPlugin/src/SensorPlugin.cpp
+++ b/lib/SensorPlugin/src/SensorPlugin.cpp
@@ -84,7 +84,7 @@ bool SensorPlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool SensorPlugin::setTopic(const String& topic, const JsonObject& value)
+bool SensorPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
diff --git a/lib/SensorPlugin/src/SensorPlugin.h b/lib/SensorPlugin/src/SensorPlugin.h
index 569f4b1e..0a1142b0 100644
--- a/lib/SensorPlugin/src/SensorPlugin.h
+++ b/lib/SensorPlugin/src/SensorPlugin.h
@@ -133,7 +133,7 @@ class SensorPlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new SensorPlugin(name, uid);
+        return new(std::nothrow)SensorPlugin(name, uid);
     }
 
     /**
@@ -186,7 +186,7 @@ class SensorPlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
diff --git a/lib/Sensors/src/SensorLdr.cpp b/lib/Sensors/src/SensorLdr.cpp
index 49b284a8..8a4c441c 100644
--- a/lib/Sensors/src/SensorLdr.cpp
+++ b/lib/Sensors/src/SensorLdr.cpp
@@ -110,12 +110,12 @@ typedef struct
  */
 static const Ldr LDR_CONSTANTS[] =
 {
-    { "GL5516",     562500000.0f,       -2.0f       },
-    { "GL5528",     91233029.9336f,     -1.6667f    },
-    { "GL5537-1",   213746993.3346f,    -1.6667f    },
-    { "GL5537-2",   37529382.2835f,     -1.4286f    },
-    { "GL5539",     12411565.9487f,     -1.25f      },
-    { "GL5549",     5639135.2390f,      -1.1111f    }
+    { "GL5516",     562500000.0F,       -2.0F       },
+    { "GL5528",     91233029.9336F,     -1.6667F    },
+    { "GL5537-1",   213746993.3346F,    -1.6667F    },
+    { "GL5537-2",   37529382.2835F,     -1.4286F    },
+    { "GL5539",     12411565.9487F,     -1.25F      },
+    { "GL5549",     5639135.2390F,      -1.1111F    }
 };
 
 /******************************************************************************
diff --git a/lib/SettingsService/src/SettingsService.cpp b/lib/SettingsService/src/SettingsService.cpp
index 73c07dfc..628076ea 100644
--- a/lib/SettingsService/src/SettingsService.cpp
+++ b/lib/SettingsService/src/SettingsService.cpp
@@ -194,7 +194,7 @@ static const char*      DEFAULT_WEB_LOGIN_PASSWORD      = "skywalker";
 static const char*      DEFAULT_HOSTNAME                = "pixelix";
 
 /** Brightness default value in % */
-static const uint8_t    DEFAULT_BRIGHTNESS              = 20U; /* If powered via USB, keep this at 20% to avoid damage. */
+static const uint8_t    DEFAULT_BRIGHTNESS              = 25U; /* If powered via USB, keep this at 25% to avoid damage. */
 
 /** Automatic brightness control default value */
 static const bool       DEFAULT_AUTO_BRIGHTNESS_CTRL    = false;
@@ -332,7 +332,7 @@ bool SettingsService::start()
 
 void SettingsService::stop()
 {
-    /* Nothing to do. */
+    LOG_INFO("Settings service stopped.");
 }
 
 void SettingsService::process()
diff --git a/lib/ShellyPlugSPlugin/src/ShellyPlugSPlugin.cpp b/lib/ShellyPlugSPlugin/src/ShellyPlugSPlugin.cpp
deleted file mode 100644
index 1a7859ca..00000000
--- a/lib/ShellyPlugSPlugin/src/ShellyPlugSPlugin.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-/* MIT License
- *
- * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*******************************************************************************
-    DESCRIPTION
-*******************************************************************************/
-/**
- * @brief  Shelly PlugS plugin.
- * @author Yann Le Glaz <yann_le@web.de>
- */
-
-/******************************************************************************
- * Includes
- *****************************************************************************/
-#include "ShellyPlugSPlugin.h"
-#include "AsyncHttpClient.h"
-#include "ClockDrv.h"
-#include "time.h"
-
-#include <ArduinoJson.h>
-#include <Logging.h>
-
-/******************************************************************************
- * Compiler Switches
- *****************************************************************************/
-
-/******************************************************************************
- * Macros
- *****************************************************************************/
-
-/******************************************************************************
- * Types and classes
- *****************************************************************************/
-
-/******************************************************************************
- * Prototypes
- *****************************************************************************/
-
-/******************************************************************************
- * Local Variables
- *****************************************************************************/
-
-/* Initialize image path. */
-const char* ShellyPlugSPlugin::IMAGE_PATH   = "/plugins/ShellyPlugSPlugin/plug.bmp";
-
-/* Initialize plugin topic. */
-const char* ShellyPlugSPlugin::TOPIC_CONFIG = "/ipAddress";
-
-/******************************************************************************
- * Public Methods
- *****************************************************************************/
-
-void ShellyPlugSPlugin::getTopics(JsonArray& topics) const
-{
-    (void)topics.add(TOPIC_CONFIG);
-}
-
-bool ShellyPlugSPlugin::getTopic(const String& topic, JsonObject& value) const
-{
-    bool isSuccessful = false;
-
-    if (0U != topic.equals(TOPIC_CONFIG))
-    {
-        getConfiguration(value);
-        isSuccessful = true;
-    }
-
-    return isSuccessful;
-}
-
-bool ShellyPlugSPlugin::setTopic(const String& topic, const JsonObject& value)
-{
-    bool isSuccessful = false;
-
-    if (0U != topic.equals(TOPIC_CONFIG))
-    {
-        const size_t        JSON_DOC_SIZE           = 512U;
-        DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
-        JsonObject          jsonCfg                 = jsonDoc.to<JsonObject>();
-        JsonVariantConst    jsonIpAddress           = value["ipAddress"];
-
-        /* The received configuration may not contain all single key/value pair.
-         * Therefore read first the complete internal configuration and
-         * overwrite them with the received ones.
-         */
-        getConfiguration(jsonCfg);
-
-        /* Note:
-         * Check only for the key/value pair availability.
-         * The type check will follow in the setConfiguration().
-         */
-
-        if (false == jsonIpAddress.isNull())
-        {
-            jsonCfg["ipAddress"] = jsonIpAddress.as<String>();
-            isSuccessful = true;
-        }
-
-        if (true == isSuccessful)
-        {
-            JsonObjectConst jsonCfgConst = jsonCfg;
-
-            isSuccessful = setConfiguration(jsonCfgConst);
-
-            if (true == isSuccessful)
-            {
-                requestStoreToPersistentMemory();
-            }
-        }
-    }
-
-    return isSuccessful;
-}
-
-bool ShellyPlugSPlugin::hasTopicChanged(const String& topic)
-{
-    MutexGuard<MutexRecursive>  guard(m_mutex);
-    bool                        hasTopicChanged = m_hasTopicChanged;
-
-    /* Only a single topic, therefore its not necessary to check. */
-    PLUGIN_NOT_USED(topic);
-
-    m_hasTopicChanged = false;
-
-    return hasTopicChanged;
-}
-
-void ShellyPlugSPlugin::start(uint16_t width, uint16_t height)
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
-
-    m_iconCanvas.setPosAndSize(0, 0, ICON_WIDTH, ICON_HEIGHT);
-    (void)m_iconCanvas.addWidget(m_bitmapWidget);
-
-    (void)m_bitmapWidget.load(FILESYSTEM, IMAGE_PATH);
-
-    /* The text canvas is left aligned to the icon canvas and it spans over
-     * the whole display height.
-     */
-    m_textCanvas.setPosAndSize(ICON_WIDTH, 0, width - ICON_WIDTH, height);
-    (void)m_textCanvas.addWidget(m_textWidget);
-
-    /* Choose font. */
-    m_textWidget.setFont(Fonts::getFontByType(m_fontType));
-    
-    /* The text widget inside the text canvas is left aligned on x-axis and
-     * aligned to the center of y-axis.
-     */
-    if (height > m_textWidget.getFont().getHeight())
-    {
-        uint16_t diffY = height - m_textWidget.getFont().getHeight();
-        uint16_t offsY = diffY / 2U;
-
-        m_textWidget.move(0, offsY);
-    }
-
-    /* Try to load configuration. If there is no configuration available, a default configuration
-     * will be created.
-     */
-    if (false == loadConfiguration())
-    {
-        if (false == saveConfiguration())
-        {
-            LOG_WARNING("Failed to create initial configuration file %s.", getFullPathToConfiguration().c_str());
-        }
-    }
-    else
-    {
-        /* Remember current timestamp to detect updates of the configuration in the
-         * filesystem without using the plugin API.
-         */
-        updateTimestampLastUpdate();
-    }
-
-    m_cfgReloadTimer.start(CFG_RELOAD_PERIOD);
-
-    initHttpClient();
-}
-
-void ShellyPlugSPlugin::stop()
-{
-    String                      configurationFilename = getFullPathToConfiguration();
-    MutexGuard<MutexRecursive>  guard(m_mutex);
-
-    m_cfgReloadTimer.stop();
-    m_requestTimer.stop();
-
-    if (false != FILESYSTEM.remove(configurationFilename))
-    {
-        LOG_INFO("File %s removed", configurationFilename.c_str());
-    }
-}
-
-void ShellyPlugSPlugin::process(bool isConnected)
-{
-    Msg                         msg;
-    MutexGuard<MutexRecursive>  guard(m_mutex);
-
-    /* Configuration in persistent memory updated? */
-    if ((true == m_cfgReloadTimer.isTimerRunning()) &&
-        (true == m_cfgReloadTimer.isTimeout()))
-    {
-        if (true == isConfigurationUpdated())
-        {
-            m_reloadConfigReq = true;
-        }
-
-        m_cfgReloadTimer.restart();
-    }
-
-    if (true == m_storeConfigReq)
-    {
-        if (false == saveConfiguration())
-        {
-            LOG_WARNING("Failed to save configuration: %s", getFullPathToConfiguration().c_str());
-        }
-
-        m_storeConfigReq = false;
-    }
-    else if (true == m_reloadConfigReq)
-    {
-        LOG_INFO("Reload configuration: %s", getFullPathToConfiguration().c_str());
-
-        if (true == loadConfiguration())
-        {
-            updateTimestampLastUpdate();
-        }
-
-        m_reloadConfigReq = false;
-    }
-    else
-    {
-        ;
-    }
-
-    /* Only if a network connection is established the required information
-     * shall be periodically requested via REST API.
-     */
-    if (false == m_requestTimer.isTimerRunning())
-    {
-        if (true == isConnected)
-        {
-            if (false == startHttpRequest())
-            {
-                m_requestTimer.start(UPDATE_PERIOD_SHORT);
-            }
-            else
-            {
-                m_requestTimer.start(UPDATE_PERIOD);
-            }
-        }
-    }
-    else
-    {
-        /* If the connection is lost, stop periodically requesting information
-         * via REST API.
-         */
-        if (false == isConnected)
-        {
-            m_requestTimer.stop();
-        }
-        /* Network connection is available and next request may be necessary for
-         * information update.
-         */
-        else if (true == m_requestTimer.isTimeout())
-        {
-            if (false == startHttpRequest())
-            {
-                m_requestTimer.start(UPDATE_PERIOD_SHORT);
-            }
-            else
-            {
-                m_requestTimer.start(UPDATE_PERIOD);
-            }
-        }
-    }
-
-    if (true == m_taskProxy.receive(msg))
-    {
-        switch(msg.type)
-        {
-        case MSG_TYPE_INVALID:
-            /* Should never happen. */
-            break;
-
-        case MSG_TYPE_RSP:
-            if (nullptr != msg.rsp)
-            {
-                handleWebResponse(*msg.rsp);
-                delete msg.rsp;
-                msg.rsp = nullptr;
-            }
-            break;
-
-        default:
-            /* Should never happen. */
-            break;
-        }
-    }
-}
-
-void ShellyPlugSPlugin::update(YAGfx& gfx)
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
-
-    gfx.fillScreen(ColorDef::BLACK);
-    m_iconCanvas.update(gfx);
-    m_textCanvas.update(gfx);
-}
-
-/******************************************************************************
- * Protected Methods
- *****************************************************************************/
-
-/******************************************************************************
- * Private Methods
- *****************************************************************************/
-
-void ShellyPlugSPlugin::requestStoreToPersistentMemory()
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
-
-    m_storeConfigReq = true;
-}
-
-void ShellyPlugSPlugin::getConfiguration(JsonObject& jsonCfg) const
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
-
-    jsonCfg["ipAddress"] = m_ipAddress;
-}
-
-bool ShellyPlugSPlugin::setConfiguration(JsonObjectConst& jsonCfg)
-{
-    bool                status          = false;
-    JsonVariantConst    jsonIpAddress   = jsonCfg["ipAddress"];
-
-    if (false == jsonIpAddress.is<String>())
-    {
-        LOG_WARNING("ipAddress not found or invalid type.");
-    }
-    else
-    {
-        MutexGuard<MutexRecursive> guard(m_mutex);
-
-        m_ipAddress = jsonIpAddress.as<String>();
-
-        /* Force update on display */
-        m_requestTimer.start(UPDATE_PERIOD_SHORT);
-
-        m_hasTopicChanged = true;
-
-        status = true;
-    }
-
-    return status;
-}
-
-bool ShellyPlugSPlugin::startHttpRequest()
-{
-    bool status = false;
-
-    if (false == m_ipAddress.isEmpty())
-    {
-        String url = String("http://") + m_ipAddress + "/meter/0/";
-
-        if (true == m_client.begin(url))
-        {
-            if (false == m_client.GET())
-            {
-                LOG_WARNING("GET %s failed.", url.c_str());
-            }
-            else
-            {
-                status = true;
-            }
-        }
-    }
-
-    return status;
-}
-
-void ShellyPlugSPlugin::initHttpClient()
-{
-    /* Note: All registered callbacks are running in a different task context!
-     *       Therefore it is not allowed to access a member here directly.
-     *       The processing must be deferred via task proxy.
-     */
-    m_client.regOnResponse(
-        [this](const HttpResponse& rsp)
-        {
-            const size_t            JSON_DOC_SIZE   = 512U;
-            DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
-
-            if (nullptr != jsonDoc)
-            {
-                size_t                          payloadSize = 0U;
-                const char*                     payload     = reinterpret_cast<const char*>(rsp.getPayload(payloadSize));
-                const size_t                    FILTER_SIZE = 128U;
-                StaticJsonDocument<FILTER_SIZE> filter;
-                DeserializationError            error;
-
-                filter["power"] = true;
-
-                if (true == filter.overflowed())
-                {
-                    LOG_ERROR("Less memory for filter available.");
-                }
-                
-                error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
-
-                if (DeserializationError::Ok != error.code())
-                {
-                    LOG_WARNING("JSON parse error: %s", error.c_str());
-                }
-                else
-                {
-                    Msg msg;
-
-                    msg.type    = MSG_TYPE_RSP;
-                    msg.rsp     = jsonDoc;
-
-                    if (false == this->m_taskProxy.send(msg))
-                    {
-                        delete jsonDoc;
-                        jsonDoc = nullptr;
-                    }
-                }
-            }
-        }
-    );
-}
-
-void ShellyPlugSPlugin::handleWebResponse(DynamicJsonDocument& jsonDoc)
-{
-    JsonVariantConst jsonPower = jsonDoc["power"];
-
-    if (false == jsonPower.is<float>())
-    {
-        LOG_WARNING("JSON power type mismatch or missing.");
-    }
-    else
-    {
-        float       powerRaw                = jsonPower.as<float>();
-        String      power;
-        const char* reducePrecision;
-        char        powerReducedPrecison[6] = { 0 };
-
-        if (powerRaw < 99.99F)
-        {
-            reducePrecision = (powerRaw > 9.9F) ? "%.1f" : "%.2f";
-        }
-        else
-        {
-            reducePrecision = "%.0f";
-        }
-        
-        (void)snprintf(powerReducedPrecison, sizeof(powerReducedPrecison), reducePrecision, powerRaw);
-
-        power = "\\calign";
-        power += powerReducedPrecison;
-        power += " W";
-        
-        m_textWidget.setFormatStr(power);
-    }
-}
-
-void ShellyPlugSPlugin::clearQueue()
-{
-    Msg msg;
-
-    while(true == m_taskProxy.receive(msg))
-    {
-        if (MSG_TYPE_RSP == msg.type)
-        {
-            delete msg.rsp;
-            msg.rsp = nullptr;
-        }
-    }
-}
-
-/******************************************************************************
- * External Functions
- *****************************************************************************/
-
-/******************************************************************************
- * Local Functions
- *****************************************************************************/
diff --git a/lib/ShellyPlugSPlugin/web/ShellyPlugSPlugin.jpg b/lib/ShellyPlugSPlugin/web/ShellyPlugSPlugin.jpg
deleted file mode 100644
index a8f8433c..00000000
Binary files a/lib/ShellyPlugSPlugin/web/ShellyPlugSPlugin.jpg and /dev/null differ
diff --git a/lib/SignalDetectorPlugin/src/SignalDetectorPlugin.cpp b/lib/SignalDetectorPlugin/src/SignalDetectorPlugin.cpp
index b6498d8a..233066bf 100644
--- a/lib/SignalDetectorPlugin/src/SignalDetectorPlugin.cpp
+++ b/lib/SignalDetectorPlugin/src/SignalDetectorPlugin.cpp
@@ -103,7 +103,7 @@ bool SignalDetectorPlugin::getTopic(const String& topic, JsonObject& value) cons
     return isSuccessful;
 }
 
-bool SignalDetectorPlugin::setTopic(const String& topic, const JsonObject& value)
+bool SignalDetectorPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
@@ -568,7 +568,7 @@ bool SignalDetectorPlugin::startHttpRequest()
 void SignalDetectorPlugin::initHttpClient()
 {
     /* Note: All registered callbacks are running in a different task context! */
-    m_client.regOnResponse([](const HttpResponse& rsp){
+    m_client.regOnResponse([](const HttpResponse& rsp) {
         uint16_t statusCode = rsp.getStatusCode();
 
         if (HttpStatus::STATUS_CODE_OK == statusCode)
diff --git a/lib/SignalDetectorPlugin/src/SignalDetectorPlugin.h b/lib/SignalDetectorPlugin/src/SignalDetectorPlugin.h
index 3d4dadab..df6c88aa 100644
--- a/lib/SignalDetectorPlugin/src/SignalDetectorPlugin.h
+++ b/lib/SignalDetectorPlugin/src/SignalDetectorPlugin.h
@@ -113,7 +113,7 @@ class SignalDetectorPlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new SignalDetectorPlugin(name, uid);
+        return new(std::nothrow)SignalDetectorPlugin(name, uid);
     }
 
     /**
@@ -198,7 +198,7 @@ class SignalDetectorPlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
diff --git a/lib/SoundReactivePlugin/src/SoundReactivePlugin.cpp b/lib/SoundReactivePlugin/src/SoundReactivePlugin.cpp
index 02d89344..d1305291 100644
--- a/lib/SoundReactivePlugin/src/SoundReactivePlugin.cpp
+++ b/lib/SoundReactivePlugin/src/SoundReactivePlugin.cpp
@@ -103,7 +103,7 @@ bool SoundReactivePlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool SoundReactivePlugin::setTopic(const String& topic, const JsonObject& value)
+bool SoundReactivePlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
diff --git a/lib/SoundReactivePlugin/src/SoundReactivePlugin.h b/lib/SoundReactivePlugin/src/SoundReactivePlugin.h
index 54be843e..58742fa0 100644
--- a/lib/SoundReactivePlugin/src/SoundReactivePlugin.h
+++ b/lib/SoundReactivePlugin/src/SoundReactivePlugin.h
@@ -123,7 +123,7 @@ class SoundReactivePlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new SoundReactivePlugin(name, uid);
+        return new(std::nothrow)SoundReactivePlugin(name, uid);
     }
 
     /**
@@ -176,7 +176,7 @@ class SoundReactivePlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
diff --git a/lib/StateMachine/library.json b/lib/StateMachine/library.json
new file mode 100644
index 00000000..7d463a60
--- /dev/null
+++ b/lib/StateMachine/library.json
@@ -0,0 +1,15 @@
+{
+    "name": "StateMachine",
+    "version": "0.1.0",
+    "description": "....",
+    "authors": [{
+        "name": "Andreas Merkle",
+        "email": "web@blue-andi.de",
+        "url": "https://github.com/BlueAndi",
+        "maintainer": true
+    }],
+    "license": "MIT",
+    "dependencies": [],
+    "frameworks": "*",
+    "platforms": "*"
+}
diff --git a/lib/StateMachine/StateMachine.hpp b/lib/StateMachine/src/StateMachine.hpp
similarity index 100%
rename from lib/StateMachine/StateMachine.hpp
rename to lib/StateMachine/src/StateMachine.hpp
diff --git a/lib/SunrisePlugin/library.json b/lib/SunrisePlugin/library.json
index fc667eab..e2efd8ea 100644
--- a/lib/SunrisePlugin/library.json
+++ b/lib/SunrisePlugin/library.json
@@ -13,6 +13,8 @@
         "name": "LittleFS"
     }, {
         "name": "Plugin"
+    }, {
+        "name": "IRtc"
     }],
     "frameworks": "*",
     "platforms": "*"
diff --git a/lib/SunrisePlugin/src/SunrisePlugin.cpp b/lib/SunrisePlugin/src/SunrisePlugin.cpp
index 794e09d9..fbafb1bc 100644
--- a/lib/SunrisePlugin/src/SunrisePlugin.cpp
+++ b/lib/SunrisePlugin/src/SunrisePlugin.cpp
@@ -39,6 +39,7 @@
 
 #include <ArduinoJson.h>
 #include <Logging.h>
+#include <HttpStatus.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -69,6 +70,11 @@ const char* SunrisePlugin::TOPIC_CONFIG         = "/location";
 /* Initialize time format. */
 const char* SunrisePlugin::TIME_FORMAT_DEFAULT  = "%I:%M %p";
 
+/* Initialize sunset and sunrise times API base URI.
+ * Use http:// instead of https:// for less required heap memory for SSL connection.
+ */
+const char* SunrisePlugin::BASE_URI             = "http://api.sunrise-sunset.org";
+
 /******************************************************************************
  * Public Methods
  *****************************************************************************/
@@ -91,7 +97,7 @@ bool SunrisePlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool SunrisePlugin::setTopic(const String& topic, const JsonObject& value)
+bool SunrisePlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
@@ -102,6 +108,7 @@ bool SunrisePlugin::setTopic(const String& topic, const JsonObject& value)
         JsonObject          jsonCfg                 = jsonDoc.to<JsonObject>();
         JsonVariantConst    jsonLongitude           = value["longitude"];
         JsonVariantConst    jsonLatitude            = value["latitude"];
+        JsonVariantConst    jsonTimeFormat          = value["timeFormat"];
 
         /* The received configuration may not contain all single key/value pair.
          * Therefore read first the complete internal configuration and
@@ -126,6 +133,12 @@ bool SunrisePlugin::setTopic(const String& topic, const JsonObject& value)
             isSuccessful = true;
         }
 
+        if (false == jsonTimeFormat.isNull())
+        {
+            jsonCfg["timeFormat"] = jsonTimeFormat.as<String>();
+            isSuccessful = true;
+        }
+
         if (true == isSuccessful)
         {
             JsonObjectConst jsonCfgConst = jsonCfg;
@@ -407,7 +420,7 @@ bool SunrisePlugin::startHttpRequest()
     if ((false == m_latitude.isEmpty()) &&
         (false == m_longitude.isEmpty()))
     {
-        String url = String("http://api.sunrise-sunset.org/json?lat=") + m_latitude + "&lng=" + m_longitude + "&formatted=0";
+        String url = String(BASE_URI) + "/json?lat=" + m_latitude + "&lng=" + m_longitude + "&formatted=0";
 
         if (true == m_client.begin(url))
         {
@@ -434,46 +447,60 @@ void SunrisePlugin::initHttpClient()
     m_client.regOnResponse(
         [this](const HttpResponse& rsp)
         {
+            handleAsyncWebResponse(rsp);
+        }
+    );
+}
 
-            const size_t            JSON_DOC_SIZE   = 512U;
-            DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
+void SunrisePlugin::handleAsyncWebResponse(const HttpResponse& rsp)
+{
+    if (HttpStatus::STATUS_CODE_OK == rsp.getStatusCode())
+    {
+        const size_t            JSON_DOC_SIZE   = 512U;
+        DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
 
-            if (nullptr != jsonDoc)
+        if (nullptr != jsonDoc)
+        {
+            size_t                          payloadSize = 0U;
+            const void*                     vPayload    = rsp.getPayload(payloadSize);
+            const char*                     payload     = static_cast<const char*>(vPayload);
+            const size_t                    FILTER_SIZE = 128U;
+            StaticJsonDocument<FILTER_SIZE> filter;
+
+            /* Example:
+            * {
+            *   "results":
+            *   {
+            *     "sunrise":"2015-05-21T05:05:35+00:00",
+            *     "sunset":"2015-05-21T19:22:59+00:00",
+            *     "solar_noon":"2015-05-21T12:14:17+00:00",
+            *     "day_length":51444,
+            *     "civil_twilight_begin":"2015-05-21T04:36:17+00:00",
+            *     "civil_twilight_end":"2015-05-21T19:52:17+00:00",
+            *     "nautical_twilight_begin":"2015-05-21T04:00:13+00:00",
+            *     "nautical_twilight_end":"2015-05-21T20:28:21+00:00",
+            *     "astronomical_twilight_begin":"2015-05-21T03:20:49+00:00",
+            *     "astronomical_twilight_end":"2015-05-21T21:07:45+00:00"
+            *   },
+            *    "status":"OK"
+            * }
+            */
+
+            filter["results"]["sunrise"]    = true;
+            filter["results"]["sunset"]     = true;
+
+            if (true == filter.overflowed())
             {
-                size_t                          payloadSize = 0U;
-                const char*                     payload     = reinterpret_cast<const char*>(rsp.getPayload(payloadSize));
-                const size_t                    FILTER_SIZE = 128U;
-                StaticJsonDocument<FILTER_SIZE> filter;
-                DeserializationError            error;
-
-                /* Example:
-                * {
-                *   "results":
-                *   {
-                *     "sunrise":"2015-05-21T05:05:35+00:00",
-                *     "sunset":"2015-05-21T19:22:59+00:00",
-                *     "solar_noon":"2015-05-21T12:14:17+00:00",
-                *     "day_length":51444,
-                *     "civil_twilight_begin":"2015-05-21T04:36:17+00:00",
-                *     "civil_twilight_end":"2015-05-21T19:52:17+00:00",
-                *     "nautical_twilight_begin":"2015-05-21T04:00:13+00:00",
-                *     "nautical_twilight_end":"2015-05-21T20:28:21+00:00",
-                *     "astronomical_twilight_begin":"2015-05-21T03:20:49+00:00",
-                *     "astronomical_twilight_end":"2015-05-21T21:07:45+00:00"
-                *   },
-                *    "status":"OK"
-                * }
-                */
-
-                filter["results"]["sunrise"]    = true;
-                filter["results"]["sunset"]     = true;
-
-                if (true == filter.overflowed())
-                {
-                    LOG_ERROR("Less memory for filter available.");
-                }
-
-                error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
+                LOG_ERROR("Less memory for filter available.");
+            }
+            else if ((nullptr == payload) ||
+                     (0U == payloadSize))
+            {
+                LOG_ERROR("No payload.");
+            }
+            else
+            {
+                DeserializationError error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
 
                 if (DeserializationError::Ok != error.code())
                 {
@@ -494,7 +521,7 @@ void SunrisePlugin::initHttpClient()
                 }
             }
         }
-    );
+    }
 }
 
 void SunrisePlugin::handleWebResponse(const DynamicJsonDocument& jsonDoc)
diff --git a/lib/SunrisePlugin/src/SunrisePlugin.h b/lib/SunrisePlugin/src/SunrisePlugin.h
index 6035abbe..ee324b7f 100644
--- a/lib/SunrisePlugin/src/SunrisePlugin.h
+++ b/lib/SunrisePlugin/src/SunrisePlugin.h
@@ -135,7 +135,7 @@ class SunrisePlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new SunrisePlugin(name, uid);
+        return new(std::nothrow)SunrisePlugin(name, uid);
     }
 
     /**
@@ -213,7 +213,7 @@ class SunrisePlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
@@ -289,6 +289,11 @@ class SunrisePlugin : public Plugin, private PluginConfigFsHandler
      */
     static const char*      TOPIC_CONFIG;
 
+    /**
+     * Sunset and sunrise times API base URI.
+     */
+    static const char*      BASE_URI;
+
     /**
      * Period in ms for requesting sunset/sunrise from server.
      * This is used in case the last request to the server was successful.
@@ -394,6 +399,14 @@ class SunrisePlugin : public Plugin, private PluginConfigFsHandler
      */
     void initHttpClient(void);
 
+    /**
+     * Handle asynchronous web response from the server.
+     * This will be called in LwIP context! Don't modify any member here directly!
+     * 
+     * @param[in] jsonDoc   Web response as JSON document
+     */
+    void handleAsyncWebResponse(const HttpResponse& rsp);
+
     /**
      * Handle a web response from the server.
      * 
diff --git a/lib/SysMsgPlugin/src/SysMsgPlugin.h b/lib/SysMsgPlugin/src/SysMsgPlugin.h
index 4ffa2b82..25ab728f 100644
--- a/lib/SysMsgPlugin/src/SysMsgPlugin.h
+++ b/lib/SysMsgPlugin/src/SysMsgPlugin.h
@@ -103,7 +103,7 @@ class SysMsgPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new SysMsgPlugin(name, uid);
+        return new(std::nothrow)SysMsgPlugin(name, uid);
     }
 
     /**
diff --git a/lib/TempHumidPlugin/src/TempHumidPlugin.cpp b/lib/TempHumidPlugin/src/TempHumidPlugin.cpp
index d74d15f9..733ce71c 100644
--- a/lib/TempHumidPlugin/src/TempHumidPlugin.cpp
+++ b/lib/TempHumidPlugin/src/TempHumidPlugin.cpp
@@ -172,18 +172,23 @@ void TempHumidPlugin::process(bool isConnected)
 
         m_sensorUpdateTimer.start(SENSOR_UPDATE_PERIOD);
     }
-}
-
-void TempHumidPlugin::active(YAGfx& gfx)
-{
-    MutexGuard<MutexRecursive> guard(m_mutex);
 
     /* Set time to show page - either 10s or slot_time / 4
      * read here because otherwise we do not get config changes during runtime in slot_time.
      */
     if (nullptr != m_slotInterf) {
         m_pageTime = m_slotInterf->getDuration() / 4U;
+
+        if (DEFAULT_PAGE_TIME > m_pageTime)
+        {
+            m_pageTime = DEFAULT_PAGE_TIME;
+        }
     }
+}
+
+void TempHumidPlugin::active(YAGfx& gfx)
+{
+    MutexGuard<MutexRecursive> guard(m_mutex);
 
     gfx.fillScreen(ColorDef::BLACK);
     m_iconCanvas.update(gfx);
diff --git a/lib/TempHumidPlugin/src/TempHumidPlugin.h b/lib/TempHumidPlugin/src/TempHumidPlugin.h
index 9728fc9d..f3c8f576 100644
--- a/lib/TempHumidPlugin/src/TempHumidPlugin.h
+++ b/lib/TempHumidPlugin/src/TempHumidPlugin.h
@@ -83,7 +83,7 @@ class TempHumidPlugin : public Plugin
         m_bitmapWidget(),
         m_textWidget("\\calign?"),
         m_page(TEMPERATURE),
-        m_pageTime(10000U),
+        m_pageTime(DEFAULT_PAGE_TIME),
         m_timer(),
         m_mutex(),
         m_humidity(0.0F),
@@ -124,7 +124,7 @@ class TempHumidPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new TempHumidPlugin(name, uid);
+        return new(std::nothrow)TempHumidPlugin(name, uid);
     }
 
     /**
@@ -240,7 +240,12 @@ class TempHumidPlugin : public Plugin
     /**
      * Read sensor only every N milliseconds (currently 90 seconds)
      */
-    static const uint32_t       SENSOR_UPDATE_PERIOD = SIMPLE_TIMER_SECONDS(90U);
+    static const uint32_t       SENSOR_UPDATE_PERIOD    = SIMPLE_TIMER_SECONDS(90U);
+
+    /**
+     * Default time in ms how long one page will be shown until the next page.
+     */
+    static const uint32_t       DEFAULT_PAGE_TIME       = SIMPLE_TIMER_SECONDS(10U);
 
     Fonts::FontType             m_fontType;                 /**< Font type which shall be used if there is no conflict with the layout. */
     WidgetGroup                 m_textCanvas;               /**< Canvas used for the text widget. */
diff --git a/lib/TestPlugin/src/TestPlugin.h b/lib/TestPlugin/src/TestPlugin.h
index 3c29c299..ac7dfde1 100644
--- a/lib/TestPlugin/src/TestPlugin.h
+++ b/lib/TestPlugin/src/TestPlugin.h
@@ -96,7 +96,7 @@ class TestPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new TestPlugin(name, uid);
+        return new(std::nothrow)TestPlugin(name, uid);
     }
 
     /**
diff --git a/lib/ThreeIconPlugin/src/ThreeIconPlugin.cpp b/lib/ThreeIconPlugin/src/ThreeIconPlugin.cpp
index 7278339d..f19738f9 100644
--- a/lib/ThreeIconPlugin/src/ThreeIconPlugin.cpp
+++ b/lib/ThreeIconPlugin/src/ThreeIconPlugin.cpp
@@ -27,7 +27,7 @@
 /**
  * @brief  Three icon plugin
  * @author Yann Le Glaz <yann_le@web.de>
-
+ *
  */
 
 /******************************************************************************
@@ -60,16 +60,19 @@
  *****************************************************************************/
 
 /* Initialize bitmap control topic. */
-const char* ThreeIconPlugin::TOPIC_BITMAP               = "/bitmap";
+const char* ThreeIconPlugin::TOPIC_BITMAP           = "/bitmap";
+
+/* Initialize plugin topic. */
+const char* ThreeIconPlugin::TOPIC_SPRITESHEET      = "/spritesheet";
+
+/* Initialize animation control topic. */
+const char* ThreeIconPlugin::TOPIC_ANIMATION        = "/animation";
 
 /* Initialize bitmap image filename extension. */
-const char* ThreeIconPlugin::FILE_EXT_BITMAP            = ".bmp";
+const char* ThreeIconPlugin::FILE_EXT_BITMAP        = ".bmp";
 
 /* Initialize sprite sheet parameter filename extension. */
-const char* ThreeIconPlugin::FILE_EXT_SPRITE_SHEET      = ".sprite";
-
-/* Initialize animation control topic. */
-const char* ThreeIconPlugin::TOPIC_ANIMATION            = "/animation";
+const char* ThreeIconPlugin::FILE_EXT_SPRITE_SHEET  = ".sprite";
 
 /******************************************************************************
  * Public Methods
@@ -81,12 +84,17 @@ void ThreeIconPlugin::getTopics(JsonArray& topics) const
 
     for(iconId = 0U; iconId < MAX_ICONS; ++iconId)
     {
-        JsonObject  jsonIcon    = topics.createNestedObject();
+        JsonObject  jsonIcon        = topics.createNestedObject();
+        JsonObject  jsonSpriteSheet = topics.createNestedObject();
+        JsonObject  jsonAnimation   = topics.createNestedObject();
 
-        jsonIcon["name"]    = String(TOPIC_BITMAP) + "/" + iconId;
-        jsonIcon["access"]  = "w"; /* Only icon upload is supported. */
+        jsonIcon["name"]            = String(TOPIC_BITMAP) + "/" + iconId;
+        jsonIcon["access"]          = "w"; /* Only icon upload is supported. */
 
-        (void)topics.add(String(TOPIC_ANIMATION) + "/" + iconId);
+        jsonSpriteSheet["name"]     = String(TOPIC_SPRITESHEET) + "/" + iconId;
+        jsonSpriteSheet["access"]   = "w"; /* Only sprite sheet upload is supported. */
+
+        jsonAnimation["name"]       = String(TOPIC_ANIMATION) + "/" + iconId;
     }
 }
 
@@ -94,11 +102,7 @@ bool ThreeIconPlugin::getTopic(const String& topic, JsonObject& value) const
 {
     bool isSuccessful = false;
 
-    if (0U != topic.startsWith(String(TOPIC_BITMAP) + "/"))
-    {
-        isSuccessful = true;
-    }
-    else if (0U != topic.startsWith(String(TOPIC_ANIMATION) + "/"))
+    if (0U != topic.startsWith(String(TOPIC_ANIMATION) + "/"))
     {
         uint32_t    indexBeginIconId    = topic.lastIndexOf("/") + 1U;
         String      iconIdStr           = topic.substring(indexBeginIconId);
@@ -108,22 +112,26 @@ bool ThreeIconPlugin::getTopic(const String& topic, JsonObject& value) const
         if ((true == status) &&
             (MAX_ICONS > iconId))
         {
-            value["id"]         = iconId;
-            value["repeat"]     = getIsRepeat(iconId);
-            value["forward"]    = getIsForward(iconId);
+            String  iconFullPath;
+            String  spriteSheetFullPath;
+
+            getIconFilePath(iconId, iconFullPath);
+            getSpriteSheetFilePath(iconId, spriteSheetFullPath);
+
+            value["id"]                     = iconId;
+            value["repeat"]                 = getIsRepeat(iconId);
+            value["forward"]                = getIsForward(iconId);
+            value["iconFullPath"]           = iconFullPath;
+            value["spriteSheetFullPath"]    = spriteSheetFullPath;
 
             isSuccessful = true;
         }
     }
-    else
-    {
-        ;
-    }
 
     return isSuccessful;
 }
 
-bool ThreeIconPlugin::setTopic(const String& topic, const JsonObject& value)
+bool ThreeIconPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
@@ -143,18 +151,34 @@ bool ThreeIconPlugin::setTopic(const String& topic, const JsonObject& value)
             if (false == jsonIconPath.isNull())
             {
                 String iconPath = jsonIconPath.as<String>();
-                isSuccessful = loadBitmap(iconPath, iconId);  
+
+                isSuccessful = loadBitmap(iconId, iconPath);  
             }
-            /* Control command */
-            else
+        }
+    }
+    else if (0U != topic.startsWith(String(TOPIC_SPRITESHEET) + "/"))
+    {
+        uint32_t            indexBeginIconId    = topic.lastIndexOf("/") + 1U;
+        String              iconIdStr           = topic.substring(indexBeginIconId);
+        uint8_t             iconId              = MAX_ICONS;
+        bool                status              = Util::strToUInt8(iconIdStr, iconId);
+
+        if ((true == status) &&
+            (MAX_ICONS > iconId))
+        {
+            JsonVariantConst jsonSpriteSheetPath = value["fullPath"];
+
+            /* File upload? */
+            if (false == jsonSpriteSheetPath.isNull())
             {
-                JsonVariantConst jsonClear = value["clear"];
+                String spriteSheetPath = jsonSpriteSheetPath.as<String>();
 
-                if (jsonClear.as<String>() == "true")
-                {
-                    clearBitmap(iconId);
-                    isSuccessful = true;
-                }
+                /* Don't use the return value, because there may be no bitmap
+                * available.
+                */
+                (void)loadSpriteSheet(iconId, spriteSheetPath);
+
+                isSuccessful = true;
             }
         }
     }
@@ -166,11 +190,12 @@ bool ThreeIconPlugin::setTopic(const String& topic, const JsonObject& value)
         bool        status              = Util::strToUInt8(iconIdStr, iconId);
 
         if ((true == status) &&
-            (MAX_ICONS > iconId) &&
-            (false != m_isSpriteSheetAvailable[iconId]))
+            (MAX_ICONS > iconId))
         {
-            JsonVariantConst    jsonIsForward   = value["forward"];
-            JsonVariantConst    jsonIsRepeat    = value["repeat"];
+            JsonVariantConst    jsonIsForward           = value["forward"];
+            JsonVariantConst    jsonIsRepeat            = value["repeat"];
+            JsonVariantConst    jsonIconFullPath        = value["iconFullPath"];
+            JsonVariantConst    jsonSpriteSheetFullPath = value["spriteSheetFullPath"];
 
             if (false == jsonIsForward.isNull())
             {
@@ -207,6 +232,44 @@ bool ThreeIconPlugin::setTopic(const String& topic, const JsonObject& value)
                     ;
                 }
             }
+
+            if (false == jsonIconFullPath.isNull())
+            {
+                String iconFullPath = jsonIconFullPath.as<String>();
+
+                if (true == iconFullPath.isEmpty())
+                {
+                    clearBitmap(iconId);
+                }
+                else
+                {
+                    /* Don't use the return value, because there may be no bitmap
+                     * available yet.
+                     */
+                    (void)loadBitmap(iconId, iconFullPath);
+                }
+
+                isSuccessful = true;
+            }
+
+            if (false == jsonSpriteSheetFullPath.isNull())
+            {
+                String spriteSheetFullPath = jsonSpriteSheetFullPath.as<String>();
+
+                if (true == spriteSheetFullPath.isEmpty())
+                {
+                    clearSpriteSheet(iconId);
+                }
+                else
+                {
+                    /* Don't use the return value, because there may be no bitmap
+                     * or sprite sheet available yet.
+                     */
+                    (void)loadSpriteSheet(iconId, spriteSheetFullPath);
+                }
+
+                isSuccessful = true;
+            }
         }
     }
     else
@@ -229,12 +292,12 @@ bool ThreeIconPlugin::hasTopicChanged(const String& topic)
         bool        status              = Util::strToUInt8(iconIdStr, iconId);
 
         if ((true == status) &&
-            (MAX_ICONS > iconId) &&
-            (false != m_isSpriteSheetAvailable[iconId]))
+            (MAX_ICONS > iconId))
         {
             MutexGuard<MutexRecursive> guard(m_mutex);
 
-            m_hasTopicChanged = false;
+            hasTopicChanged             = m_hasTopicChanged[iconId];
+            m_hasTopicChanged[iconId]   = false;
         }
     }
 
@@ -259,18 +322,25 @@ bool ThreeIconPlugin::isUploadAccepted(const String& topic, const String& srcFil
 
             isAccepted = true;
         }
+    }
+    else if (0U != topic.startsWith(String(TOPIC_SPRITESHEET) + "/"))
+    {
+        uint32_t    indexBeginIconId    = topic.lastIndexOf("/") + 1U;
+        String      iconIdStr           = topic.substring(indexBeginIconId);
+        uint8_t     iconId              = MAX_ICONS;
+        bool        status              = Util::strToUInt8(iconIdStr, iconId);
+
         /* Accept upload of a sprite sheet file. */
-        else if ( (false != status) && (0U != srcFilename.endsWith(FILE_EXT_SPRITE_SHEET)))
+        if ((false != status) && (0U != srcFilename.endsWith(FILE_EXT_SPRITE_SHEET)))
         {
             dstFilename = getFileName(iconId, FILE_EXT_SPRITE_SHEET);
 
             isAccepted = true;
         }
-        else
-        {
-            /* Not accepted. */
-            ;
-        }
+    }
+    else
+    {
+        ;
     }
 
     return isAccepted;
@@ -286,21 +356,34 @@ void ThreeIconPlugin::start(uint16_t width, uint16_t height)
 
     for(iconId = 0U; iconId < MAX_ICONS; ++iconId)
     { 
-        int16_t x = (ICON_WIDTH + DISTANCE) * iconId + DISTANCE;
+        int16_t x                   = (ICON_WIDTH + DISTANCE) * iconId + DISTANCE;
+        String bitmapFullPath       = getFileName(iconId, FILE_EXT_BITMAP);
+        String spriteSheetFullPath  = getFileName(iconId, FILE_EXT_SPRITE_SHEET);
 
-        (void)m_threeIconCanvas.addWidget(m_bitmapWidget[iconId]);
-        m_bitmapWidget[iconId].move(x, 0);
-    
-        /* If there is already an icon in the filesystem for the respective icon-slot, it will be loaded.
-         * First check whether it is a animated sprite sheet and if not, try
-         * to load just a bitmap image.
+        (void)m_threeIconCanvas.addWidget(m_bitmapWidgets[iconId]);
+        m_bitmapWidgets[iconId].move(x, 0);
+
+        /* If there is an icon in the filesystem with the plugin UID as filename,
+         * it will be loaded. First check whether it is a animated sprite sheet
+         * and if not, try to load just a bitmap image.
          */
-        m_isSpriteSheetAvailable[iconId] = m_bitmapWidget[iconId].loadSpriteSheet(FILESYSTEM, getFileName(iconId, FILE_EXT_SPRITE_SHEET), getFileName(iconId, FILE_EXT_BITMAP));
+        m_iconPaths[iconId].clear();
+        m_spriteSheetPaths[iconId].clear();
 
-        if (false == m_isSpriteSheetAvailable[iconId])
-        {   
-            (void)m_bitmapWidget[iconId].load(FILESYSTEM, getFileName(iconId, FILE_EXT_BITMAP));
+        if (false == m_bitmapWidgets[iconId].loadSpriteSheet(FILESYSTEM, spriteSheetFullPath, bitmapFullPath))
+        {
+            if (true == m_bitmapWidgets[iconId].load(FILESYSTEM, bitmapFullPath))
+            {
+                m_iconPaths[iconId] = bitmapFullPath;
+            }
+        }
+        else
+        {
+            m_iconPaths[iconId]         = bitmapFullPath;
+            m_spriteSheetPaths[iconId]  = spriteSheetFullPath;
         }
+
+        m_hasTopicChanged[iconId] = true;
     }
 }
 
@@ -310,15 +393,18 @@ void ThreeIconPlugin::stop()
     MutexGuard<MutexRecursive>  guard(m_mutex);
 
     for(iconId = 0U; iconId < MAX_ICONS; ++iconId)
-    { 
-        if (false != FILESYSTEM.remove(getFileName(iconId, FILE_EXT_BITMAP)))
+    {
+        String bitmapFullPath       = getFileName(iconId, FILE_EXT_BITMAP);
+        String spriteSheetFullPath  = getFileName(iconId, FILE_EXT_SPRITE_SHEET);
+
+        if (false != FILESYSTEM.remove(bitmapFullPath))
         {
-            LOG_INFO("File %s removed", getFileName(iconId, FILE_EXT_BITMAP).c_str());
+            LOG_INFO("File %s removed", bitmapFullPath.c_str());
         }
 
-        if (false != FILESYSTEM.remove(getFileName(iconId, FILE_EXT_SPRITE_SHEET)))
+        if (false != FILESYSTEM.remove(spriteSheetFullPath))
         {
-            LOG_INFO("File %s removed", getFileName(iconId, FILE_EXT_SPRITE_SHEET).c_str());
+            LOG_INFO("File %s removed", spriteSheetFullPath.c_str());
         }
     }
 }
@@ -331,7 +417,7 @@ void ThreeIconPlugin::update(YAGfx& gfx)
     m_threeIconCanvas.update(gfx);
 }
 
-bool ThreeIconPlugin::loadBitmap(const String& filename, uint8_t iconId)
+bool ThreeIconPlugin::loadBitmap(uint8_t iconId, const String& filename)
 {
     bool status = false;
 
@@ -339,35 +425,43 @@ bool ThreeIconPlugin::loadBitmap(const String& filename, uint8_t iconId)
     {
         MutexGuard<MutexRecursive> guard(m_mutex);
 
-        if (0U != filename.endsWith(FILE_EXT_BITMAP))
+        if (m_iconPaths[iconId] != filename)
         {
-            status = m_bitmapWidget[iconId].load(FILESYSTEM, filename);
-
-            /* Ensure that only the bitmap image file exists in the filesystem,
-             * otherwise after a restart, the obsolete sprite sheet will
-             * be loaded.
-             */
-            if (false != status)
-            {
-                (void)FILESYSTEM.remove(getFileName(iconId, FILE_EXT_SPRITE_SHEET));
+            m_iconPaths[iconId]         = filename;
+            m_hasTopicChanged[iconId]   = true;
+        }
 
-                m_isSpriteSheetAvailable[iconId] = false;
-            }
+        if (false == m_spriteSheetPaths->isEmpty())
+        {
+            status = m_bitmapWidgets[iconId].loadSpriteSheet(FILESYSTEM, m_spriteSheetPaths[iconId], m_iconPaths[iconId]);
         }
-        else if (0U != filename.endsWith(FILE_EXT_SPRITE_SHEET))
+
+        if (false == status)
         {
-            String bmpFilename = filename;
+            status = m_bitmapWidgets[iconId].load(FILESYSTEM, m_iconPaths[iconId]);
+        }
+    }
 
-            bmpFilename.replace(FILE_EXT_SPRITE_SHEET, FILE_EXT_BITMAP);
+    return status;
+}
+
+bool ThreeIconPlugin::loadSpriteSheet(uint8_t iconId, const String& filename)
+{
+    bool status = false;
+
+    if (MAX_ICONS > iconId)
+    {
+        MutexGuard<MutexRecursive> guard(m_mutex);
 
-            status = m_bitmapWidget[iconId].loadSpriteSheet(FILESYSTEM, filename,  bmpFilename);
-            
-            m_isSpriteSheetAvailable[iconId] = status;
+        if (m_spriteSheetPaths[iconId] != filename)
+        {
+            m_spriteSheetPaths[iconId]  = filename;
+            m_hasTopicChanged[iconId]   = true;
         }
-        else
+
+        if (false == m_iconPaths[iconId].isEmpty())
         {
-            /* Not supported. */
-            ;
+            status = m_bitmapWidgets[iconId].loadSpriteSheet(FILESYSTEM, m_spriteSheetPaths[iconId], m_iconPaths[iconId]);
         }
     }
 
@@ -381,7 +475,7 @@ bool ThreeIconPlugin::getIsForward(uint8_t iconId) const
 
     if (MAX_ICONS > iconId)
     {
-        state = m_bitmapWidget[iconId].isSpriteSheetForward();
+        state = m_bitmapWidgets[iconId].isSpriteSheetForward();
     }
     
     return state;
@@ -393,11 +487,11 @@ void ThreeIconPlugin::setIsForward(uint8_t iconId, bool state)
 
     if (MAX_ICONS > iconId)
     {
-        if (state != m_bitmapWidget[iconId].isSpriteSheetForward())
+        if (state != m_bitmapWidgets[iconId].isSpriteSheetForward())
         {
-            m_bitmapWidget[iconId].setSpriteSheetForward(state);
+            m_bitmapWidgets[iconId].setSpriteSheetForward(state);
 
-            m_hasTopicChanged = true;
+            m_hasTopicChanged[iconId] = true;
         }
     }
 }
@@ -409,7 +503,7 @@ bool ThreeIconPlugin::getIsRepeat(uint8_t iconId) const
 
     if (MAX_ICONS > iconId)
     {
-        state = m_bitmapWidget[iconId].isSpriteSheetRepeatInfinite();
+        state = m_bitmapWidgets[iconId].isSpriteSheetRepeatInfinite();
     }
     
     return state;
@@ -421,11 +515,11 @@ void ThreeIconPlugin::setIsRepeat(uint8_t iconId, bool state)
 
     if (MAX_ICONS > iconId)
     {
-        if (state != m_bitmapWidget[iconId].isSpriteSheetRepeatInfinite())
+        if (state != m_bitmapWidgets[iconId].isSpriteSheetRepeatInfinite())
         {
-            m_bitmapWidget[iconId].setSpriteSheetRepeatInfinite(state);
+            m_bitmapWidgets[iconId].setSpriteSheetRepeatInfinite(state);
 
-            m_hasTopicChanged = true;
+            m_hasTopicChanged[iconId] = true;
         }
     }
 }
@@ -436,15 +530,53 @@ void ThreeIconPlugin::clearBitmap(uint8_t iconId)
     {
         MutexGuard<MutexRecursive> guard(m_mutex);
 
-         m_bitmapWidget[iconId].clear(ColorDef::BLACK);
+        if (false == m_iconPaths[iconId].isEmpty())
+        {
+            m_iconPaths[iconId].clear();
+            m_bitmapWidgets[iconId].clear(ColorDef::BLACK);
+
+            m_hasTopicChanged[iconId] = true;
+        }
+    }
+}
+
+void ThreeIconPlugin::clearSpriteSheet(uint8_t iconId)
+{
+    if (MAX_ICONS > iconId)
+    {
+        MutexGuard<MutexRecursive> guard(m_mutex);
+
+        if (false == m_spriteSheetPaths[iconId].isEmpty())
+        {
+            m_spriteSheetPaths[iconId].clear();
+
+            m_hasTopicChanged[iconId] = true;
+        }
+
+        if (false == m_iconPaths[iconId].isEmpty())
+        {
+            (void)m_bitmapWidgets[iconId].load(FILESYSTEM, m_iconPaths[iconId]);
+        }
+    }
+}
+
+void ThreeIconPlugin::getIconFilePath(uint8_t iconId, String& fullPath) const
+{
+    if (MAX_ICONS > iconId)
+    {
+        MutexGuard<MutexRecursive> guard(m_mutex);
+
+        fullPath = m_iconPaths[iconId];
+    }
+}
 
-         (void)FILESYSTEM.remove(getFileName(iconId, FILE_EXT_BITMAP));
+void ThreeIconPlugin::getSpriteSheetFilePath(uint8_t iconId, String& fullPath) const
+{
+    if (MAX_ICONS > iconId)
+    {
+        MutexGuard<MutexRecursive> guard(m_mutex);
 
-         if (true == m_isSpriteSheetAvailable[iconId])
-         {
-            (void)FILESYSTEM.remove(getFileName(iconId, FILE_EXT_SPRITE_SHEET));
-            m_isSpriteSheetAvailable[iconId] = false;
-         }
+        fullPath = m_spriteSheetPaths[iconId];
     }
 }
 
diff --git a/lib/ThreeIconPlugin/src/ThreeIconPlugin.h b/lib/ThreeIconPlugin/src/ThreeIconPlugin.h
index 4c0bea50..b257d508 100644
--- a/lib/ThreeIconPlugin/src/ThreeIconPlugin.h
+++ b/lib/ThreeIconPlugin/src/ThreeIconPlugin.h
@@ -25,7 +25,7 @@
     DESCRIPTION
 *******************************************************************************/
 /**
- * @brief Three icon plugin
+ * @brief  Three icon plugin
  * @author Yann Le Glaz <yann_le@web.de>
  *
  * @addtogroup plugin
@@ -74,11 +74,12 @@ class ThreeIconPlugin : public Plugin
     ThreeIconPlugin(const String& name, uint16_t uid) :
         Plugin(name, uid),
         m_threeIconCanvas(),
-        m_bitmapWidget(),
-        m_isSpriteSheetAvailable{false},
+        m_bitmapWidgets(),
+        m_iconPaths(),
+        m_spriteSheetPaths(),
         m_isUploadError(false),
         m_mutex(),
-        m_hasTopicChanged(false)
+        m_hasTopicChanged()
     {
         (void)m_mutex.create();
     }
@@ -101,7 +102,7 @@ class ThreeIconPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new ThreeIconPlugin(name, uid);
+        return new(std::nothrow)ThreeIconPlugin(name, uid);
     }
 
     /**
@@ -154,7 +155,7 @@ class ThreeIconPlugin : public Plugin
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
     
     /**
      * Is the topic content changed since last time?
@@ -207,19 +208,26 @@ class ThreeIconPlugin : public Plugin
     void update(YAGfx& gfx) final;
 
     /**
-     * Load bitmap or spritesheet from filesystem and show it on the icon position by
-     * icon id.
-     * 
-     * If a animation is required, upload first the bitmap and then the spritesheet.
-     * Because a bitmap upload will remove any spritesheet. This behaviour is necessary
-     * to show only bitmaps too.
+     * Load bitmap image from filesystem. If a sprite sheet is available, the
+     * bitmap will be automatically used as texture for animation.
+     *
+     * @param[in] iconId    The icon id.
+     * @param[in] filename  Bitmap image filename.
+     *
+     * @return If successul, it will return true otherwise false.
+     */
+    bool loadBitmap(uint8_t iconId, const String& filename);
+
+    /**
+     * Load sprite sheet from filesystem. If a bitmap is available, it will
+     * be automatically used as texture for animation.
      *
-     * @param[in] filename  Bitmap filename.
      * @param[in] iconId    The icon id.
+     * @param[in] filename  Sprite sheet filename.
      *
      * @return If successul, it will return true otherwise false.
      */
-    bool loadBitmap(const String& filename, uint8_t iconId);
+    bool loadSpriteSheet(uint8_t iconId, const String& filename);
 
     /**
      * Get the state of the FORWARD control flag of an icon.
@@ -262,6 +270,29 @@ class ThreeIconPlugin : public Plugin
      */
     void clearBitmap(uint8_t iconId);
 
+    /**
+     * Clear sprite sheet by icon id.
+     * 
+     * @param[in] iconId The icon id. 
+     */
+    void clearSpriteSheet(uint8_t iconId);
+
+    /**
+     * Get icon file path by icon id.
+     * 
+     * @param[in]   iconId      The icon id. 
+     * @param[out]  fullPath    Path to icon file.
+     */
+    void getIconFilePath(uint8_t iconId, String& fullPath) const;
+
+    /**
+     * Get sprite sheet file path by icon id.
+     * 
+     * @param[in]   iconId      The icon id. 
+     * @param[out]  fullPath    Path to sprite sheet file.
+     */
+    void getSpriteSheetFilePath(uint8_t iconId, String& fullPath) const;
+
 private:
 
     /**
@@ -269,6 +300,11 @@ class ThreeIconPlugin : public Plugin
      */
     static const char*      TOPIC_BITMAP;
 
+    /**
+     * Plugin topic, used for parameter exchange.
+     */
+    static const char*      TOPIC_SPRITESHEET;
+
    /**
      * Plugin topic, used for only for animation control in case a spritesheet
      * with texture is loaded.
@@ -301,12 +337,13 @@ class ThreeIconPlugin : public Plugin
     static const char*      FILE_EXT_SPRITE_SHEET;
 
 
-    WidgetGroup             m_threeIconCanvas;                      /**< Canvas used for the bitmap widget. */
-    BitmapWidget            m_bitmapWidget[MAX_ICONS];              /**< Bitmap widget, used to show the icon. */
-    bool                    m_isSpriteSheetAvailable[MAX_ICONS];    /**< Flag to indicate whether a spritesheet is used or just a bitmap. */
-    bool                    m_isUploadError;                        /**< Flag to signal a upload error. */
-    mutable MutexRecursive  m_mutex;                                /**< Mutex to protect against concurrent access. */
-    bool                    m_hasTopicChanged;                      /**< Has the topic content changed? */
+    WidgetGroup             m_threeIconCanvas;              /**< Canvas used for the bitmap widget. */
+    BitmapWidget            m_bitmapWidgets[MAX_ICONS];     /**< Bitmap widgets, used to show the icon. */
+    String                  m_iconPaths[MAX_ICONS];         /**< Full path to icons. */
+    String                  m_spriteSheetPaths[MAX_ICONS];  /**< Full path to spritesheets. */
+    bool                    m_isUploadError;                /**< Flag to signal a upload error. */
+    mutable MutexRecursive  m_mutex;                        /**< Mutex to protect against concurrent access. */
+    bool                    m_hasTopicChanged[MAX_ICONS];  /**< Has the topic content changed? */
 
     /**
      * Get image filename with path.
diff --git a/lib/ThreeIconPlugin/web/ThreeIconPlugin.html b/lib/ThreeIconPlugin/web/ThreeIconPlugin.html
index a9de0220..94a18cb3 100644
--- a/lib/ThreeIconPlugin/web/ThreeIconPlugin.html
+++ b/lib/ThreeIconPlugin/web/ThreeIconPlugin.html
@@ -67,21 +67,21 @@ <h3 class="mt-1">Clear icon</h3>
                     <li>STATE: <code>true</code> or <code>false</code></li>
                 </ul>
                 <h3 class="mt-1">Control animation (Sprite Sheet required)</h3>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/animation/&lt;ICON-ID&gt;?forward=&lt;STATE&gt;</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/animation/&lt;ICON-ID&gt;?forward=&lt;STATE&gt;</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/animation/&lt;ICON-ID&gt;?repeat=&lt;STATE&gt;</code></pre>
-                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/animation/&lt;ICON-ID&gt;?repeat=&lt;STATE&gt;</code></pre>
-
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/animation/&lt;ICON-ID&gt;?forward=&lt;STATE&gt;&AMP;ICONFULLPATH=&lt;ICON-FULL-PATH&gt;&AMP;SPRITESHEETFULLPATH=&lt;SPRITESHEET-FULL-PATH&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/animation/&lt;ICON-ID&gt;?forward=&lt;STATE&gt;&AMP;ICONFULLPATH=&lt;ICON-FULL-PATH&gt;&AMP;SPRITESHEETFULLPATH=&lt;SPRITESHEET-FULL-PATH&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/uid/&lt;PLUGIN-UID&gt;/animation/&lt;ICON-ID&gt;?repeat=&lt;STATE&gt;&AMP;ICONFULLPATH=&lt;ICON-FULL-PATH&gt;&AMP;SPRITESHEETFULLPATH=&lt;SPRITESHEET-FULL-PATH&gt;</code></pre>
+                <pre name="injectOrigin" class="text-light"><code>POST {{ORIGIN}}/rest/api/v1/display/alias/&lt;PLUGIN-ALIAS&gt;/animation/&lt;ICON-ID&gt;?repeat=&lt;STATE&gt;&AMP;ICONFULLPATH=&lt;ICON-FULL-PATH&gt;&AMP;SPRITESHEETFULLPATH=&lt;SPRITESHEET-FULL-PATH&gt;</code></pre>
                 <ul>
                     <li>PLUGIN-UID: The plugin unique id.</li>
                     <li>PLUGIN-ALIAS: The plugin alias name.</li>
                     <li>ICON-ID: The id of the icon (starting with 0 from left).</li>
                     <li>STATE: <code>true</code> or <code>false</code></li>
+                    <li>ICON-FULL-PATH: Full path to the icon.</li>
+                    <li>SPRITESHEET-FULL-PATH: Full path to the sprite sheet.</li>
                 </ul>
                 <h2 class="mt-2">Configuration</h2>
-                <h3 class="mt-1">Bitmap/Sprite sheet</h3>
-                <h4 class="mt-1">Set Icon</h4>
-                <form id="setIconForm" enctype="multipart/form-data" action="javascript:setIconByForm('setIconForm')">
+                <h3 class="mt-1">Icon</h3>
+                <form id="setIconForm" enctype="multipart/form-data" action="javascript:uploadIconByForm('setIconForm')">
                     <div class="form-group">
                         <label for="pluginUidBitmap">Plugin UID:</label>
                         <select id="pluginUidBitmap" name="pluginUid" size="1">
@@ -97,11 +97,32 @@ <h4 class="mt-1">Set Icon</h4>
                     </div>
                     <div class="form-group">
                         <label for="bitmap">Icon:</label>
-                        <input id="fileBitmap" name="file" type="file" />    
+                        <input id="bitmap" name="bitmap" type="file" accept=".bmp" />    
                     </div>
                     <input name="submit" type="submit" value="Update"/>
                 </form>
-                <h4 class="mt-1">Clear Icon</h4>
+                <h3 class="mt-1">Sprite sheet</h3>
+                <form id="setSpriteSheetForm" enctype="multipart/form-data" action="javascript:uploadSpriteSheetByForm('setSpriteSheetForm')">
+                    <div class="form-group">
+                        <label for="pluginUidSpriteSheet">Plugin UID:</label>
+                        <select id="pluginUidSpriteSheet" name="pluginUid" size="1">
+                        </select>    
+                    </div>
+                    <div class="form-group">
+                        <label for="spriteSheetPosBitmap">Sprite sheet position:</label>
+                        <select id="spriteSheetPosBitmap" name="spriteSheetPos" size="1">
+                            <option value="0" selected>Left</option>
+                            <option value="1">Middle</option>
+                            <option value="2">Right</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="spriteSheet">Sprite sheet:</label>
+                        <input id="spriteSheet" name="spriteSheet" type="file" accept=".sprite" />    
+                    </div>
+                    <input name="submit" type="submit" value="Update"/>
+                </form>
+                <h4 class="mt-1">Clear Icon/Sprite sheet</h4>
                 <form id="clearIconForm" enctype="multipart/form-data" action="javascript:clearIconByForm('clearIconForm')">
                     <div class="form-group">
                         <label for="pluginUidClearIcon">Plugin UID:</label>
@@ -145,7 +166,15 @@ <h3 class="mt-1">Animation configuration</h3>
                         <select id="repeatAnimation" name="repeat" size="1">
                             <option>false</option>
                             <option>true</option>
-                        </select>    
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="iconFullPath">Icon full path:</label>
+                        <input type="text" id="iconFullPath" name="iconFullPath" value="" size="40" />    
+                    </div>
+                    <div class="form-group">
+                        <label for="spriteSheetFullPath">Sprite sheet full path:</label>
+                        <input type="text" id="spriteSheetFullPath" name="spriteSheetFullPath" value="" size="40" />    
                     </div>
                     <input name="submit" type="submit" value="Update"/>
                 </form>
@@ -179,11 +208,13 @@ <h3 class="mt-1">Animation configuration</h3>
 
             function enableUI() {
                 utils.enableForm("setIconForm", true);
+                utils.enableForm("setSpriteSheetForm", true);
                 utils.enableForm("myFormAnimation", true);
             }
 
             function disableUI() {
                 utils.enableForm("setIconForm", false);
+                utils.enableForm("setSpriteSheetForm", false);
                 utils.enableForm("myFormAnimation", false);
             }
 
@@ -230,11 +261,11 @@ <h3 class="mt-1">Animation configuration</h3>
                 });
             };
 
-            function setIconByForm(formId) {
+            function uploadIconByForm(formId) {
                 var values = $("#" + formId).serializeAllArray();
                 var pluginUid = 0;
                 var index = 255;
-                var file = $("#fileBitmap").prop("files")[0]
+                var file = $("#bitmap").prop("files")[0]
                 
                 $.each(values, function(idx, field) {
                     if (field.name === "pluginUid") {
@@ -249,12 +280,62 @@ <h3 class="mt-1">Animation configuration</h3>
                 setIcon(pluginUid, file, index);
             }
 
+            function uploadSpriteSheetByForm(formId) {
+                var values = $("#" + formId).serializeAllArray();
+                var pluginUid = 0;
+                var index = 255;
+                var file = $("#spriteSheet").prop("files")[0]
+                
+                $.each(values, function(idx, field) {
+                    if (field.name === "pluginUid") {
+                        pluginUid = field.value;
+                    } else if (field.name === "spriteSheetPos") {
+                        index = field.value;
+                    } else {
+                        /* Skip. */
+                    }
+                });
+
+                setSpriteSheet(pluginUid, file, index);
+            }
+
             function setIcon(pluginUid, file, index) {
                 disableUI();
 
+                return utils.checkBMPFile(file).then(function() {
+                    return utils.makeRequest({
+                        method: "POST",
+                        url: "/rest/api/v1/display/uid/" + pluginUid + "/bitmap/" + index,
+                        isJsonResponse: true,
+                        parameter: {
+                            file: file
+                        },
+                        headers: {
+                            "X-File-Size": file.size
+                        }
+                    });
+                }).then(function(rsp) {
+                    updateForms();
+                    alert("Ok.");
+                }).catch(function(rsp) {
+                    if ("string" === typeof rsp) {
+                        alert("Error: " + rsp);
+                    } else if (("undefined" !== typeof rsp) && ("undefined" !== typeof rsp.error) && ("string" === typeof rsp.error.msg)) {
+                        alert("Error: " + rsp.error.msg);
+                    } else {
+                        alert("Failed.");
+                    }
+                }).finally(function() {
+                    enableUI();
+                });
+            }
+
+            function setSpriteSheet(pluginUid, file, index) {
+                disableUI();
+
                 return utils.makeRequest({
                     method: "POST",
-                    url: "/rest/api/v1/display/uid/" + pluginUid + "/bitmap/" + index,
+                    url: "/rest/api/v1/display/uid/" + pluginUid + "/spritesheet/" + index,
                     isJsonResponse: true,
                     parameter: {
                         file: file
@@ -263,9 +344,14 @@ <h3 class="mt-1">Animation configuration</h3>
                         "X-File-Size": file.size
                     }
                 }).then(function(rsp) {
+                    updateForms();
                     alert("Ok.");
                 }).catch(function(rsp) {
-                    alert("Failed.");
+                    if (("undefined" !== typeof rsp.error) && ("string" === typeof rsp.error.msg)) {
+                        alert("Error: " + rsp.error.msg);
+                    } else {
+                        alert("Failed.");
+                    }
                 }).finally(function() {
                     enableUI();
                 });
@@ -294,15 +380,21 @@ <h3 class="mt-1">Animation configuration</h3>
 
                 return utils.makeRequest({
                     method: "POST",
-                    url: "/rest/api/v1/display/uid/" + pluginUid + "/bitmap/" + index,
+                    url: "/rest/api/v1/display/uid/" + pluginUid + "/animation/" + index,
                     isJsonResponse: true,
                     parameter: {
-                        clear: true
+                        iconFullPath: "",
+                        spriteSheetFullPath: ""
                     }
                 }).then(function(rsp) {
+                    updateForms();
                     alert("Ok.");
                 }).catch(function(rsp) {
-                    alert("Failed.");
+                    if (("undefined" !== typeof rsp.error) && ("string" === typeof rsp.error.msg)) {
+                        alert("Error: " + rsp.error.msg);
+                    } else {
+                        alert("Failed.");
+                    }
                 }).finally(function() {
                     enableUI();
                 });
@@ -335,6 +427,8 @@ <h3 class="mt-1">Animation configuration</h3>
                 }).then(function(rsp) {
                     var forwardElement = document.getElementById("forwardAnimation");
                     var repeatElement = document.getElementById("repeatAnimation");
+                    var iconFullPathInput = document.getElementById("iconFullPath");
+                    var spriteSheetFullPathInput = document.getElementById("spriteSheetFullPath");
 
                     if (false == rsp.data.forward) {
                         forwardElement.selectedIndex = 0;
@@ -348,6 +442,9 @@ <h3 class="mt-1">Animation configuration</h3>
                         repeatElement.selectedIndex = 1;
                     }
 
+                    iconFullPathInput.value = rsp.data.iconFullPath;
+                    spriteSheetFullPathInput.value = rsp.data.spriteSheetFullPath;
+
                 }).catch(function(rsp) {
                     alert("Internal error.");
                 }).finally(function() {
@@ -361,6 +458,8 @@ <h3 class="mt-1">Animation configuration</h3>
                 var index = 255;
                 var isForward = false;
                 var isRepeat = false;
+                var iconFullPath = "";
+                var spriteSheetFullPath = "";
 
                 $.each(values, function(idx, field) {
                     if (field.name === "pluginUid") {
@@ -371,15 +470,19 @@ <h3 class="mt-1">Animation configuration</h3>
                         isForward = field.value;
                     } else if (field.name === "repeat") {
                         isRepeat = field.value;
+                    } else if (field.name === "iconFullPath") {
+                        iconFullPath = field.value;
+                    } else if (field.name === "spriteSheetFullPath") {
+                        spriteSheetFullPath = field.value;
                     } else {
                         /* Skip. */
                     }
                 });
 
-                setAnimation(pluginUid, isForward, isRepeat, index);
+                setAnimation(pluginUid, isForward, isRepeat, iconFullPath, spriteSheetFullPath, index);
             }
 
-            function setAnimation(pluginUid, isForward, isRepeat, index) {
+            function setAnimation(pluginUid, isForward, isRepeat, iconFullPath, spriteSheetFullPath, index) {
                 disableUI();
 
                 return utils.makeRequest({
@@ -388,7 +491,9 @@ <h3 class="mt-1">Animation configuration</h3>
                     isJsonResponse: true,
                     parameter: {
                         forward: isForward,
-                        repeat: isRepeat
+                        repeat: isRepeat,
+                        iconFullPath: iconFullPath,
+                        spriteSheetFullPath: spriteSheetFullPath
                     }
                 }).then(function(rsp) {
                     alert("Ok.");
@@ -399,6 +504,15 @@ <h3 class="mt-1">Animation configuration</h3>
                 });
             }
 
+            function updateForms() {
+                var selectText = document.getElementById("pluginUidAnimation");
+
+                if (0 <= selectText.selectedIndex) {
+
+                    return getAnimationByForm('myFormAnimation');
+                }
+            }
+
             (function ($) {
                 $.fn.serializeAllArray = function () {
                     var data = $(this).serializeArray();
diff --git a/lib/TopicHandlerService/src/TopicHandlerService.cpp b/lib/TopicHandlerService/src/TopicHandlerService.cpp
index 3f5db9bd..92492baf 100644
--- a/lib/TopicHandlerService/src/TopicHandlerService.cpp
+++ b/lib/TopicHandlerService/src/TopicHandlerService.cpp
@@ -57,28 +57,22 @@
  * Local Variables
  *****************************************************************************/
 
+/* Initialize static values. */
+const char* TopicHandlerService::DEFAULT_ACCESS = "rw";
+
 /******************************************************************************
  * Public Methods
  *****************************************************************************/
 
 bool TopicHandlerService::start()
 {
-    bool isSuccessful = true;
-
     startAllHandlers();
 
     m_onChangeTimer.start(ON_CHANGE_PERIOD);
 
-    if (false == isSuccessful)
-    {
-        stop();
-    }
-    else
-    {
-        LOG_INFO("Topic handler service started.");
-    }
+    LOG_INFO("Topic handler service started.");
 
-    return isSuccessful;
+    return true;
 }
 
 void TopicHandlerService::stop()
@@ -101,25 +95,34 @@ void TopicHandlerService::process()
     }
 }
 
-void TopicHandlerService::registerTopics(IPluginMaintenance* plugin)
+void TopicHandlerService::registerTopics(const String& deviceId, IPluginMaintenance* plugin)
 {
-    if (nullptr != plugin)
+    if ((false == deviceId.isEmpty()) &&
+        (nullptr != plugin))
     {
-        const size_t        JSON_DOC_SIZE   = 512U;
+        const size_t        JSON_DOC_SIZE   = 1024U;
         DynamicJsonDocument topicsDoc(JSON_DOC_SIZE);
         JsonArray           jsonTopics      = topicsDoc.createNestedArray("topics");
 
         /* Get topics from plugin. */
         plugin->getTopics(jsonTopics);
 
+        if (true == topicsDoc.overflowed())
+        {
+            LOG_ERROR("JSON document has less memory available.");
+        }
+
         /* Handle each topic */
         if (0U < jsonTopics.size())
         {
             for (JsonVariantConst jsonTopic : jsonTopics)
             {
-                String                  topicName;
-                ITopicHandler::Access   topicAccess = DEFAULT_ACCESS;
-                JsonObjectConst         extra;
+                String                          topicName;
+                JsonObjectConst                 extra;
+                String                          topicAccess     = DEFAULT_ACCESS;
+                ITopicHandler::GetTopicFunc     getTopicFunc    = nullptr;
+                ITopicHandler::SetTopicFunc     setTopicFunc    = nullptr;
+                ITopicHandler::UploadReqFunc    uploadReqFunc   = nullptr;
 
                 /* Topic specific parameter available? */
                 if (true == jsonTopic.is<JsonObjectConst>())
@@ -134,7 +137,7 @@ void TopicHandlerService::registerTopics(IPluginMaintenance* plugin)
 
                     if (true == jsonTopicAccess.is<String>())
                     {
-                        topicAccess = strToAccess(jsonTopicAccess.as<String>());
+                        topicAccess = jsonTopicAccess.as<String>();
                     }
 
                     extra = jsonTopic;
@@ -149,16 +152,31 @@ void TopicHandlerService::registerTopics(IPluginMaintenance* plugin)
                     /* Skip */
                     ;
                 }
-                
-                registerTopic(plugin, topicName, topicAccess, extra);
+
+                if (false == topicName.isEmpty())
+                {
+                    strToAccess(plugin, topicAccess, getTopicFunc, setTopicFunc, uploadReqFunc);
+                    
+                    /* Register plugin topic with plugin UID as entity id. */
+                    registerTopic(deviceId, getEntityIdByPluginUid(plugin->getUID()), topicName, extra, getTopicFunc, nullptr, setTopicFunc, uploadReqFunc);
+
+                    /* Register plugin topic with plugin alias as entity id (if possible). */
+                    if (false == plugin->getAlias().isEmpty())
+                    {
+                        registerTopic(deviceId, getEntityIdByPluginAlias(plugin->getAlias()), topicName, extra, getTopicFunc, nullptr, setTopicFunc, uploadReqFunc);
+                    }
+
+                    addToPluginMetaDataList(deviceId, plugin, topicName);
+                }
             }
         }
     }
 }
 
-void TopicHandlerService::unregisterTopics(IPluginMaintenance* plugin)
+void TopicHandlerService::unregisterTopics(const String& deviceId, IPluginMaintenance* plugin)
 {
-    if (nullptr != plugin)
+    if ((false == deviceId.isEmpty()) &&
+        (nullptr != plugin))
     {
         const size_t        JSON_DOC_SIZE   = 512U;
         DynamicJsonDocument topicsDoc(JSON_DOC_SIZE);
@@ -194,57 +212,82 @@ void TopicHandlerService::unregisterTopics(IPluginMaintenance* plugin)
                     /* Skip */
                     ;
                 }
-                
-                unregisterTopic(plugin, topicName);
+
+                if (false == topicName.isEmpty())
+                {
+                    /* Unregister plugin topic with plugin UID as entity id. */
+                    unregisterTopic(deviceId, getEntityIdByPluginUid(plugin->getUID()), topicName);
+
+                    /* Unregister plugin topic with plugin UID as entity id (if possible). */
+                    if (false == plugin->getAlias().isEmpty())
+                    {
+                        unregisterTopic(deviceId, getEntityIdByPluginAlias(plugin->getAlias()), topicName);
+                    }
+
+                    removeFromPluginMetaDataList(deviceId, plugin);
+                }
             }
         }
     }
 }
 
-/******************************************************************************
- * Protected Methods
- *****************************************************************************/
-
-/******************************************************************************
- * Private Methods
- *****************************************************************************/
-
-void TopicHandlerService::registerTopic(IPluginMaintenance* plugin, const String& topic, ITopicHandler::Access access, JsonObjectConst& extra)
+void TopicHandlerService::registerTopic(const String& deviceId, const String& entityId, const String& topic, JsonObjectConst& extra, ITopicHandler::GetTopicFunc getTopicFunc, HasChangedFunc hasChangedFunc, ITopicHandler::SetTopicFunc setTopicFunc, ITopicHandler::UploadReqFunc uploadReqFunc)
 {
-    if ((nullptr != plugin) &&
+    if ((false == deviceId.isEmpty()) &&
+        (false == entityId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
-        uint8_t         idx                 = 0U;
-        uint8_t         count               = 0U;
-        ITopicHandler** topicHandlerList    = TopicHandlers::getList(count);
+        bool    isReadAccess    = false;
+        bool    isWriteAccess   = false;
 
-        /* Register topic by every known topic handler. */
-        while(count > idx)
+        /* Determine the kind of accessability. */
+        if (nullptr != getTopicFunc)
         {
-            ITopicHandler* handler = topicHandlerList[idx];
-
-            if (nullptr != handler)
-            {
-                handler->registerTopic(plugin, topic, access, extra);
-            }
+            isReadAccess = true;
+        }
 
-            ++idx;
+        if ((nullptr != setTopicFunc) &&
+            (nullptr != uploadReqFunc))
+        {
+            isWriteAccess = true;
         }
 
-        /* Store every readable topic in a list for automatic publishing
-         * on topic change.
-         */
-        if ((ITopicHandler::ACCESS_READ_ONLY == access) ||
-            (ITopicHandler::ACCESS_READ_WRITE == access))
+        if ((true == isReadAccess) ||
+            (true == isWriteAccess))
         {
-            addToList(plugin, topic);
+            uint8_t         idx                 = 0U;
+            uint8_t         count               = 0U;
+            ITopicHandler** topicHandlerList    = TopicHandlers::getList(count);
+
+            /* Register topic by every known topic handler. */
+            while(count > idx)
+            {
+                ITopicHandler* handler = topicHandlerList[idx];
+
+                if (nullptr != handler)
+                {
+                    handler->registerTopic(deviceId, entityId, topic, extra, getTopicFunc, setTopicFunc, uploadReqFunc);
+                }
+
+                ++idx;
+            }
+
+            /* Store every readable topic in a list for automatic publishing on topic change,
+             * except topics from plugins. They will be considered separately.
+             */
+            if ((true == isReadAccess) &&
+                (nullptr != hasChangedFunc))
+            {
+                addToTopicMetaDataList(deviceId, entityId, topic, hasChangedFunc);
+            }
         }
     }
 }
 
-void TopicHandlerService::unregisterTopic(IPluginMaintenance* plugin, const String& topic)
+void TopicHandlerService::unregisterTopic(const String& deviceId, const String& entityId, const String& topic)
 {
-    if ((nullptr != plugin) &&
+    if ((false == deviceId.isEmpty()) &&
+        (false == entityId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
         uint8_t         idx                 = 0U;
@@ -258,98 +301,211 @@ void TopicHandlerService::unregisterTopic(IPluginMaintenance* plugin, const Stri
 
             if (nullptr != handler)
             {
-                handler->unregisterTopic(plugin, topic);
+                handler->unregisterTopic(deviceId, entityId, topic);
             }
 
             ++idx;
         }
 
         /* If topic is stored for automatic publishing, it will be removed. */
-        removeFromList(plugin, topic);
+        removeFromTopicMetaDataList(deviceId, entityId, topic);
     }
 }
 
-ITopicHandler::Access TopicHandlerService::strToAccess(const String& strAccess) const
+/******************************************************************************
+ * Protected Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Private Methods
+ *****************************************************************************/
+
+String TopicHandlerService::getEntityIdByPluginUid(uint16_t uid)
 {
-    ITopicHandler::Access access = ITopicHandler::ACCESS_READ_ONLY;
+    return String("display/uid/") + uid;
+}
+
+String TopicHandlerService::getEntityIdByPluginAlias(const String& alias)
+{
+    return String("display/alias/") + alias;
+}
 
-    if (true == strAccess.equalsIgnoreCase("rw"))
+void TopicHandlerService::strToAccess(IPluginMaintenance* plugin, const String& strAccess, ITopicHandler::GetTopicFunc& getTopicFunc, ITopicHandler::SetTopicFunc& setTopicFunc, ITopicHandler::UploadReqFunc& uploadReqFunc) const
+{
+    if (nullptr != plugin)
     {
-        access = ITopicHandler::ACCESS_READ_WRITE;
+        bool isReadAccess = false;
+        bool isWriteAccess = false;
+
+        if (true == strAccess.equalsIgnoreCase("rw"))
+        {
+            /* Read/Write access */
+            isReadAccess    = true;
+            isWriteAccess   = true;
+        }
+        else if (true == strAccess.equalsIgnoreCase("w"))
+        {
+            /* Write only access */
+            isWriteAccess = true;
+        }
+        else
+        {
+            /* Read only access */
+            isReadAccess = true;
+        }
+
+        if (true == isReadAccess)
+        {
+            getTopicFunc =      [plugin](const String& topic, JsonObject& value) -> bool
+                                {
+                                    LOG_INFO("Get %s of plugin %u.", topic.c_str(), plugin->getUID());
+                                    return plugin->getTopic(topic, value);
+                                };
+        }
+
+        if (true == isWriteAccess)
+        {
+            setTopicFunc  =     [plugin](const String& topic, const JsonObjectConst& value) -> bool
+                                {
+                                    LOG_INFO("Set %s of plugin %u.", topic.c_str(), plugin->getUID());
+                                    return plugin->setTopic(topic, value);
+                                };
+
+            uploadReqFunc =     [plugin](const String& topic, const String& srcFilename, String& dstFilename) -> bool
+                                {
+                                    return plugin->isUploadAccepted(topic, srcFilename, dstFilename);
+                                };
+        }
     }
-    else if (true == strAccess.equalsIgnoreCase("w"))
+}
+
+void TopicHandlerService::addToTopicMetaDataList(const String& deviceId, const String& entityId, const String& topic, HasChangedFunc hasChangedFunc)
+{
+    if ((false == deviceId.isEmpty()) &&
+        (false == entityId.isEmpty()) &&
+        (false == topic.isEmpty()) &&
+        (nullptr != hasChangedFunc))
     {
-        access = ITopicHandler::ACCESS_WRITE_ONLY;
+        TopicMetaData* topicMetaData = new(std::nothrow) TopicMetaData();
+
+        if (nullptr != topicMetaData)
+        {
+            topicMetaData->deviceId         = deviceId;
+            topicMetaData->entityId         = entityId;
+            topicMetaData->topic            = topic;
+            topicMetaData->hasChangedFunc   = hasChangedFunc;
+
+            m_topicMetaDataList.push_back(topicMetaData);
+        }
     }
-    else
+}
+
+void TopicHandlerService::removeFromTopicMetaDataList(const String& deviceId, const String& entityId, const String& topic)
+{
+    TopicMetaDataList::iterator topicMetaDataListIt = m_topicMetaDataList.begin();
+
+    while(m_topicMetaDataList.end() != topicMetaDataListIt)
     {
-        /* Keep init value. */
-        ;
-    }
+        TopicMetaData* topicMetaData = *topicMetaDataListIt;
 
-    return access;
+        if ((nullptr != topicMetaData) &&
+            (deviceId == topicMetaData->deviceId) &&
+            (entityId == topicMetaData->entityId) &&
+            (topic == topicMetaData->topic))
+        {
+            topicMetaDataListIt = m_topicMetaDataList.erase(topicMetaDataListIt);
+            
+            delete topicMetaData;
+            topicMetaData = nullptr;
+        }
+        else
+        {
+            ++topicMetaDataListIt;
+        }
+    }
 }
 
-void TopicHandlerService::addToList(IPluginMaintenance* plugin, const String& topic)
+void TopicHandlerService::addToPluginMetaDataList(const String& deviceId, IPluginMaintenance* plugin, const String& topic)
 {
-    if ((nullptr != plugin) &&
+    if ((false == deviceId.isEmpty()) &&
+        (nullptr != plugin) &&
         (false == topic.isEmpty()))
     {
-        PluginTopic* pluginTopic = new(std::nothrow) PluginTopic();
+        PluginMetaData* pluginMetaData = new(std::nothrow) PluginMetaData();
 
-        if (nullptr != pluginTopic)
+        if (nullptr != pluginMetaData)
         {
-            pluginTopic->plugin = plugin;
-            pluginTopic->topic  = topic;
+            pluginMetaData->deviceId    = deviceId;
+            pluginMetaData->plugin      = plugin;
+            pluginMetaData->topic       = topic;
 
-            m_pluginTopicList.push_back(pluginTopic);
+            m_pluginMetaDataList.push_back(pluginMetaData);
         }
     }
 }
 
-void TopicHandlerService::removeFromList(IPluginMaintenance* plugin, const String& topic)
+void TopicHandlerService::removeFromPluginMetaDataList(const String& deviceId, IPluginMaintenance* plugin)
 {
-    if ((nullptr != plugin) &&
-        (false == topic.isEmpty()))
+    PluginMetaDataList::iterator pluginMetaDataListIt = m_pluginMetaDataList.begin();
+
+    while(m_pluginMetaDataList.end() != pluginMetaDataListIt)
     {
-        PluginTopicList::iterator pluginTopicListIt = m_pluginTopicList.begin();
+        PluginMetaData* pluginMetaData = *pluginMetaDataListIt;
 
-        while(m_pluginTopicList.end() != pluginTopicListIt)
+        if ((nullptr != pluginMetaData) &&
+            (deviceId == pluginMetaData->deviceId) &&
+            (plugin == pluginMetaData->plugin))
         {
-            PluginTopic* pluginTopic = *pluginTopicListIt;
-
-            if ((nullptr != pluginTopic) &&
-                (plugin == pluginTopic->plugin) &&
-                (topic == pluginTopic->topic))
-            {
-                pluginTopicListIt = m_pluginTopicList.erase(pluginTopicListIt);
-                
-                delete pluginTopic;
-                pluginTopic = nullptr;
-            }
-            else
-            {
-                ++pluginTopicListIt;
-            }
+            pluginMetaDataListIt = m_pluginMetaDataList.erase(pluginMetaDataListIt);
+            
+            delete pluginMetaData;
+            pluginMetaData = nullptr;
+        }
+        else
+        {
+            ++pluginMetaDataListIt;
         }
     }
 }
 
 void TopicHandlerService::processOnChange()
 {
-    PluginTopicList::iterator pluginTopicListIt = m_pluginTopicList.begin();
+    PluginMetaDataList::iterator    pluginMetaDataListIt    = m_pluginMetaDataList.begin();
+    TopicMetaDataList::iterator     topicMetaDataListIt     = m_topicMetaDataList.begin();
+    
+    /** Process all plugin related topics. */
+    while(m_pluginMetaDataList.end() != pluginMetaDataListIt)
+    {
+        PluginMetaData* pluginMetaData = *pluginMetaDataListIt;
+
+        if ((nullptr != pluginMetaData) &&
+            (nullptr != pluginMetaData->plugin) &&
+            (true == pluginMetaData->plugin->hasTopicChanged(pluginMetaData->topic)))
+        {
+            notifyAllHandlers(pluginMetaData->deviceId, getEntityIdByPluginUid(pluginMetaData->plugin->getUID()), pluginMetaData->topic);
 
-    while(m_pluginTopicList.end() != pluginTopicListIt)
+            if (false == pluginMetaData->plugin->getAlias().isEmpty())
+            {
+                notifyAllHandlers(pluginMetaData->deviceId, getEntityIdByPluginAlias(pluginMetaData->plugin->getAlias()), pluginMetaData->topic);
+            }
+        }
+
+        ++pluginMetaDataListIt;
+    }
+
+    /** Proces all topics which are independent from plugins. */
+    while(m_topicMetaDataList.end() != topicMetaDataListIt)
     {
-        PluginTopic* pluginTopic = *pluginTopicListIt;
+        TopicMetaData* topicMetaData = *topicMetaDataListIt;
 
-        if ((nullptr != pluginTopic) &&
-            (true == pluginTopic->plugin->hasTopicChanged(pluginTopic->topic)))
+        if ((nullptr != topicMetaData) &&
+            (nullptr != topicMetaData->hasChangedFunc) &&
+            (true == topicMetaData->hasChangedFunc(topicMetaData->topic)))
         {
-            notifyAllHandlers(pluginTopic->plugin, pluginTopic->topic);
+            notifyAllHandlers(topicMetaData->deviceId, topicMetaData->entityId, topicMetaData->topic);
         }
 
-        ++pluginTopicListIt;
+        ++topicMetaDataListIt;
     }
 }
 
@@ -410,10 +566,9 @@ void TopicHandlerService::processAllHandlers()
     }
 }
 
-void TopicHandlerService::notifyAllHandlers(IPluginMaintenance* plugin, const String& topic)
+void TopicHandlerService::notifyAllHandlers(const String& deviceId, const String& entityId, const String& topic)
 {
-    if ((nullptr != plugin) &&
-        (false == topic.isEmpty()))
+    if (false == topic.isEmpty())
     {
         uint8_t         idx                 = 0U;
         uint8_t         count               = 0U;
@@ -425,7 +580,7 @@ void TopicHandlerService::notifyAllHandlers(IPluginMaintenance* plugin, const St
 
             if (nullptr != handler)
             {
-                handler->notify(plugin, topic);
+                handler->notify(deviceId, entityId, topic);
             }
 
             ++idx;
diff --git a/lib/TopicHandlerService/src/TopicHandlerService.h b/lib/TopicHandlerService/src/TopicHandlerService.h
index 2ce7182a..528b2928 100644
--- a/lib/TopicHandlerService/src/TopicHandlerService.h
+++ b/lib/TopicHandlerService/src/TopicHandlerService.h
@@ -65,6 +65,9 @@ class TopicHandlerService : public IService
 {
 public:
 
+    /** Function prototype to check whether the topic content changed since last time. */
+    typedef std::function<bool(const String& topic)> HasChangedFunc;
+
     /**
      * Get the topic handler service instance.
      * 
@@ -95,37 +98,91 @@ class TopicHandlerService : public IService
     /**
      * Register all topics of the given plugin.
      * 
+     * @param[in] deviceId  The device id which represents the physical device.
      * @param[in] plugin    The plugin, which topics shall be registered.
      */
-    void registerTopics(IPluginMaintenance* plugin);
+    void registerTopics(const String& deviceId, IPluginMaintenance* plugin);
 
     /**
      * Unregister all topics of the given plugin.
      * 
+     * @param[in] deviceId  The device id which represents the physical device.
      * @param[in] plugin    The plugin, which topics to unregister.
      */
-    void unregisterTopics(IPluginMaintenance* plugin);
+    void unregisterTopics(const String& deviceId, IPluginMaintenance* plugin);
+
+    /**
+     * Register a topic.
+     * 
+     * @param[in] deviceId          The device id which represents the physical device.
+     * @param[in] entityId          The entity id which represents the entity of the device.
+     * @param[in] topic             The topic which to register.
+     * @param[in] extra             Extra JSON parameters for concrete topic handlers, which are pushed through.
+     * @param[in] getTopicFunc      Function which is called to read the topic.
+     * @param[in] hasChangedFunc    Function which is periodically called to check whether the topic has changed.
+     * @param[in] setTopicFunc      Function which is called to set the topic.
+     * @param[in] uploadReqFunc     Function which is called to accept a file upload or not.
+     */
+    void registerTopic(const String& deviceId, const String& entityId, const String& topic, JsonObjectConst& extra, ITopicHandler::GetTopicFunc getTopicFunc, HasChangedFunc hasChangedFunc, ITopicHandler::SetTopicFunc setTopicFunc, ITopicHandler::UploadReqFunc uploadReqFunc);
+
+    /**
+     * Unregister a topic.
+     * 
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
+     * @param[in] topic     The topic which to unregister.
+     */
+    void unregisterTopic(const String& deviceId, const String& entityId, const String& topic);
 
 private:
 
     /** Default topic accessibility. */
-    static const ITopicHandler::Access  DEFAULT_ACCESS      = ITopicHandler::ACCESS_READ_WRITE;
+    static const char*      DEFAULT_ACCESS;
 
     /** Period in ms to check for changed topics. */
-    static const uint32_t               ON_CHANGE_PERIOD    = 500U;
+    static const uint32_t   ON_CHANGE_PERIOD    = 500U;
 
     /**
-     * Plugin topic data, used for automatic publishing.
+     * Topic meta data, used for automatic publishing.
      */
-    struct PluginTopic
+    struct TopicMetaData
     {
-        IPluginMaintenance* plugin; /**< The plugin */
-        String              topic;  /**< The plugin topic */
+        String          deviceId;       /**< Id of the device this data is related to. */
+        String          entityId;       /**< Id of the entity this data is related to. */
+        String          topic;          /**< The topic this data is related to. */
+        HasChangedFunc  hasChangedFunc; /**< Function to check whether the topic content has changed. */
 
         /**
-         * Construct plugin topic data instance.
+         * Construct topic meta data instance.
          */
-        PluginTopic() :
+        TopicMetaData() :
+            deviceId(),
+            entityId(),
+            topic(),
+            hasChangedFunc(nullptr)
+        {
+        }
+    };
+
+    /**
+     * List of topic meta data.
+     */
+    typedef std::vector<TopicMetaData*>   TopicMetaDataList;
+
+    /**
+     * Plugin meta data, used to determine whether publishing
+     * of a topic shall take place or not.
+     */
+    struct PluginMetaData
+    {
+        String              deviceId;   /**< Id of the device this data is related to. */
+        IPluginMaintenance* plugin;     /**< Plugin which topics are handled. */
+        String              topic;      /**< The topic this data is related to. */
+
+        /**
+         * Construct topic meta data instance.
+         */
+        PluginMetaData() :
             plugin(nullptr),
             topic()
         {
@@ -133,19 +190,21 @@ class TopicHandlerService : public IService
     };
 
     /**
-     * List of plugin topics.
+     * List of plugin meta data.
      */
-    typedef std::vector<PluginTopic*>   PluginTopicList;
+    typedef std::vector<PluginMetaData*>    PluginMetaDataList;
 
-    PluginTopicList m_pluginTopicList;  /**< List of readable plugin topics. */
-    SimpleTimer     m_onChangeTimer;    /**< Timer for on change processing period. */
+    TopicMetaDataList   m_topicMetaDataList;    /**< List of readable topics and the required meta data. */
+    PluginMetaDataList  m_pluginMetaDataList;   /**< List of plugins, which topics are handled. */
+    SimpleTimer         m_onChangeTimer;        /**< Timer for on change processing period. */
 
     /**
      * Constructs the service instance.
      */
     TopicHandlerService() :
         IService(),
-        m_pluginTopicList(),
+        m_topicMetaDataList(),
+        m_pluginMetaDataList(),
         m_onChangeTimer()
     {
     }
@@ -163,47 +222,69 @@ class TopicHandlerService : public IService
     TopicHandlerService& operator=(const TopicHandlerService& service);
 
     /**
-     * Converts the topic access in string form to the enumeration form.
+     * Get the entity id by plugin UID.
      * 
-     * @param[in] strAccess Topic accessibility as string (r, rw, w)
+     * @param[in] uid   Plugin UID
      * 
-     * @return Topic accessibility
+     * @return Entity id
      */
-   ITopicHandler::Access strToAccess(const String& strAccess) const;
+    String getEntityIdByPluginUid(uint16_t uid);
 
     /**
-     * Register a single topic of the given plugin.
+     * Get the entity id by plugin alias.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
-     * @param[in] topic     The topic name.
-     * @param[in] access    The topic accessibility.
-     * @param[in] extra     Extra parameters, which depend on the topic handler.
+     * @param[in] alias Plugin alias
+     * 
+     * @return Entity id
      */
-    void registerTopic(IPluginMaintenance* plugin, const String& topic, ITopicHandler::Access access, JsonObjectConst& extra);
+    String getEntityIdByPluginAlias(const String& alias);
 
     /**
-     * Unregister the topic of the given plugin.
+     * Generates the access functions depended on the plugin accessibility.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
-     * @param[in] topic     The topic name.
+     * @param[in]   plugin          The plugin which to consider.
+     * @param[in]   strAccess       Topic accessibility as string (r, rw, w).
+     * @param[out]  getTopicFunc    Function to get the topic content.
+     * @param[out]  setTopicFunc    Function to set the topic content.
+     * @param[out]  uploadReqFunc   Function used for requesting whether an file upload is allowed.
      */
-    void unregisterTopic(IPluginMaintenance* plugin, const String& topic);
+   void strToAccess(IPluginMaintenance* plugin, const String& strAccess, ITopicHandler::GetTopicFunc& getTopicFunc, ITopicHandler::SetTopicFunc& setTopicFunc, ITopicHandler::UploadReqFunc& uploadReqFunc) const;
 
     /**
-     * Add plugin topic to list of automatic publishing on change.
+     * Add topic meta data to list of automatic publishing on change.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId          The device id which represents the physical device.
+     * @param[in] entityId          The entity id which represents the entity of the device.
+     * @param[in] topic             The topic name.
+     * @param[in] hasChangedFunc    Function to retrieve whether the topic changes since last time.
+     */
+    void addToTopicMetaDataList(const String& deviceId, const String& entityId, const String& topic, HasChangedFunc hasChangedFunc);
+
+    /**
+     * Remove topic meta data from list of automatic publishing on change.
+     * 
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
      * @param[in] topic     The topic name.
      */
-    void addToList(IPluginMaintenance* plugin, const String& topic);
+    void removeFromTopicMetaDataList(const String& deviceId, const String& entityId, const String& topic);
 
     /**
-     * Remove plugin topic from list of automatic publishing on change.
+     * Add plugin meta data to list of automatic publishing on change.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] plugin    The related plugin.
      * @param[in] topic     The topic name.
      */
-    void removeFromList(IPluginMaintenance* plugin, const String& topic);
+    void addToPluginMetaDataList(const String& deviceId, IPluginMaintenance* plugin, const String& topic);
+
+    /**
+     * Remove plugin meta data from list of automatic publishing on change.
+     * 
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] plugin    The related plugin.
+     */
+    void removeFromPluginMetaDataList(const String& deviceId, IPluginMaintenance* plugin);
 
     /**
      * Process all plugin topics to check which one has changed.
@@ -229,10 +310,11 @@ class TopicHandlerService : public IService
     /**
      * Notify all topic handlers about changed topic.
      * 
-     * @param[in] plugin    The plugin which provides the topic.
+     * @param[in] deviceId  The device id which represents the physical device.
+     * @param[in] entityId  The entity id which represents the entity of the device.
      * @param[in] topic     The topic name.
      */
-    void notifyAllHandlers(IPluginMaintenance* plugin, const String& topic);
+    void notifyAllHandlers(const String& deviceId, const String& entityId, const String& topic);
 };
 
 /******************************************************************************
diff --git a/lib/Utilities/library.json b/lib/Utilities/library.json
new file mode 100644
index 00000000..5f7571c9
--- /dev/null
+++ b/lib/Utilities/library.json
@@ -0,0 +1,15 @@
+{
+    "name": "Utilities",
+    "version": "0.1.0",
+    "description": "...",
+    "authors": [{
+        "name": "Andreas Merkle",
+        "email": "web@blue-andi.de",
+        "url": "https://github.com/BlueAndi",
+        "maintainer": true
+    }],
+    "license": "MIT",
+    "dependencies": [],
+    "frameworks": "*",
+    "platforms": "*"
+}
diff --git a/lib/Utilities/FileSystem.h b/lib/Utilities/src/FileSystem.h
similarity index 100%
rename from lib/Utilities/FileSystem.h
rename to lib/Utilities/src/FileSystem.h
diff --git a/lib/Utilities/JsonFile.cpp b/lib/Utilities/src/JsonFile.cpp
similarity index 100%
rename from lib/Utilities/JsonFile.cpp
rename to lib/Utilities/src/JsonFile.cpp
diff --git a/lib/Utilities/JsonFile.h b/lib/Utilities/src/JsonFile.h
similarity index 100%
rename from lib/Utilities/JsonFile.h
rename to lib/Utilities/src/JsonFile.h
diff --git a/lib/Utilities/LogSinkPrinter.cpp b/lib/Utilities/src/LogSinkPrinter.cpp
similarity index 98%
rename from lib/Utilities/LogSinkPrinter.cpp
rename to lib/Utilities/src/LogSinkPrinter.cpp
index 4533b8f5..db39e3e0 100644
--- a/lib/Utilities/LogSinkPrinter.cpp
+++ b/lib/Utilities/src/LogSinkPrinter.cpp
@@ -69,7 +69,7 @@ void LogSinkPrinter::send(const Logging::Msg& msg)
 
         written = snprintf( buffer,
                             LOG_MESSAGE_BUFFER_SIZE - STR_CUT_OFF_SEQ_LEN + 1U, /* + 1U for cut off detection. */
-                            "%*u %*s %*s:%*d %s\n",
+                            "%*u %*s %*s:%.*d %s\n",
                             TIMESTAMP_LEN,
                             msg.timestamp,
                             LOG_LEVEL_LEN,
@@ -107,11 +107,11 @@ void LogSinkPrinter::send(const Logging::Msg& msg)
  * Private Methods
  *****************************************************************************/
 
-const char* LogSinkPrinter::logLevelToString(const Logging::LogLevel LogLevel) const
+const char* LogSinkPrinter::logLevelToString(const Logging::LogLevel logLevel) const
 {
     const char* logLevelString = nullptr;
 
-    switch (LogLevel)
+    switch (logLevel)
     {
         case Logging::LOG_LEVEL_FATAL:
             logLevelString = "FATAL  ";
diff --git a/lib/Utilities/LogSinkPrinter.h b/lib/Utilities/src/LogSinkPrinter.h
similarity index 98%
rename from lib/Utilities/LogSinkPrinter.h
rename to lib/Utilities/src/LogSinkPrinter.h
index 81efd0c7..afce16c4 100644
--- a/lib/Utilities/LogSinkPrinter.h
+++ b/lib/Utilities/src/LogSinkPrinter.h
@@ -166,7 +166,7 @@ class LogSinkPrinter : public LogSink
      *
      * @return The severity of the given logLevel as string.
      */
-    const char* logLevelToString(const Logging::LogLevel LogLevel) const;
+    const char* logLevelToString(const Logging::LogLevel logLevel) const;
 };
 
 /******************************************************************************
diff --git a/lib/Utilities/Logging.cpp b/lib/Utilities/src/Logging.cpp
similarity index 100%
rename from lib/Utilities/Logging.cpp
rename to lib/Utilities/src/Logging.cpp
diff --git a/lib/Utilities/Logging.h b/lib/Utilities/src/Logging.h
similarity index 100%
rename from lib/Utilities/Logging.h
rename to lib/Utilities/src/Logging.h
diff --git a/lib/Utilities/SimpleTimer.hpp b/lib/Utilities/src/SimpleTimer.hpp
similarity index 100%
rename from lib/Utilities/SimpleTimer.hpp
rename to lib/Utilities/src/SimpleTimer.hpp
diff --git a/lib/Utilities/StatisticValue.hpp b/lib/Utilities/src/StatisticValue.hpp
similarity index 100%
rename from lib/Utilities/StatisticValue.hpp
rename to lib/Utilities/src/StatisticValue.hpp
diff --git a/lib/Utilities/TaskProxy.hpp b/lib/Utilities/src/TaskProxy.hpp
similarity index 100%
rename from lib/Utilities/TaskProxy.hpp
rename to lib/Utilities/src/TaskProxy.hpp
diff --git a/lib/Utilities/Util.cpp b/lib/Utilities/src/Util.cpp
similarity index 100%
rename from lib/Utilities/Util.cpp
rename to lib/Utilities/src/Util.cpp
diff --git a/lib/Utilities/Util.h b/lib/Utilities/src/Util.h
similarity index 100%
rename from lib/Utilities/Util.h
rename to lib/Utilities/src/Util.h
diff --git a/lib/VolumioPlugin/src/VolumioPlugin.cpp b/lib/VolumioPlugin/src/VolumioPlugin.cpp
index 97fde88c..f9887e65 100644
--- a/lib/VolumioPlugin/src/VolumioPlugin.cpp
+++ b/lib/VolumioPlugin/src/VolumioPlugin.cpp
@@ -36,6 +36,7 @@
 
 #include <Logging.h>
 #include <ArduinoJson.h>
+#include <HttpStatus.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -94,7 +95,7 @@ bool VolumioPlugin::getTopic(const String& topic, JsonObject& value) const
     return isSuccessful;
 }
 
-bool VolumioPlugin::setTopic(const String& topic, const JsonObject& value)
+bool VolumioPlugin::setTopic(const String& topic, const JsonObjectConst& value)
 {
     bool isSuccessful = false;
 
@@ -529,49 +530,7 @@ void VolumioPlugin::initHttpClient()
     m_client.regOnResponse(
         [this](const HttpResponse& rsp)
         {
-            const size_t            JSON_DOC_SIZE   = 512U;
-            DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
-
-            if (nullptr != jsonDoc)
-            {
-                size_t                          payloadSize = 0U;
-                const char*                     payload     = reinterpret_cast<const char*>(rsp.getPayload(payloadSize));
-                const size_t                    FILTER_SIZE = 128U;
-                StaticJsonDocument<FILTER_SIZE> filter;
-                DeserializationError            error;
-
-                filter["artist"]    = true;
-                filter["duration"]  = true;
-                filter["seek"]      = true;
-                filter["service"]   = true;
-                filter["status"]    = true;
-                filter["title"]     = true;
-                
-                if (true == filter.overflowed())
-                {
-                    LOG_ERROR("Less memory for filter available.");
-                }
-
-                error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
-
-                if (DeserializationError::Ok != error.code())
-                {
-                    LOG_WARNING("JSON parse error: %s", error.c_str());
-                }
-                else
-                {
-                    Msg msg;
-
-                    msg.type    = MSG_TYPE_RSP;
-                    msg.rsp     = jsonDoc;
-
-                    if (false == this->m_taskProxy.send(msg))
-                    {
-                        delete jsonDoc;
-                        jsonDoc = nullptr;
-                    }
-                }
-            }
+            handleAsyncWebResponse(rsp);
         }
     );
 
@@ -598,6 +557,63 @@ void VolumioPlugin::initHttpClient()
     );
 }
 
+void VolumioPlugin::handleAsyncWebResponse(const HttpResponse& rsp)
+{
+    if (HttpStatus::STATUS_CODE_OK == rsp.getStatusCode())
+    {
+        const size_t            JSON_DOC_SIZE   = 512U;
+        DynamicJsonDocument*    jsonDoc         = new(std::nothrow) DynamicJsonDocument(JSON_DOC_SIZE);
+
+        if (nullptr != jsonDoc)
+        {
+            size_t                          payloadSize = 0U;
+            const void*                     vPayload    = rsp.getPayload(payloadSize);
+            const char*                     payload     = static_cast<const char*>(vPayload);
+            const size_t                    FILTER_SIZE = 128U;
+            StaticJsonDocument<FILTER_SIZE> filter;
+
+            filter["artist"]    = true;
+            filter["duration"]  = true;
+            filter["seek"]      = true;
+            filter["service"]   = true;
+            filter["status"]    = true;
+            filter["title"]     = true;
+            
+            if (true == filter.overflowed())
+            {
+                LOG_ERROR("Less memory for filter available.");
+            }
+            else if ((nullptr == payload) ||
+                     (0U == payloadSize))
+            {
+                LOG_ERROR("No payload.");
+            }
+            else
+            {
+                DeserializationError error = deserializeJson(*jsonDoc, payload, payloadSize, DeserializationOption::Filter(filter));
+
+                if (DeserializationError::Ok != error.code())
+                {
+                    LOG_WARNING("JSON parse error: %s", error.c_str());
+                }
+                else
+                {
+                    Msg msg;
+
+                    msg.type    = MSG_TYPE_RSP;
+                    msg.rsp     = jsonDoc;
+
+                    if (false == this->m_taskProxy.send(msg))
+                    {
+                        delete jsonDoc;
+                        jsonDoc = nullptr;
+                    }
+                }
+            }
+        }
+    }
+}
+
 void VolumioPlugin::handleWebResponse(DynamicJsonDocument& jsonDoc)
 {
     JsonVariantConst    jsonStatus  = jsonDoc["status"];
diff --git a/lib/VolumioPlugin/src/VolumioPlugin.h b/lib/VolumioPlugin/src/VolumioPlugin.h
index 84366bfc..e74546c3 100644
--- a/lib/VolumioPlugin/src/VolumioPlugin.h
+++ b/lib/VolumioPlugin/src/VolumioPlugin.h
@@ -136,7 +136,7 @@ class VolumioPlugin : public Plugin, private PluginConfigFsHandler
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new VolumioPlugin(name, uid);
+        return new(std::nothrow)VolumioPlugin(name, uid);
     }
 
     /**
@@ -189,7 +189,7 @@ class VolumioPlugin : public Plugin, private PluginConfigFsHandler
      * 
      * @return If successful it will return true otherwise false.
      */
-    bool setTopic(const String& topic, const JsonObject& value) final;
+    bool setTopic(const String& topic, const JsonObjectConst& value) final;
 
     /**
      * Is the topic content changed since last time?
@@ -416,6 +416,14 @@ class VolumioPlugin : public Plugin, private PluginConfigFsHandler
      */
     void initHttpClient(void);
 
+    /**
+     * Handle asynchronous web response from the server.
+     * This will be called in LwIP context! Don't modify any member here directly!
+     * 
+     * @param[in] jsonDoc   Web response as JSON document
+     */
+    void handleAsyncWebResponse(const HttpResponse& rsp);
+
     /**
      * Handle a web response from the server.
      * 
diff --git a/lib/WifiStatusPlugin/src/WifiStatusPlugin.h b/lib/WifiStatusPlugin/src/WifiStatusPlugin.h
index efb98012..2daa4c40 100644
--- a/lib/WifiStatusPlugin/src/WifiStatusPlugin.h
+++ b/lib/WifiStatusPlugin/src/WifiStatusPlugin.h
@@ -99,7 +99,7 @@ class WifiStatusPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new WifiStatusPlugin(name, uid);
+        return new(std::nothrow)WifiStatusPlugin(name, uid);
     }
 
     /**
diff --git a/lib/WormPlugin/src/WormPlugin.h b/lib/WormPlugin/src/WormPlugin.h
index d6c37c8f..95d038af 100644
--- a/lib/WormPlugin/src/WormPlugin.h
+++ b/lib/WormPlugin/src/WormPlugin.h
@@ -104,7 +104,7 @@ class WormPlugin : public Plugin
      */
     static IPluginMaintenance* create(const String& name, uint16_t uid)
     {
-        return new WormPlugin(name, uid);
+        return new(std::nothrow)WormPlugin(name, uid);
     }
 
     /**
diff --git a/lib/YAWidgets/src/BitmapWidget.h b/lib/YAWidgets/src/BitmapWidget.h
index 10cf346f..4a74b64a 100644
--- a/lib/YAWidgets/src/BitmapWidget.h
+++ b/lib/YAWidgets/src/BitmapWidget.h
@@ -164,30 +164,30 @@ class BitmapWidget : public Widget
     bool loadSpriteSheet(FS& fs, const String& spriteSheetFileName, const String& textureFileName);
 
     /**
-     * Get the animation control flag FORWARD of a sprite sheet 
+     * Get the animation control flag FORWARD of a sprite sheet.
      * 
      * @return If forward, it will return true otherwise false.
      */
     bool isSpriteSheetForward() const;
 
     /**
-     * Set the animation control flag FORWARD of a sprite sheet 
+     * Set the animation control flag FORWARD of a sprite sheet.
      * 
      * @param[in] forward The state to be set.
      */
     void setSpriteSheetForward(bool forward);
 
     /**
-     * Get the animation control flag REPEAT of a sprite sheet 
+     * Get the animation control flag REPEAT of a sprite sheet.
      * 
      * @return If its repeated, it will return true otherwise false.
      */
     bool isSpriteSheetRepeatInfinite() const;
 
     /**
-     * Set the animation control flag REPEAT of a sprite sheet 
+     * Set the animation control flag REPEAT of a sprite sheet.
      * 
-     * @param[in] isRepeat The state to be set.
+     * @param[in] repeat The repeat flat to be set.
      */
     void setSpriteSheetRepeatInfinite(bool repeat);
     
diff --git a/lib/YAWidgets/src/BmpImgLoader.cpp b/lib/YAWidgets/src/BmpImgLoader.cpp
index 1244a7a7..59245611 100644
--- a/lib/YAWidgets/src/BmpImgLoader.cpp
+++ b/lib/YAWidgets/src/BmpImgLoader.cpp
@@ -64,9 +64,9 @@ typedef struct _BmpFileHeader
 } __attribute__ ((packed)) BmpFileHeader;
 
 /**
- * Device independent header (DIB): The bitmap v5 header.
+ * Device independent header (DIB): The bitmap info header (size: 40 bytes).
  */
-typedef struct _BmpV5Header
+typedef struct _BmpInfoHeader
 {
     uint32_t    headerSize;     /**< The size of this header. */
     int32_t     imageWidth;     /**< The bitmap width in pixels. */
@@ -80,6 +80,28 @@ typedef struct _BmpV5Header
     uint32_t    paletteColors;  /**< The number of colors in the color palette, or 0 to default to 2^n */
     uint32_t    importantColors;/**< The number of important colors used, or 0 when every color is important; generally ignored. */
 
+} __attribute__ ((packed)) BmpInfoHeader;
+
+/**
+ * Device independent header (DIB): The bitmap v5 header (size: 124 bytes).
+ */
+typedef struct _BmpV5Header
+{
+    BmpInfoHeader   infoHeader;             /**< Bitmap info header. */
+    uint32_t        redChannelBitmask;      /**< Read channel bitmask. */
+    uint32_t        greenChannelBitmask;    /**< Read channel bitmask. */
+    uint32_t        blueChannelBitmask;     /**< Read channel bitmask. */
+    uint32_t        alphaChannelBitmask;    /**< Alpha channel bitmask. */
+    uint32_t        colorSpaceType;         /**< Color space type. */
+    uint32_t        colorSpaceEndpoints;    /**< Color space endpoints. */
+    uint32_t        gammaRedChannel;        /**< Gamma for red channel. */
+    uint32_t        gammaGreenChannel;      /**< Gamma for green channel. */
+    uint32_t        gammaBlueChannel;       /**< Gamma for blue channel. */
+    uint32_t        intent;                 /**< Intent. */
+    uint32_t        iccProfileData;         /**< ICC profile data. */
+    uint32_t        iccProfileSize;         /**< ICC profile size. */
+    uint32_t        reserved;               /**< Reserved. */
+
 } __attribute__ ((packed)) BmpV5Header;
 
 typedef enum
@@ -134,32 +156,30 @@ BmpImgLoader::Ret BmpImgLoader::load(FS& fs, const String& fileName, YAGfxDynami
         }
         else if (false == loadDibHeader(fd, dibHeader))
         {
-            ret = RET_FILE_FORMAT_INVALID;
+            ret = RET_FILE_FORMAT_UNSUPPORTED;
         }
-        /* Contains the bitmap file the supported DIB header?
-         * Planes must be 1.
+        /* Planes must be 1.
          * Compression is not supported.
          * Palette colors are not supported.
          * 24 and 32 bits per pixel are supported.
          */
-        else if ((sizeof(dibHeader) != dibHeader.headerSize) ||
-                 (1 != dibHeader.planes) ||
-                 (COMPRESSION_METHOD_RGB != dibHeader.compression) ||
-                 (0 < dibHeader.paletteColors) ||
-                 ((24 != dibHeader.bpp) && (32 != dibHeader.bpp)))
+        else if ((1U != dibHeader.infoHeader.planes) ||
+                 (COMPRESSION_METHOD_RGB != dibHeader.infoHeader.compression) ||
+                 (0U < dibHeader.infoHeader.paletteColors) ||
+                 ((24U != dibHeader.infoHeader.bpp) && (32U != dibHeader.infoHeader.bpp)))
         {
             ret = RET_FILE_FORMAT_UNSUPPORTED;
         }
         /* Supported image size is limited. */
-        else if ((UINT16_MAX < dibHeader.imageWidth) ||
-                 (UINT16_MAX < dibHeader.imageHeight))
+        else if ((UINT16_MAX < dibHeader.infoHeader.imageWidth) ||
+                 (UINT16_MAX < dibHeader.infoHeader.imageHeight))
         {
             ret = RET_IMG_TOO_BIG;
         }
         else
         {
-            uint16_t width  = abs(dibHeader.imageWidth);
-            uint16_t height = abs(dibHeader.imageHeight);
+            uint16_t width  = abs(dibHeader.infoHeader.imageWidth);
+            uint16_t height = abs(dibHeader.infoHeader.imageHeight);
 
             bitmap.release();
 
@@ -173,16 +193,16 @@ BmpImgLoader::Ret BmpImgLoader::load(FS& fs, const String& fileName, YAGfxDynami
                 uint32_t    rowSize         = 0;
                 int16_t     y               = 0;
                 bool        isTopToBottom   = false;
-                uint16_t    bytePerPixel    = dibHeader.bpp / 8;
+                uint16_t    bytePerPixel    = dibHeader.infoHeader.bpp / 8;
 
                 /* The bits representing the bitmap pixels are packed in rows.
                  * The size of each row is rounded up to a multiple of 4 bytes
                  * (a 32-bit DWORD) by padding.
                  */
-                rowSize =  (dibHeader.bpp * bitmap.getWidth() + 31) / 32 * 4;
+                rowSize =  (dibHeader.infoHeader.bpp * bitmap.getWidth() + 31) / 32 * 4;
 
                 /* ImageHeight is expressed as a negative number for top-down images. */
-                if (0 > dibHeader.imageHeight)
+                if (0 > dibHeader.infoHeader.imageHeight)
                 {
                     isTopToBottom = true;
                 }
@@ -248,9 +268,11 @@ BmpImgLoader::Ret BmpImgLoader::load(FS& fs, const String& fileName, YAGfxDynami
 
 bool BmpImgLoader::loadBmpFileHeader(File& fd, BmpFileHeader& header)
 {
-    bool isSuccessful = true;
+    bool        isSuccessful    = true;
+    void*       vHeader         = &header;
+    uint8_t*    u8Header        = static_cast<uint8_t*>(vHeader);
 
-    if (sizeof(header) != fd.read(reinterpret_cast<uint8_t*>(&header), sizeof(header)))
+    if (sizeof(header) != fd.read(u8Header, sizeof(header)))
     {
         isSuccessful = false;
     }
@@ -260,12 +282,46 @@ bool BmpImgLoader::loadBmpFileHeader(File& fd, BmpFileHeader& header)
 
 bool BmpImgLoader::loadDibHeader(File& fd, BmpV5Header& header)
 {
-    bool isSuccessful = true;
+    bool        isSuccessful    = true;
+    uint32_t    dibHeaderSize   = 0U;
+    void*       vDibHeaderSize  = &dibHeaderSize;
+    uint8_t*    u8DibHeaderSize = static_cast<uint8_t*>(vDibHeaderSize);
+
+    memset(&header, 0, sizeof(header));
 
-    if (sizeof(header) != fd.read(reinterpret_cast<uint8_t*>(&header), sizeof(header)))
+    if (sizeof(dibHeaderSize) != fd.read(u8DibHeaderSize, sizeof(dibHeaderSize)))
     {
         isSuccessful = false;
     }
+    else
+    {
+        const uint32_t  DIB_HEADER_SIZE     = sizeof(BmpInfoHeader);
+        const uint32_t  DIB_HEADER_V5_SIZE  = 124U;
+        void*           vHeader             = &header;
+        uint8_t*        u8Header            = static_cast<uint8_t*>(vHeader);
+
+        if (false == fd.seek(fd.position() - sizeof(dibHeaderSize), SeekSet))
+        {
+            isSuccessful = false;
+        }
+        else if ((DIB_HEADER_SIZE != dibHeaderSize) &&
+                 (DIB_HEADER_V5_SIZE != dibHeaderSize))
+        {
+            isSuccessful = false;
+        }
+        else
+        {
+            if (DIB_HEADER_V5_SIZE == dibHeaderSize)
+            {
+                dibHeaderSize = sizeof(BmpV5Header);
+            }
+
+            if (dibHeaderSize != fd.read(u8Header, dibHeaderSize))
+            {
+                isSuccessful = false;
+            }
+        }
+    }
 
     return isSuccessful;
 }
diff --git a/lib/YAWidgets/src/TextWidget.cpp b/lib/YAWidgets/src/TextWidget.cpp
index 7cba00f2..9811dcee 100644
--- a/lib/YAWidgets/src/TextWidget.cpp
+++ b/lib/YAWidgets/src/TextWidget.cpp
@@ -68,7 +68,8 @@ const YAFont&               TextWidget::DEFAULT_FONT        = Fonts::getFontByTy
 TextWidget::KeywordHandler  TextWidget::m_keywordHandlers[] =
 {
     &TextWidget::handleColor,
-    &TextWidget::handleAlignment
+    &TextWidget::handleAlignment,
+    &TextWidget::handleCharCode
 };
 
 /* Set default scroll pause in ms. */
@@ -539,6 +540,37 @@ bool TextWidget::handleAlignment(YAGfx* gfx, YAGfxText* gfxText, bool noAction,
     return status;
 }
 
+bool TextWidget::handleCharCode(YAGfx* gfx, YAGfxText* gfxText, bool noAction, const String& formatStr, bool isScrolling, uint8_t& overstep) const
+{
+    bool status = false;
+
+    UTIL_NOT_USED(isScrolling);
+
+    if (('x' == formatStr[0]) ||
+        ('X' == formatStr[0]))
+    {
+        const uint8_t   CHAR_CODE_LEN   = 2U;
+        String          charCodeStr     = String("0x") + formatStr.substring(1, 1 + CHAR_CODE_LEN);
+        uint8_t         charCode        = 0U;
+        bool            convStatus      = Util::strToUInt8(charCodeStr, charCode);
+
+        if (true == convStatus)
+        {
+            if ((false == noAction) &&
+                (nullptr != gfx) &&
+                (nullptr != gfxText))
+            {
+                gfxText->drawChar(*gfx, static_cast<char>(charCode));
+            }
+
+            overstep    = 1U + CHAR_CODE_LEN;
+            status      = true;
+        }
+    }
+
+    return status;
+}
+
 /******************************************************************************
  * External Functions
  *****************************************************************************/
diff --git a/lib/YAWidgets/src/TextWidget.h b/lib/YAWidgets/src/TextWidget.h
index af0f67c4..eb91c30b 100644
--- a/lib/YAWidgets/src/TextWidget.h
+++ b/lib/YAWidgets/src/TextWidget.h
@@ -432,10 +432,12 @@ class TextWidget : public Widget
     /**
      * Handles the keyword for color changes.
      *
-     * @param[in] gfx       Graphics interface, only necessary if actions shall take place.
-     * @param[in] noAction  The handler shall take no action. This is only used to get rid of the keywords in the text.
-     * @param[in] formatStr String which may contain keywords.
-     * @param[out] overstep Number of characters, which must be overstepped before the next normal character comes.
+     * @param[in] gfx           Graphics interface, only necessary if actions shall take place.
+     * @param[in] gfxText       The text to handle with the keyword.
+     * @param[in] noAction      The handler shall take no action. This is only used to get rid of the keywords in the text.
+     * @param[in] formatStr     String which may contain keywords.
+     * @param[in] isScrolling   Is scrolling active?
+     * @param[out] overstep     Number of characters, which must be overstepped before the next normal character comes.
      *
      * @return If keyword is handled successful, it returns true otherwise false.
      */
@@ -444,14 +446,30 @@ class TextWidget : public Widget
     /**
      * Handles the keyword for alignment changes.
      *
-     * @param[in] gfx       Graphics interface, only necessary if actions shall take place.
-     * @param[in] noAction  The handler shall take no action. This is only used to get rid of the keywords in the text.
-     * @param[in] formatStr String which may contain keywords.
-     * @param[out] overstep Number of characters, which must be overstepped before the next normal character comes.
+     * @param[in] gfx           Graphics interface, only necessary if actions shall take place.
+     * @param[in] gfxText       The text to handle with the keyword.
+     * @param[in] noAction      The handler shall take no action. This is only used to get rid of the keywords in the text.
+     * @param[in] formatStr     String which may contain keywords.
+     * @param[in] isScrolling   Is scrolling active?
+     * @param[out] overstep     Number of characters, which must be overstepped before the next normal character comes.
      *
      * @return If keyword is handled successful, it returns true otherwise false.
      */
     bool handleAlignment(YAGfx* gfx, YAGfxText* gfxText, bool noAction, const String& formatStr, bool isScrolling, uint8_t& overstep) const;
+
+    /**
+     * Handles the keyword for character code.
+     *
+     * @param[in] gfx           Graphics interface, only necessary if actions shall take place.
+     * @param[in] gfxText       The text to handle with the keyword.
+     * @param[in] noAction      The handler shall take no action. This is only used to get rid of the keywords in the text.
+     * @param[in] formatStr     String which may contain keywords.
+     * @param[in] isScrolling   Is scrolling active?
+     * @param[out] overstep     Number of characters, which must be overstepped before the next normal character comes.
+     *
+     * @return If keyword is handled successful, it returns true otherwise false.
+     */
+    bool handleCharCode(YAGfx* gfx, YAGfxText* gfxText, bool noAction, const String& formatStr, bool isScrolling, uint8_t& overstep) const;
 };
 
 /******************************************************************************
diff --git a/platformio.ini b/platformio.ini
index acc15e3f..88183a4a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -41,9 +41,9 @@ lib_compat_mode = strict
 ; Select build mode here!
 ; ********************************************************************************
 [mode:selected]
-extends = mode:debug
+extends = mode:release
 build_flags =
-    ${mode:debug.build_flags}
+    ${mode:release.build_flags}
 
 ; ********************************************************************************
 ; Common for programming via USB
@@ -184,7 +184,7 @@ build_flags =
     -D NATIVE
 lib_compat_mode = off   ; The muwerk/mufonts require Arduino framework.
 lib_deps =
-    bblanchon/ArduinoJson @ ~6.21.2
+    bblanchon/ArduinoJson @ ~6.21.3
     muwerk/mufonts @ ~0.2.0
 lib_ignore =
     Sensors
diff --git a/scripts/PluginList.cpp b/scripts/PluginList.cpp
new file mode 100644
index 00000000..662c28cd
--- /dev/null
+++ b/scripts/PluginList.cpp
@@ -0,0 +1,96 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  Plugin List
+ * @author Andreas Merkle <web@blue-andi.de>
+ * 
+ * @{
+ */
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "PluginList.h"
+
+$INCLUDES
+
+/******************************************************************************
+ * Compiler Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and classes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Prototypes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Variables
+ *****************************************************************************/
+
+/**
+ * List of plugins.
+ */
+static const PluginList::Element gPluginList[] =
+{
+$LIST_ENTRIES
+};
+
+/******************************************************************************
+ * Public Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Protected Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Private Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * External Functions
+ *****************************************************************************/
+
+const PluginList::Element* PluginList::getList(uint8_t& length)
+{
+    length = sizeof(gPluginList) / sizeof(gPluginList[0]);
+
+    return gPluginList;
+}
+
+/******************************************************************************
+ * Local Functions
+ *****************************************************************************/
+
+/** @} */
\ No newline at end of file
diff --git a/scripts/Services.cpp b/scripts/Services.cpp
index 1239f010..fd2197e0 100644
--- a/scripts/Services.cpp
+++ b/scripts/Services.cpp
@@ -27,6 +27,8 @@
 /**
  * @brief  Services
  * @author Andreas Merkle <web@blue-andi.de>
+ * 
+ * @{
  */
 
 /******************************************************************************
diff --git a/scripts/TopicHandlers.cpp b/scripts/TopicHandlers.cpp
index f44efdd5..359bd4c3 100644
--- a/scripts/TopicHandlers.cpp
+++ b/scripts/TopicHandlers.cpp
@@ -27,6 +27,8 @@
 /**
  * @brief  Topic handlers
  * @author Andreas Merkle <web@blue-andi.de>
+ * 
+ * @{
  */
 
 /******************************************************************************
diff --git a/scripts/configure.py b/scripts/configure.py
index 83604a70..445fefe0 100644
--- a/scripts/configure.py
+++ b/scripts/configure.py
@@ -40,8 +40,8 @@
 
 _MENU_FULL_PATH = "./data/js/pluginsSubMenu.js"
 
-_PLUGIN_LIST_FULL_PATH = "./src/Generated/PluginList.hpp"
-_PLUGIN_LIST_TEMPLATE_FULL_PATH = "./scripts/PluginList.hpp"
+_PLUGIN_LIST_FULL_PATH = "./src/Generated/PluginList.cpp"
+_PLUGIN_LIST_TEMPLATE_FULL_PATH = "./scripts/PluginList.cpp"
 
 _SERVICE_LIST_FULL_PATH = "./src/Generated/Services.cpp"
 _SERVICE_LIST_TEMPLATE_FULL_PATH = "./scripts/Services.cpp"
@@ -144,26 +144,26 @@ def _generate_web_menu(menu_full_path, plugin_list):
         file_desc.write("]\n")
 
 def _generate_cpp_plugin_list(plugin_list_full_path, plugin_list):
-    """Generate the PluginList.hpp source file.
+    """Generate the PluginList.cpp source file.
 
     Args:
-        plugin_list_full_path (str): Full path to PluginList.hpp where it shall be created.
-        plugin_list (list): List of all plugin names
+        plugin_list_full_path (str): Full path to PluginList.cpp where it shall be created.
+        plugin_list (list): List of all plugin names.
     """
     includes = ""
-    register_calls = ""
+    list_entries = ""
 
     for idx, plugin_name in enumerate(plugin_list):
         if 0 < idx:
             includes += "\n"
-            register_calls += "\n"
+            list_entries += ",\n"
 
         includes += f"#include <{plugin_name}.h>"
-        register_calls += f"    pluginMgr.registerPlugin(\"{plugin_name}\", {plugin_name}::create);"
+        list_entries += f"    {{ \"{plugin_name}\", {plugin_name}::create }}"
 
     data = {
         "INCLUDES": includes,
-        "REGISTER": register_calls
+        "LIST_ENTRIES": list_entries
     }
 
     with open(_PLUGIN_LIST_TEMPLATE_FULL_PATH, "r", encoding="utf-8") as file_desc:
diff --git a/src/Common/ButtonActions.cpp b/src/Common/ButtonActions.cpp
index 89834790..7c01f02c 100644
--- a/src/Common/ButtonActions.cpp
+++ b/src/Common/ButtonActions.cpp
@@ -90,8 +90,8 @@ void ButtonActions::executeAction(ButtonActionId id)
         showIpAddress();
         break;
 
-    case BUTTON_ACTION_ID_SWITCH_OFF:
-        switchOff();
+    case BUTTON_ACTION_ID_TOGGLE_DISPLAY_OFF_ON:
+        toggleDisplayOffOn();
         break;
 
     case BUTTON_ACTION_ID_SWEEP_BRIGHTNESS:
@@ -234,9 +234,18 @@ void ButtonActions::showIpAddress() const
     SysMsg::getInstance().show(infoStr, DURATION_NON_SCROLLING, SCROLLING_REPEAT_NUM);
 }
 
-void ButtonActions::switchOff()
+void ButtonActions::toggleDisplayOffOn()
 {
-    m_isSwitchOffRequested = true;
+    DisplayMgr& displayMgr = DisplayMgr::getInstance();
+
+    if (false == displayMgr.isDisplayOn())
+    {
+        displayMgr.displayOn();
+    }
+    else
+    {
+        displayMgr.displayOff();
+    }
 }
 
 /******************************************************************************
diff --git a/src/Common/ButtonActions.h b/src/Common/ButtonActions.h
index 3158c75a..f6857cbe 100644
--- a/src/Common/ButtonActions.h
+++ b/src/Common/ButtonActions.h
@@ -63,10 +63,12 @@ enum ButtonActionId
     BUTTON_ACTION_ID_ACTIVATE_PREV_SLOT,    /**< Activate previous slot */
     BUTTON_ACTION_ID_NEXT_FADE_EFFECT,      /**< Select next fade effect */
     BUTTON_ACTION_ID_SHOW_IP_ADDRESS,       /**< Show IP address on display */
-    BUTTON_ACTION_ID_SWITCH_OFF,            /**< Switch device off */
+    BUTTON_ACTION_ID_TOGGLE_DISPLAY_OFF_ON, /**< Toggle the display off/on */
     BUTTON_ACTION_ID_SWEEP_BRIGHTNESS,      /**< Sweep brightness from dark to bright and reverse */
     BUTTON_ACTION_ID_INC_BRIGHTNESS,        /**< Increase display brightness till maximum. */
-    BUTTON_ACTION_ID_DEC_BRIGHTNESS         /**< Decrease display brightness till minimum. */
+    BUTTON_ACTION_ID_DEC_BRIGHTNESS,        /**< Decrease display brightness till minimum. */
+    
+    BUTTON_ACTION_ID_MAX                    /**< Max. action id (always the last one) */
 };
 
 /**
@@ -160,9 +162,9 @@ class ButtonActions
     void showIpAddress() const;
 
     /**
-     * Trigger action: Switch device off.
+     * Trigger action: Toggle display on/off.
      */
-    void switchOff();
+    void toggleDisplayOffOn();
 };
 
 /******************************************************************************
diff --git a/src/Common/ButtonHandler.hpp b/src/Common/ButtonHandler.hpp
index 1948df87..b3d39c33 100644
--- a/src/Common/ButtonHandler.hpp
+++ b/src/Common/ButtonHandler.hpp
@@ -191,16 +191,6 @@ class ButtonHandler : public IButtonObserver, private ButtonCtrl, private Button
         }
     }
 
-    /**
-     * Is switch off requested?
-     * 
-     * @return If switch off is requested, it will return true otherwise false.
-     */
-    bool isSwitchOffRequested()
-    {
-        return ButtonActions::isSwitchOffRequested();
-    }
-
 private:
 
     /** Length of the button info queue. */
diff --git a/src/Common/MemMon.cpp b/src/Common/MemMon.cpp
index d08b8594..1514585b 100644
--- a/src/Common/MemMon.cpp
+++ b/src/Common/MemMon.cpp
@@ -77,17 +77,23 @@ void MemMon::process()
 
     if (true == isProcessingTime)
     {
-        uint32_t minFreeHeap        = ESP.getMinFreeHeap();
-        uint32_t minFreeHeapBlock   = ESP.getMaxAllocHeap();
+        uint32_t availableHeap          = ESP.getFreeHeap();        /* Current available heap memory. */
+        uint32_t lowestAvailableHeap    = ESP.getMinFreeHeap();     /* Lowest level of available heap since boot. */
+        uint32_t largestHeapBlock       = ESP.getMaxAllocHeap();    /* Largest block of heap that can be allocated at once. */
 
-        if (MIN_HEAP_MEMORY >= minFreeHeap)
+        if (MIN_HEAP_MEMORY >= availableHeap)
         {
-            LOG_WARNING("Min. free heap is %u byte.", minFreeHeap);
+            LOG_WARNING("Current available heap: %u byte.", availableHeap);
         }
 
-        if (MIN_HEAP_BLOCK_MEMORY > minFreeHeapBlock)
+        if (LOWEST_HEAP_MEMORY >= lowestAvailableHeap)
         {
-            LOG_WARNING("Largest heap block which can be allocated is %u byte.", minFreeHeapBlock);
+            LOG_WARNING("Lowest available heap: %u byte.", lowestAvailableHeap);
+        }
+
+        if (LARGEST_HEAP_BLOCK_MEMORY > largestHeapBlock)
+        {
+            LOG_WARNING("Largest heap block which can be allocated: %u byte.", largestHeapBlock);
         }
 
         /* Any heap corrupt? */
diff --git a/src/Common/MemMon.h b/src/Common/MemMon.h
index 72ba0cf5..b06d68c1 100644
--- a/src/Common/MemMon.h
+++ b/src/Common/MemMon.h
@@ -80,13 +80,24 @@ class MemMon
     void process();
 
     /** Processing cycle in ms. */
-    static const uint32_t   PROCESSING_CYCLE        = 60U * 1000U;
+    static const uint32_t   PROCESSING_CYCLE            = 60U * 1000U;
 
-    /** Minimum size of heap memory in bytes, the monitor starts to warn. */
-    static const size_t     MIN_HEAP_MEMORY         = 10240U;
+    /**
+     * Minimum size of current heap memory in bytes, the monitor starts to warn.
+     * See https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/protocols/mbedtls.html#performance-and-memory-tweaks
+     */
+    static const size_t     MIN_HEAP_MEMORY             = (60U * 1024U);
 
-    /** Minimum size of largest block of heap that can be allocated at once in bytes, the monitor starts to warn. */
-    static const size_t     MIN_HEAP_BLOCK_MEMORY   = 4096U;
+    /**
+     * Lowest size of heap memory in bytes, the monitor starts to warn.
+     * See https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/protocols/mbedtls.html#performance-and-memory-tweaks
+     */
+    static const size_t     LOWEST_HEAP_MEMORY          = (50U * 1024U);
+
+    /**
+     * Minimum size of largest block of heap that can be allocated at once in bytes, the monitor starts to warn.
+     */
+    static const size_t     LARGEST_HEAP_BLOCK_MEMORY   = CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN;
 
 private:
 
diff --git a/src/Common/MiniTerminal.cpp b/src/Common/MiniTerminal.cpp
index e9c0728b..d57edc9f 100644
--- a/src/Common/MiniTerminal.cpp
+++ b/src/Common/MiniTerminal.cpp
@@ -38,6 +38,7 @@
 #include <Util.h>
 #include <SettingsService.h>
 #include <StateMachine.hpp>
+#include <WiFi.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -83,6 +84,12 @@ static const char*     WRITE_WIFI_SSID              = "write wifi ssid ";
 /** Command length: write wifi ssid */
 static const size_t    WRITE_WIFI_SSID_LEN 	        = strlen(WRITE_WIFI_SSID);
 
+/** Command: get ip */
+static const char*     GET_IP                       = "get ip";
+
+/** Command length: get ipaddress */
+static const size_t    GET_IP_LEN 	                = strlen(GET_IP);
+
 /******************************************************************************
  * Public Methods
  *****************************************************************************/
@@ -204,6 +211,10 @@ void MiniTerminal::executeCommand(const char* cmdLine)
     {
         cmdWriteWifiSSID(&cmdLine[WRITE_WIFI_SSID_LEN]);
     }
+    else if (0 == strncmp(cmdLine, GET_IP, GET_IP_LEN))
+    {
+        cmdGetIPAddress(&cmdLine[GET_IP_LEN]);
+    }
     else
     {
         writeError("Unknown command.\n");
@@ -267,6 +278,27 @@ void MiniTerminal::cmdWriteWifiSSID(const char* par)
     }
 }
 
+void MiniTerminal::cmdGetIPAddress(const char* par)
+{
+    if (nullptr != par)
+    {
+        String result;
+
+        if (WIFI_MODE_AP == WiFi.getMode())
+        {
+            result = WiFi.softAPIP().toString();
+        }
+        else
+        {
+            result = WiFi.localIP().toString();
+        }
+
+        result += "\n";
+
+        writeSuccessful(result.c_str());
+    }
+}
+
 /******************************************************************************
  * External Functions
  *****************************************************************************/
diff --git a/src/Common/MiniTerminal.h b/src/Common/MiniTerminal.h
index 28f21852..d1edccef 100644
--- a/src/Common/MiniTerminal.h
+++ b/src/Common/MiniTerminal.h
@@ -169,6 +169,13 @@ class MiniTerminal
      * @param[in] par   Parameter
      */
     void cmdWriteWifiSSID(const char* par);
+
+    /**
+     * Get the IP-address.
+     * 
+     * @param[in] par   Parameter
+     */
+    void cmdGetIPAddress(const char* par);
 };
 
 /******************************************************************************
diff --git a/src/Common/OneButtonCtrl.hpp b/src/Common/OneButtonCtrl.hpp
index 42ae6247..93e9e97e 100644
--- a/src/Common/OneButtonCtrl.hpp
+++ b/src/Common/OneButtonCtrl.hpp
@@ -119,7 +119,7 @@ class OneButtonCtrl
             /* 2 */ BUTTON_ACTION_ID_ACTIVATE_PREV_SLOT,
             /* 3 */ BUTTON_ACTION_ID_NEXT_FADE_EFFECT,
             /* 4 */ BUTTON_ACTION_ID_SHOW_IP_ADDRESS,
-            /* 5 */ BUTTON_ACTION_ID_SWITCH_OFF
+            /* 5 */ BUTTON_ACTION_ID_TOGGLE_DISPLAY_OFF_ON
         };
         const size_t            TABLE_NUM_ELEMENTS  = sizeof(ACTION_TABLE) / sizeof(ACTION_TABLE[0]);
 
diff --git a/src/Common/ResetMon.h b/src/Common/ResetMon.h
index fa19cff8..3bd2f5e5 100644
--- a/src/Common/ResetMon.h
+++ b/src/Common/ResetMon.h
@@ -94,7 +94,7 @@ class ResetMon
 
     SimpleTimer     m_timer;                /**< Timer used for cyclic processing. */
     RESET_REASON    m_resetReasonAppCpu;    /**< The reset reason of the APP cpu. */
-    RESET_REASON    m_resetReasonProCpu;    /**< The reset reason of the PRO cpu.
+    RESET_REASON    m_resetReasonProCpu;    /**< The reset reason of the PRO cpu. */
 
     /**
      * Constructs the reset monitor.
diff --git a/src/Common/ThreeButtonCtrl.hpp b/src/Common/ThreeButtonCtrl.hpp
index 54250f70..27aa9eea 100644
--- a/src/Common/ThreeButtonCtrl.hpp
+++ b/src/Common/ThreeButtonCtrl.hpp
@@ -114,7 +114,7 @@ class ThreeButtonCtrl
         }
         else if (tButtonOk == buttonId)
         {
-            action = BUTTON_ACTION_ID_SWITCH_OFF;
+            action = BUTTON_ACTION_ID_TOGGLE_DISPLAY_OFF_ON;
         }
         else if (tButtonRight == buttonId)
         {
diff --git a/src/Common/TwoButtonCtrl.hpp b/src/Common/TwoButtonCtrl.hpp
index f8158d2d..2a7b2ca9 100644
--- a/src/Common/TwoButtonCtrl.hpp
+++ b/src/Common/TwoButtonCtrl.hpp
@@ -133,7 +133,7 @@ class TwoButtonCtrl
         {
             /* 0 */ BUTTON_ACTION_ID_NO_ACTION,
             /* 1 */ BUTTON_ACTION_ID_ACTIVATE_PREV_SLOT,
-            /* 2 */ BUTTON_ACTION_ID_SWITCH_OFF
+            /* 2 */ BUTTON_ACTION_ID_TOGGLE_DISPLAY_OFF_ON
         };
         const size_t            TABLE_NUM_ELEMENTS  = sizeof(ACTION_TABLE) / sizeof(ACTION_TABLE[0]);
 
diff --git a/src/Gfx/DisplayMgr.cpp b/src/Gfx/DisplayMgr.cpp
index 645bdd30..591d8340 100644
--- a/src/Gfx/DisplayMgr.cpp
+++ b/src/Gfx/DisplayMgr.cpp
@@ -714,6 +714,33 @@ void DisplayMgr::setNetworkStatus(bool isConnected)
     m_isNetworkConnected = isConnected;
 }
 
+void DisplayMgr::displayOff()
+{
+    MutexGuard<MutexRecursive>  guard1(m_mutexInterf);
+    MutexGuard<MutexRecursive>  guard2(m_mutexUpdate);
+    
+    Display::getInstance().off();
+}
+
+void DisplayMgr::displayOn()
+{
+    MutexGuard<MutexRecursive>  guard1(m_mutexInterf);
+    MutexGuard<MutexRecursive>  guard2(m_mutexUpdate);
+
+    Display::getInstance().on();
+}
+
+bool DisplayMgr::isDisplayOn() const
+{
+    bool                        isDisplayOn             = false;
+    MutexGuard<MutexRecursive>  guard1(m_mutexInterf);
+    MutexGuard<MutexRecursive>  guard2(m_mutexUpdate);
+
+    isDisplayOn = Display::getInstance().isOn();
+
+    return isDisplayOn;
+}
+
 /******************************************************************************
  * Protected Methods
  *****************************************************************************/
@@ -1312,7 +1339,7 @@ void DisplayMgr::destroyUpdateTask()
 
 void DisplayMgr::processTask(void* parameters)
 {
-    DisplayMgr* tthis = reinterpret_cast<DisplayMgr*>(parameters);
+    DisplayMgr* tthis = static_cast<DisplayMgr*>(parameters);
 
     if ((nullptr != tthis) &&
         (nullptr != tthis->m_processTaskSemaphore))
@@ -1349,7 +1376,7 @@ void DisplayMgr::processTask(void* parameters)
 
 void DisplayMgr::updateTask(void* parameters)
 {
-    DisplayMgr* tthis = reinterpret_cast<DisplayMgr*>(parameters);
+    DisplayMgr* tthis = static_cast<DisplayMgr*>(parameters);
 
     if ((nullptr != tthis) &&
         (nullptr != tthis->m_updateTaskSemaphore))
diff --git a/src/Gfx/DisplayMgr.h b/src/Gfx/DisplayMgr.h
index 55c45821..aeff8876 100644
--- a/src/Gfx/DisplayMgr.h
+++ b/src/Gfx/DisplayMgr.h
@@ -329,6 +329,23 @@ class DisplayMgr
      */
     void setNetworkStatus(bool isConnected);
 
+    /**
+     * Power display off.
+     */
+    void displayOff();
+
+    /**
+     * Power display on.
+     */
+    void displayOn();
+
+    /**
+     * Is the display powered on?
+     * 
+     * @return If the display is powered on, it will return true otherwise false.
+     */
+    bool isDisplayOn() const;
+
 private:
 
     /** The process task stack size in bytes */
@@ -359,7 +376,7 @@ class DisplayMgr
     mutable MutexRecursive      m_mutexInterf;
 
     /** Mutex to protect the display update against concurrent access. */
-    MutexRecursive              m_mutexUpdate;
+    mutable MutexRecursive      m_mutexUpdate;
 
     /** Process task handle */
     TaskHandle_t                m_processTaskHandle;
diff --git a/src/Gfx/SlotList.cpp b/src/Gfx/SlotList.cpp
index dd922779..32f3a568 100644
--- a/src/Gfx/SlotList.cpp
+++ b/src/Gfx/SlotList.cpp
@@ -319,7 +319,7 @@ uint8_t SlotList::getStickySlot() const
  * 
  * If slot is empty or the plugin is disabled, it will fail.
  * 
- * @param[in]   slotId  The id of the slot which to set sticky.
+ * @param[in] slotId    The id of the slot which to set sticky.
  * 
  * @return If successful it will return true otherwise false.
  */
diff --git a/src/Hal/ButtonDrv.cpp b/src/Hal/ButtonDrv.cpp
index 8e608d02..68c94b0d 100644
--- a/src/Hal/ButtonDrv.cpp
+++ b/src/Hal/ButtonDrv.cpp
@@ -281,13 +281,11 @@ void ButtonDrv::setState(ButtonId buttonId, ButtonState state)
             (void)xSemaphoreGive(m_xSemaphore);
         }
     }
-
-    return;
 }
 
 void ButtonDrv::buttonTask(void *parameters)
 {
-    ButtonDrv*  buttonDrv   = reinterpret_cast<ButtonDrv*>(parameters);
+    ButtonDrv*  buttonDrv   = static_cast<ButtonDrv*>(parameters);
     uint8_t     buttonIdx   = 0U;
 
     /* The ISR shall notify about on change to determine whether the
@@ -411,7 +409,7 @@ void ButtonDrv::buttonTaskMainLoop()
  */
 static void IRAM_ATTR isrButton(void* arg)
 {
-    ButtonId        buttonId                    = *reinterpret_cast<ButtonId*>(arg);
+    ButtonId        buttonId                    = *static_cast<ButtonId*>(arg);
     BaseType_t      xHigherPriorityTaskWoken    = pdFALSE;
 
     (void)xQueueSendFromISR(gxQueue, &buttonId, &xHigherPriorityTaskWoken );
diff --git a/src/Hal/ClockDrv.cpp b/src/Hal/ClockDrv.cpp
index 4c96a20e..d0379b46 100644
--- a/src/Hal/ClockDrv.cpp
+++ b/src/Hal/ClockDrv.cpp
@@ -38,6 +38,7 @@
 #include <sys/time.h>
 #include <Logging.h>
 #include <SettingsService.h>
+#include <esp_sntp.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -55,6 +56,8 @@
  * Prototypes
  *****************************************************************************/
 
+extern void sntpCallback(struct timeval *tv);
+
 /******************************************************************************
  * Local Variables
  *****************************************************************************/
@@ -66,86 +69,96 @@ const char* ClockDrv::TZ_UTC = "UTC+0";
  * Public Methods
  *****************************************************************************/
 
-void ClockDrv::init()
+void ClockDrv::init(IRtc* rtc)
 {
-    if (false == m_isClockDrvInitialized)
-    {
-        String              ntpServerAddress;
-        struct tm           timeInfo            = { 0 };
-        SettingsService&    settings            = SettingsService::getInstance();
-        char                tzBuffer[TZ_MIN_SIZE];
-
-        /* Get the GMT offset, daylight saving enabled/disabled and NTP server address from persistent memory. */
-        if (false == settings.open(true))
-        {
-            LOG_WARNING("Use default values for NTP request.");
-
-            m_timeZone          = settings.getTimezone().getDefault();
-            ntpServerAddress    = settings.getNTPServerAddress().getDefault();
-        }
-        else
-        {
-            m_timeZone          = settings.getTimezone().getValue();
-            ntpServerAddress    = settings.getNTPServerAddress().getValue();
-            settings.close();
-        }
-
-        /* Workaround part 1 to avoid memory leaks by calling setenv() of the newlib.
-         * https://github.com/espressif/esp-idf/issues/3046
-         */
-        strcpy(tzBuffer, TZ_UTC);
-        fillUpWithSpaces(tzBuffer, TZ_MIN_SIZE);
-
-        /* Configure NTP:
-         * This will periodically synchronize the time. The time synchronization
-         * period is determined by CONFIG_LWIP_SNTP_UPDATE_DELAY (default value is one hour).
-         * To modify the variable, set CONFIG_LWIP_SNTP_UPDATE_DELAY in project configuration.
-         * https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/system/system_time.html
-         * https://github.com/espressif/esp-idf/issues/4386
-         */
-        configTzTime(tzBuffer, ntpServerAddress.c_str());
+    SettingsService&    settings            = SettingsService::getInstance();
+    char                tzBuffer[TZ_MIN_SIZE];
 
-        /* Workaround part 2 to avoid memory leaks by calling setenv() of the newlib.
-         * https://github.com/espressif/esp-idf/issues/3046
-         */
-        m_internalTimeZoneBuffer = getenv("TZ");
+    /* Handle RTC */
+    m_rtc = rtc;
 
-        /* Wait for synchronization (default 5s) */
-        if (false == getLocalTime(&timeInfo))
+    if (nullptr == m_rtc)
+    {
+        LOG_INFO("No RTC is available.");
+    }
+    else
+    {
+        /* Check whether RTC is available and initialize it. */
+        if (false == m_rtc->begin())
         {
-            LOG_ERROR("Failed to synchronize time.");
+            LOG_INFO("No RTC is available.");
+            m_rtc = nullptr;
         }
         else
         {
-            LOG_INFO("UTC: %d-%d-%d %d:%d", 
-                (timeInfo.tm_year + 1900),
-                (timeInfo.tm_mon + 1),
-                timeInfo.tm_mday,
-                timeInfo.tm_hour,
-                timeInfo.tm_min);
+            LOG_INFO("RTC is available.");
+            syncTimeByRtc();
         }
+    }
 
-        m_isClockDrvInitialized = true;
+    /* Get the GMT offset, daylight saving enabled/disabled and NTP server address from persistent memory. */
+    if (false == settings.open(true))
+    {
+        LOG_WARNING("Use default values for NTP request.");
+
+        m_timeZone          = settings.getTimezone().getDefault();
+        m_ntpServerAddress  = settings.getNTPServerAddress().getDefault();
+    }
+    else
+    {
+        m_timeZone          = settings.getTimezone().getValue();
+        m_ntpServerAddress  = settings.getNTPServerAddress().getValue();
+        settings.close();
     }
+
+    sntp_set_time_sync_notification_cb(sntpCallback);
+    sntp_set_sync_interval(SYNC_TIME_BY_NTP_PERIOD);
+
+    /* Workaround part 1 to avoid memory leaks by calling setenv() of the newlib.
+     * https://github.com/espressif/esp-idf/issues/3046
+     */
+    strcpy(tzBuffer, TZ_UTC);
+    fillUpWithSpaces(tzBuffer, TZ_MIN_SIZE);
+
+    /* Configure NTP:
+     * This will periodically synchronize the time. The time synchronization
+     * period is determined by CONFIG_LWIP_SNTP_UPDATE_DELAY (default value is one hour).
+     * To modify the variable, set CONFIG_LWIP_SNTP_UPDATE_DELAY in project configuration.
+     * https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/system/system_time.html
+     * https://github.com/espressif/esp-idf/issues/4386
+     * 
+     * Important: The NTP server address is not copied by configTzTime(). It will access the
+     * string periodically, therefore its important to keep it as member variable!
+     */
+    configTzTime(tzBuffer, m_ntpServerAddress.c_str());
+
+    /* Workaround part 2 to avoid memory leaks by calling setenv() of the newlib.
+     * https://github.com/espressif/esp-idf/issues/3046
+     */
+    m_internalTimeZoneBuffer = getenv("TZ");
 }
 
-bool ClockDrv::getTime(tm* timeInfo)
+bool ClockDrv::getTime(struct tm& timeInfo)
 {
     return getTzTime(m_timeZone.c_str(), timeInfo);
 }
 
-bool ClockDrv::getUtcTime(tm* timeInfo)
+bool ClockDrv::getUtcTime(struct tm& timeInfo)
 {
     const uint32_t WAIT_TIME_MS = 0U;
 
-    return getLocalTime(timeInfo, WAIT_TIME_MS);
+    syncTimeByRtc();
+
+    return getLocalTime(&timeInfo, WAIT_TIME_MS);
 }
 
-bool ClockDrv::getTzTime(const char* tz, tm* timeInfo)
+bool ClockDrv::getTzTime(const char* tz, struct tm& timeInfo)
 {
     const uint32_t  WAIT_TIME_MS    = 0U;
     bool            result          = false;
 
+    syncTimeByRtc();
+
     if (nullptr != tz)
     {
         /* Configure timezone */
@@ -162,7 +175,7 @@ bool ClockDrv::getTzTime(const char* tz, tm* timeInfo)
         }
     }
 
-    result = getLocalTime(timeInfo, WAIT_TIME_MS);
+    result = getLocalTime(&timeInfo, WAIT_TIME_MS);
 
     if (nullptr != tz)
     {
@@ -205,11 +218,115 @@ void ClockDrv::fillUpWithSpaces(char* str, size_t size)
     str[size - 1U] = '\0';
 }
 
+void ClockDrv::setTimeByRtc()
+{
+    if (nullptr != m_rtc)
+    {
+        struct tm timeInfo;
+
+        if (false == m_rtc->getTime(timeInfo))
+        {
+            time_t          timeSinceEpoch  = mktime(&timeInfo);
+            struct timeval  tv              = { timeSinceEpoch, 0 };
+
+            settimeofday(&tv, nullptr);
+        }
+    }
+}
+
+void ClockDrv::setRtcByTime()
+{
+    if (nullptr != m_rtc)
+    {
+        struct tm timeInfo;
+
+        if (true == getUtcTime(timeInfo))
+        {
+            m_rtc->setTime(timeInfo);
+        }
+    }
+}
+
+void ClockDrv::syncTimeByRtc()
+{
+    if (nullptr != m_rtc)
+    {
+        bool sync = false;
+
+        if (false == m_syncTimeByRtcTimer.isTimerRunning())
+        {
+            m_syncTimeByRtcTimer.start(SYNC_TIME_BY_RTC_PERIOD);
+            sync = true;
+        }
+        else if (true == m_syncTimeByRtcTimer.isTimeout())
+        {
+            sync = true;
+        }
+
+        if (true == sync)
+        {
+            LOG_INFO("Sync time by RTC.");
+
+            setTimeByRtc();
+            m_syncTimeByRtcTimer.restart();
+        }
+    }
+}
+
+void ClockDrv::syncRtcByTime()
+{
+    if (nullptr != m_rtc)
+    {
+        bool sync = false;
+
+        if (false == m_syncRtcByNtpTimer.isTimerRunning())
+        {
+            m_syncRtcByNtpTimer.start(SYNC_RTC_BY_TIME_PERIOD);
+            sync = true;
+        }
+        else if (true == m_syncRtcByNtpTimer.isTimeout())
+        {
+            sync = true;
+        }
+
+        if (true == sync)
+        {
+            LOG_INFO("Sync RTC by time.");
+
+            setRtcByTime();
+            m_syncRtcByNtpTimer.restart();
+        }
+    }
+}
+
 /******************************************************************************
  * External Functions
  *****************************************************************************/
 
+/**
+ * This function is called by the SNTP for every received time information
+ * from the NTP.
+ * 
+ * @param[in] tv    Time information
+ */
+extern void sntpCallback(struct timeval *tv)
+{
+    ClockDrv& clockDrv = ClockDrv::getInstance();
+    
+    (void)tv;
+
+    if (nullptr != clockDrv.m_rtc)
+    {
+        /* As long as updates from NTP are received, no synchronization from the RTC
+         * to the local timer shall be done.
+         */
+        clockDrv.m_syncTimeByRtcTimer.restart();
+        
+        /* Synchronize RTC by time. */
+        clockDrv.syncRtcByTime();
+    }
+}
+
 /******************************************************************************
  * Local Functions
  *****************************************************************************/
-
diff --git a/src/Hal/ClockDrv.h b/src/Hal/ClockDrv.h
index 17d0dbb1..23a49289 100644
--- a/src/Hal/ClockDrv.h
+++ b/src/Hal/ClockDrv.h
@@ -44,7 +44,9 @@
  * Includes
  *****************************************************************************/
 #include "Arduino.h"
-#include "time.h"
+#include <IRtc.h>
+
+#include <SimpleTimer.hpp>
 
 /******************************************************************************
  * Macros
@@ -75,9 +77,11 @@ class ClockDrv
 
     /**
      * Initialize the ClockDrv.
+     * If no RTC is available, use nullptr for the rtc parameter.
      *
+     * @param[in] rtc   Real time clock driver
      */
-    void init();
+    void init(IRtc* rtc);
 
     /**
      * Get the local time by considering device timezone.
@@ -86,7 +90,7 @@ class ClockDrv
      *
      * @return If time is not synchronized, it will return false otherwise true.
      */
-    bool getTime(tm* timeInfo);
+    bool getTime(struct tm& timeInfo);
 
     /**
      * Get the current time in UTC.
@@ -95,7 +99,7 @@ class ClockDrv
      *
      * @return If time is not synchronized, it will return false otherwise true.
      */
-    bool getUtcTime(tm* timeInfo);
+    bool getUtcTime(struct tm& timeInfo);
 
     /**
      * Get the local time by considering the timezone.
@@ -105,26 +109,55 @@ class ClockDrv
      * 
      * @return If time is not synchronized, it will return false otherwise true.
      */
-    bool getTzTime(const char* tz, tm* timeInfo);
+    bool getTzTime(const char* tz, struct tm& timeInfo);
 
 private:
 
     /**
      * The minimum timezone string size (incl. string termination).
      */
-    static const size_t TZ_MIN_SIZE = 60U;
+    static const size_t     TZ_MIN_SIZE             = 60U;
+
+    /**
+     * Use UTC timezone by default.
+     */
+    static const char*      TZ_UTC;
 
-    /** Use UTC timezone by default. */
-    static const char*  TZ_UTC;
+    /**
+     * Period for time synchronization by NTP in ms.
+     */
+    static const uint32_t   SYNC_TIME_BY_NTP_PERIOD = SIMPLE_TIMER_HOURS(12U);
+
+    /**
+     * Period for time synchronization by RTC in ms.
+     */
+    static const int32_t    SYNC_TIME_BY_RTC_PERIOD = SIMPLE_TIMER_HOURS(1U);
+
+    /**
+     * Period for RTC synchronization by time in ms.
+     */
+    static const uint32_t   SYNC_RTC_BY_TIME_PERIOD = SIMPLE_TIMER_DAYS(2U);
 
     /** Flag indicating a initialized clock driver. */
-    bool    m_isClockDrvInitialized;
+    bool        m_isClockDrvInitialized;
 
     /** Device timezone */
-    String  m_timeZone;
+    String      m_timeZone;
 
     /** newlib's internal timezone buffer. */
-    char*   m_internalTimeZoneBuffer;
+    char*       m_internalTimeZoneBuffer;
+
+    /** NTP server address, used by sntp. Don't remove it! */
+    String      m_ntpServerAddress;
+
+    /** Real time clock */
+    IRtc*       m_rtc;
+
+    /** Timer used to synchronize the time by the RTC. */
+    SimpleTimer m_syncTimeByRtcTimer;
+
+    /** Timer used to synchronize the RTC by the time. */
+    SimpleTimer m_syncRtcByNtpTimer;
 
     /**
      * Construct ClockDrv.
@@ -132,7 +165,11 @@ class ClockDrv
     ClockDrv() :
         m_isClockDrvInitialized(false),
         m_timeZone(TZ_UTC),
-        m_internalTimeZoneBuffer(nullptr)
+        m_internalTimeZoneBuffer(nullptr),
+        m_ntpServerAddress(),
+        m_rtc(nullptr),
+        m_syncTimeByRtcTimer(),
+        m_syncRtcByNtpTimer()
     {
     }
 
@@ -154,6 +191,37 @@ class ClockDrv
      * @param[in]       size    String buffer size in byte (incl. termination)
      */
     void fillUpWithSpaces(char* str, size_t size);
+
+    /**
+     * Update the time by the RTC.
+     * If no RTC is available, nothing will happen.
+     */
+    void setTimeByRtc();
+
+    /**
+     * Update the RTC by the time.
+     * If no RTC is available, nothing will happen.
+     */
+    void setRtcByTime();
+
+    /**
+     * Synchronize periodically the time by the RTC.
+     * If the synchronization time period is expired, it will synchronizse
+     * otherwise not.
+     * If no RTC is available, nothing will happen.
+     */
+    void syncTimeByRtc();
+
+    /**
+     * Synchronize periodically the RTC by the time.
+     * If the synchronization time period is expired, it will synchronizse
+     * otherwise not.
+     * If no RTC is available, nothing will happen.
+     */
+    void syncRtcByTime();
+
+    /* Allow the SNTP callback to synchronize the RTC by the NTP. */
+    friend void sntpCallback(struct timeval *tv);
 };
 
 /******************************************************************************
diff --git a/src/Hal/RtcNoneDrv.cpp b/src/Hal/RtcNoneDrv.cpp
new file mode 100644
index 00000000..69829786
--- /dev/null
+++ b/src/Hal/RtcNoneDrv.cpp
@@ -0,0 +1,75 @@
+/* MIT License
+ *
+ * Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*******************************************************************************
+    DESCRIPTION
+*******************************************************************************/
+/**
+ * @brief  RTC driver without functionality
+ * @author Andreas Merkle <web@blue-andi.de>
+ */
+
+/******************************************************************************
+ * Includes
+ *****************************************************************************/
+#include "RtcNoneDrv.h"
+
+/******************************************************************************
+ * Compiler Switches
+ *****************************************************************************/
+
+/******************************************************************************
+ * Macros
+ *****************************************************************************/
+
+/******************************************************************************
+ * Types and classes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Prototypes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Variables
+ *****************************************************************************/
+
+/******************************************************************************
+ * Public Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Protected Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * Private Methods
+ *****************************************************************************/
+
+/******************************************************************************
+ * External Functions
+ *****************************************************************************/
+
+/******************************************************************************
+ * Local Functions
+ *****************************************************************************/
diff --git a/src/StateMachine/OffState.h b/src/Hal/RtcNoneDrv.h
similarity index 65%
rename from src/StateMachine/OffState.h
rename to src/Hal/RtcNoneDrv.h
index 47f667dd..f1599dee 100644
--- a/src/StateMachine/OffState.h
+++ b/src/Hal/RtcNoneDrv.h
@@ -25,16 +25,16 @@
     DESCRIPTION
 *******************************************************************************/
 /**
- * @brief  System state: Off
+ * @brief  RTC driver without functionality
  * @author Andreas Merkle <web@blue-andi.de>
  *
- * @addtogroup sys_states
+ * @addtogroup Hal
  *
  * @{
  */
 
-#ifndef OFFSTATE_H
-#define OFFSTATE_H
+#ifndef RTCNONE_DRV_H
+#define RTCNONE_DRV_H
 
 /******************************************************************************
  * Compile Switches
@@ -43,9 +43,8 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
-#include <stdint.h>
-#include <StateMachine.hpp>
-#include <SimpleTimer.hpp>
+#include "Arduino.h"
+#include <IRtc.h>
 
 /******************************************************************************
  * Macros
@@ -56,70 +55,72 @@
  *****************************************************************************/
 
 /**
- * System state: Off
+ * The RTC driver provides the abstract RTC interface, but has no functionality.
  */
-class OffState : public AbstractState
+class RtcNoneDrv : public IRtc
 {
 public:
 
     /**
-     * Get state instance.
-     *
-     * @return State instance
+     * Constructs the driver.
      */
-    static OffState& getInstance()
+    RtcNoneDrv() :
+        IRtc()
     {
-        static OffState instance;   /* singleton idiom to force initialization in the first usage. */
-
-        return instance;
     }
 
     /**
-     * The entry is called once, a state is entered.
-     *
-     * @param[in] sm    Responsible state machine
-     */
-    void entry(StateMachine& sm) final;
-
-    /**
-     * The process routine is called cyclic, as long as the state is active.
-     *
-     * @param[in] sm    Responsible state machine
+     * Destroys the driver.
      */
-    void process(StateMachine& sm) final;
+    ~RtcNoneDrv()
+    {
+    }
 
     /**
-     * The exit is called once, a state will be left.
-     *
-     * @param[in] sm    Responsible state machine
+     * Checks for the RTC and if available, it will be initialized
+     * and started.
+     * 
+     * @return If no RTC is available, it will return false.
      */
-    void exit(StateMachine& sm) final;
-
-private:
+    bool begin() final
+    {
+        return false;
+    }
 
     /**
-     * Constructs the state.
+     * Get the time from the RTC.
+     * 
+     * @param[out] timeInfo Time destination
+     * 
+     * @return If time info is updated, it will return true otherwise false.
      */
-    OffState()
+    bool getTime(struct tm& timeInfo) final
     {
+        (void)timeInfo;
+
+        return false;
     }
 
     /**
-     * Destroys the state.
+     * Set the RTC by time.
+     * 
+     * @param[in] timeInfo Time source
      */
-    ~OffState()
+    void  setTime(const struct tm& timeInfo) final
     {
+        (void)timeInfo;
     }
 
-    OffState(const OffState& state);
-    OffState& operator=(const OffState& state);
+private:
 
+    RtcNoneDrv(const RtcNoneDrv& drv);
+    RtcNoneDrv& operator=(const RtcNoneDrv& drv);
 };
 
 /******************************************************************************
  * Functions
  *****************************************************************************/
 
-#endif  /* OFFSTATE_H */
+#endif  /* RTCNONE_DRV_H */
 
 /** @} */
\ No newline at end of file
diff --git a/src/Hal/SensorDataProvider.cpp b/src/Hal/SensorDataProvider.cpp
index d3f5362c..fc531d90 100644
--- a/src/Hal/SensorDataProvider.cpp
+++ b/src/Hal/SensorDataProvider.cpp
@@ -38,6 +38,9 @@
 #include <JsonFile.h>
 #include <FileSystem.h>
 #include <SensorChannelType.hpp>
+#include <Util.h>
+#include <TopicHandlerService.h>
+#include <SettingsService.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -47,10 +50,29 @@
  * Macros
  *****************************************************************************/
 
+#define SENSOR_TOPICS_COUNT (4U)
+
 /******************************************************************************
  * Types and classes
  *****************************************************************************/
 
+/** This type defines the required data to publish sensor values as topics. */
+typedef struct
+{
+    ISensorChannel::Type    sensorChannelType;  /**< Sensor channel type. */
+    const char*             extra;              /**< Extra data as JSON string, e.g. for homeassistant extension. */
+    uint32_t                updatePeriod;       /**< Max. sensor data update period in ms regarding publishing. */
+
+} SensorTopic;
+
+/** This type defines the runtime data for a sensor topic, required for publishing. */
+typedef struct
+{
+    String      lastValue;      /**< Last published sensor value. */
+    uint32_t    lastTimestamp;  /**< Last timestamp of publishing, used to limit the update period. */
+
+} SensorTopicRunData;
+
 /******************************************************************************
  * Prototypes
  *****************************************************************************/
@@ -62,14 +84,102 @@
 /* Initialize file name where to find the sensor calibration values. */
 const char* SensorDataProvider::SENSOR_CALIB_FILE_NAME = "/configuration/sensors.json";
 
+/** The provided sensor topics. */
+static const SensorTopic gSensorTopics[SENSOR_TOPICS_COUNT] =
+{
+    {
+        ISensorChannel::TYPE_TEMPERATURE_DEGREE_CELSIUS,
+        "{"                                                     \
+            "\"ha\": {"                                         \
+                "\"component\": \"sensor\","                    \
+                "\"discovery\": {"                              \
+                    "\"name\": \"Temperature\","                \
+                    "\"unit_of_meas\": \"°C\","                 \
+                    "\"ic\": \"mdi:thermometer\","              \
+                    "\"dev_cla\": \"temperature\","             \
+                    "\"val_tpl\": \"{{ value_json.value }}\""   \
+                "}"                                             \
+            "}"                                                 \
+        "}",
+        30000U
+    },
+    {
+        ISensorChannel::TYPE_HUMIDITY_PERCENT,
+        "{"                                                     \
+            "\"ha\": {"                                         \
+                "\"component\": \"sensor\","                    \
+                "\"discovery\": {"                              \
+                    "\"name\": \"Humidity\","                   \
+                    "\"unit_of_meas\": \"%\","                  \
+                    "\"ic\": \"mdi:water-percent\","            \
+                    "\"dev_cla\": \"humidity\","                \
+                    "\"val_tpl\": \"{{ value_json.value }}\""   \
+                "}"                                             \
+            "}"                                                 \
+        "}",
+        30000U
+    },
+    {
+        ISensorChannel::TYPE_ILLUMINANCE_LUX,
+        "{"                                                     \
+            "\"ha\": {"                                         \
+                "\"component\": \"sensor\","                    \
+                "\"discovery\": {"                              \
+                    "\"name\": \"Illuminance\","                \
+                    "\"unit_of_meas\": \"lx\","                 \
+                    "\"ic\": \"mdi:sun-wireless\","             \
+                    "\"dev_cla\": \"illuminance\","             \
+                    "\"val_tpl\": \"{{ value_json.value }}\""   \
+                "}"                                             \
+            "}"                                                 \
+        "}",
+        10000U
+    },
+    {
+        ISensorChannel::TYPE_STATE_OF_CHARGE_PERCENT,
+        "{"                                                     \
+            "\"ha\": {"                                         \
+                "\"component\": \"sensor\","                    \
+                "\"discovery\": {"                              \
+                    "\"name\": \"Battery\","                    \
+                    "\"unit_of_meas\": \"%\","                  \
+                    "\"ic\": \"mdi:battery-90\","               \
+                    "\"dev_cla\": \"battery\","                 \
+                    "\"val_tpl\": \"{{ value_json.value }}\""   \
+                "}"                                             \
+            "}"                                                 \
+        "}",
+        10000U
+    }
+};
+
+/** The runtime sensor topic data. */
+static SensorTopicRunData gSensorLastValue[SENSOR_TOPICS_COUNT] =
+{
+    {   String(), 0U    },
+    {   String(), 0U    },
+    {   String(), 0U    },
+    {   String(), 0U    }
+};
+
 /******************************************************************************
  * Public Methods
  *****************************************************************************/
 
 void SensorDataProvider::begin()
 {
-    uint8_t index   = 0U;
-    uint8_t cnt     = m_impl->getNumSensors();
+    SettingsService& settings = SettingsService::getInstance();
+
+    if (false == settings.open(true))
+    {
+        m_deviceId = settings.getHostname().getDefault();
+    }
+    else
+    {
+        m_deviceId = settings.getHostname().getValue();
+
+        settings.close();
+    }
 
     /* Initialize all sensor drivers. */
     m_impl->begin();
@@ -77,61 +187,16 @@ void SensorDataProvider::begin()
     /* Load calibration values. If they are not available, save it with the sensor defaults. */
     if (false == load())
     {
-        uint8_t                             defaultValues                   = 0U;
-        const SensorChannelDefaultValue*    sensorChannelDefaultValueList   = Sensors::getSensorChannelDefaultValues(defaultValues);
-
-        /* Use the default values. */
-        if (nullptr != sensorChannelDefaultValueList)
-        {
-            for(index = 0U; index < defaultValues; ++index)
-            {
-                const SensorChannelDefaultValue* value = &sensorChannelDefaultValueList[index];
-
-                if (nullptr != value)
-                {
-                    ISensor* sensor = getSensor(value->sensorId);
-
-                    if (nullptr == sensor)
-                    {
-                        LOG_ERROR("Sensor %u doesn't exists.", value->sensorId);
-                    }
-                    else
-                    {
-                        ISensorChannel* channel = sensor->getChannel(value->channelId);
-
-                        if (nullptr == channel)
-                        {
-                            LOG_ERROR("Sensor %u has no channel %u.", value->sensorId, value->channelId);
-                        }
-                        else
-                        {
-                            DynamicJsonDocument jsonDoc(256U);
-
-                            if (DeserializationError::Ok == deserializeJson(jsonDoc, value->jsonStrValue))
-                            {
-                                channelOffsetFromJson(*channel, jsonDoc["offset"]);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        (void)save();
+        createCalibrationFile();
     }
 
-    /* For debug purposes, show the sensor driver states. */
-    for(index = 0U; index < cnt; ++index)
-    {
-        ISensor* sensor = m_impl->getSensor(index);
-
-        if (nullptr != sensor)
-        {
-            bool isAvailable = sensor->isAvailable();
+    logSensorAvailability();
+    registerSensorTopics();
+}
 
-            LOG_INFO("Sensor %s: %s", sensor->getName(), (false == isAvailable) ? "-" : "available" );
-        }
-    }
+void SensorDataProvider::end()
+{
+    unregisterSensorTopics();
 }
 
 uint8_t SensorDataProvider::getNumSensors() const
@@ -218,11 +283,12 @@ bool SensorDataProvider::load()
     JsonFile            jsonFile(FILESYSTEM);
     const size_t        JSON_DOC_SIZE           = 512U;
     DynamicJsonDocument jsonDoc(JSON_DOC_SIZE);
-    uint8_t             sensorIdx               = 0U;
-    const uint8_t       SENSOR_CNT              = m_impl->getNumSensors();
 
     if (true == jsonFile.load(SENSOR_CALIB_FILE_NAME, jsonDoc))
     {
+        uint8_t         sensorIdx   = 0U;
+        const uint8_t   SENSOR_CNT  = m_impl->getNumSensors();
+
         while(SENSOR_CNT > sensorIdx)
         {
             ISensor* sensor = m_impl->getSensor(sensorIdx);
@@ -313,8 +379,30 @@ bool SensorDataProvider::save()
  *****************************************************************************/
 
 SensorDataProvider::SensorDataProvider() :
-    m_impl(Sensors::getSensorDataProviderImpl())
+    m_impl(Sensors::getSensorDataProviderImpl()),
+    m_deviceId()
+{
+}
+
+void SensorDataProvider::logSensorAvailability()
 {
+    uint8_t index   = 0U;
+    uint8_t cnt     = m_impl->getNumSensors();
+
+    /* For user information, show the sensor driver states. */
+    while(cnt > index)
+    {
+        ISensor* sensor = m_impl->getSensor(index);
+
+        if (nullptr != sensor)
+        {
+            bool isAvailable = sensor->isAvailable();
+
+            LOG_INFO("Sensor %s: %s", sensor->getName(), (false == isAvailable) ? "-" : "available" );
+        }
+
+        ++index;
+    }
 }
 
 void SensorDataProvider::channelOffsetToJson(JsonArray& jsonOffset, const ISensorChannel& channel) const
@@ -329,14 +417,7 @@ void SensorDataProvider::channelOffsetToJson(JsonArray& jsonOffset, const ISenso
         {
             const SensorChannelUInt32* uint32Channel = reinterpret_cast<const SensorChannelUInt32*>(&channel);
 
-            if (nullptr == uint32Channel)
-            {
-                jsonOffset.add("NaN");
-            }
-            else
-            {
-                jsonOffset.add(uint32Channel->getOffset());
-            }
+            jsonOffset.add(uint32Channel->getOffset());
         }
         break;
 
@@ -344,15 +425,7 @@ void SensorDataProvider::channelOffsetToJson(JsonArray& jsonOffset, const ISenso
         {
             const SensorChannelInt32* int32Channel = reinterpret_cast<const SensorChannelInt32*>(&channel);
 
-            if (nullptr == int32Channel)
-            {
-                jsonOffset.add("NaN");
-            }
-            else
-            {
-                jsonOffset.add(int32Channel->getOffset());
-            }
-
+            jsonOffset.add(int32Channel->getOffset());
         }
         break;
 
@@ -360,14 +433,7 @@ void SensorDataProvider::channelOffsetToJson(JsonArray& jsonOffset, const ISenso
         {
             const SensorChannelFloat32* float32Channel = reinterpret_cast<const SensorChannelFloat32*>(&channel);
 
-            if (nullptr == float32Channel)
-            {
-                jsonOffset.add("NaN");
-            }
-            else
-            {
-                jsonOffset.add(float32Channel->getOffset());
-            }
+            jsonOffset.add(float32Channel->getOffset());
         }
         break;
 
@@ -392,8 +458,7 @@ void SensorDataProvider::channelOffsetFromJson(ISensorChannel& channel, JsonVari
         {
             SensorChannelUInt32* uint32Channel = reinterpret_cast<SensorChannelUInt32*>(&channel);
 
-            if ((nullptr != uint32Channel) &&
-                (true == jsonOffset.is<uint32_t>()))
+            if (true == jsonOffset.is<uint32_t>())
             {
                 uint32Channel->setOffset(jsonOffset.as<uint32_t>());
             }
@@ -404,8 +469,7 @@ void SensorDataProvider::channelOffsetFromJson(ISensorChannel& channel, JsonVari
         {
             SensorChannelInt32* int32Channel = reinterpret_cast<SensorChannelInt32*>(&channel);
 
-            if ((nullptr != int32Channel) &&
-                (true == jsonOffset.is<int32_t>()))
+            if (true == jsonOffset.is<int32_t>())
             {
                 int32Channel->setOffset(jsonOffset.as<int32_t>());
             }
@@ -416,8 +480,7 @@ void SensorDataProvider::channelOffsetFromJson(ISensorChannel& channel, JsonVari
         {
             SensorChannelFloat32* float32Channel = reinterpret_cast<SensorChannelFloat32*>(&channel);
 
-            if ((nullptr != float32Channel) &&
-                (true == jsonOffset.is<float>()))
+            if (true == jsonOffset.is<float>())
             {
                 float32Channel->setOffset(jsonOffset.as<float>());
             }
@@ -429,10 +492,146 @@ void SensorDataProvider::channelOffsetFromJson(ISensorChannel& channel, JsonVari
         break;
 
     default:
+        /* Not supported. */
         break;
     }
 }
 
+void SensorDataProvider::createCalibrationFile()
+{
+    uint8_t                             defaultValues                   = 0U;
+    const SensorChannelDefaultValue*    sensorChannelDefaultValueList   = Sensors::getSensorChannelDefaultValues(defaultValues);
+
+    /* Use the default values. */
+    if (nullptr != sensorChannelDefaultValueList)
+    {
+        uint8_t index = 0U;
+
+        for(index = 0U; index < defaultValues; ++index)
+        {
+            const SensorChannelDefaultValue*    value   = &sensorChannelDefaultValueList[index];
+            ISensor*                            sensor  = getSensor(value->sensorId);
+
+            if (nullptr == sensor)
+            {
+                LOG_ERROR("Sensor %u doesn't exists.", value->sensorId);
+            }
+            else
+            {
+                ISensorChannel* channel = sensor->getChannel(value->channelId);
+
+                if (nullptr == channel)
+                {
+                    LOG_ERROR("Sensor %u has no channel %u.", value->sensorId, value->channelId);
+                }
+                else
+                {
+                    DynamicJsonDocument jsonDoc(256U);
+
+                    if (DeserializationError::Ok == deserializeJson(jsonDoc, value->jsonStrValue))
+                    {
+                        channelOffsetFromJson(*channel, jsonDoc["offset"]);
+                    }
+                }
+            }
+        }
+    }
+
+    (void)save();
+}
+
+void SensorDataProvider::registerSensorTopics()
+{
+    uint8_t                 index                   = 0U;
+    TopicHandlerService&    topicHandlerService     = TopicHandlerService::getInstance();
+
+    for(index = 0U; index < UTIL_ARRAY_NUM(gSensorTopics); ++index)
+    {
+        const SensorTopic*  sensorTopic             = &gSensorTopics[index];
+        SensorTopicRunData* sensorTopicRunData      = &gSensorLastValue[index];
+        DynamicJsonDocument jsonDoc(512U);
+        JsonObjectConst     extra;
+        uint8_t             sensorIndex             = 0U;
+        uint8_t             channelIndex            = 0U;
+
+        if (DeserializationError::Ok != deserializeJson(jsonDoc, sensorTopic->extra))
+        {
+            LOG_ERROR("Sensor/Channel %u discovery details error.", index);
+        }
+
+        extra = jsonDoc.as<JsonObjectConst>();
+
+        /* Try to find a sensor channel which provides the required information. */
+        if (true == find(sensorIndex, channelIndex, sensorTopic->sensorChannelType))
+        {
+            ISensor*        sensor          = this->getSensor(sensorIndex);
+            ISensorChannel* sensorChannel   = sensor->getChannel(channelIndex);
+            String          channelName     = "/" + ISensorChannel::channelTypeToName(sensorTopic->sensorChannelType);
+            String          entityId        = "sensors/";
+
+            entityId += index;
+
+            ITopicHandler::GetTopicFunc         getTopicFunc    =
+                [sensorTopic, sensorChannel](const String& topic, JsonObject& value) -> bool
+                {
+                    const uint32_t VALUE_PRECISION = 2U; /* 2 digits after the . */
+
+                    UTIL_NOT_USED(topic);
+
+                    value["value"] = sensorChannel->getValueAsString(VALUE_PRECISION);
+
+                    return true;
+                };
+            TopicHandlerService::HasChangedFunc hasChangedFunc  =
+                [sensorTopic, sensorChannel, sensorTopicRunData](const String& topic) -> bool
+                {
+                    bool hasChanged = false;
+
+                    UTIL_NOT_USED(topic);
+
+                    if ((nullptr != sensorTopic) &&
+                        (nullptr != sensorChannel) &&
+                        (nullptr != sensorTopicRunData))
+                    {
+                        String      value       = sensorChannel->getValueAsString(2U);
+                        uint32_t    timestamp   = millis();
+                        uint32_t    delta       = timestamp - sensorTopicRunData->lastTimestamp;
+
+                        if ((sensorTopicRunData->lastValue != value) &&
+                            (sensorTopic->updatePeriod <= delta))
+                        {
+                            sensorTopicRunData->lastValue       = value;
+                            sensorTopicRunData->lastTimestamp   = timestamp;
+
+                            hasChanged = true;
+                        }
+                    }
+
+                    return hasChanged;
+                };
+
+            topicHandlerService.registerTopic(m_deviceId, entityId, channelName, extra, getTopicFunc, hasChangedFunc, nullptr, nullptr);
+        }
+    }
+}
+
+void SensorDataProvider::unregisterSensorTopics()
+{
+    uint8_t                 index                   = 0U;
+    TopicHandlerService&    topicHandlerService     = TopicHandlerService::getInstance();
+
+    for(index = 0U; index < UTIL_ARRAY_NUM(gSensorTopics); ++index)
+    {
+        const SensorTopic*  sensorTopic = &gSensorTopics[index];
+        String              channelName = "/" + ISensorChannel::channelTypeToName(sensorTopic->sensorChannelType);
+        String              entityId    = "sensors/";
+
+        entityId += index;
+        
+        topicHandlerService.unregisterTopic(m_deviceId, entityId, channelName);
+    }
+}
+
 /******************************************************************************
  * External Functions
  *****************************************************************************/
diff --git a/src/Hal/SensorDataProvider.h b/src/Hal/SensorDataProvider.h
index d387115f..130c68a5 100644
--- a/src/Hal/SensorDataProvider.h
+++ b/src/Hal/SensorDataProvider.h
@@ -90,6 +90,11 @@ class SensorDataProvider
      */
     void begin();
 
+    /**
+     * Stop the sensor data provider.
+     */
+    void end();
+
     /**
      * Get number of installed sensor drivers, independed of the physical
      * sensor availability.
@@ -158,6 +163,11 @@ class SensorDataProvider
      */
     SensorDataProviderImpl* m_impl;
 
+    /**
+     * Device id, used for topic registration.
+     */
+    String                  m_deviceId;
+
     /**
      * Constructs the sensor data provder.
      */
@@ -167,6 +177,11 @@ class SensorDataProvider
     SensorDataProvider(const SensorDataProvider& instance);
     SensorDataProvider& operator=(const SensorDataProvider& instance);
 
+    /**
+     * Log the sensor availability to the logging system as user information.
+     */
+    void logSensorAvailability();
+
     /**
      * Add the channel offset value to the JSON array.
      * 
@@ -182,6 +197,21 @@ class SensorDataProvider
      * @param[in]   jsonOffset  JSON offset value
      */
     void channelOffsetFromJson(ISensorChannel& channel, JsonVariantConst jsonOffset) const;
+
+    /**
+     * Create file with the default calibration values.
+     */
+    void createCalibrationFile();
+
+    /**
+     * Register sensor topics.
+     */
+    void registerSensorTopics();
+
+    /**
+     * Unregister sensor topics.
+     */
+    void unregisterSensorTopics();
 };
 
 /******************************************************************************
diff --git a/src/Plugin/PluginFactory.cpp b/src/Plugin/PluginFactory.cpp
index d802df4f..a2d877e6 100644
--- a/src/Plugin/PluginFactory.cpp
+++ b/src/Plugin/PluginFactory.cpp
@@ -33,6 +33,7 @@
  * Includes
  *****************************************************************************/
 #include "PluginFactory.h"
+#include "PluginList.h"
 
 #include <Logging.h>
 
@@ -60,33 +61,6 @@
  * Public Methods
  *****************************************************************************/
 
-void PluginFactory::registerPlugin(const String& name, IPluginMaintenance::CreateFunc createFunc)
-{
-    PluginRegEntry* entry = new(std::nothrow) PluginRegEntry();
-
-    if (nullptr != entry)
-    {
-        entry->name         = name;
-        entry->createFunc   = createFunc;
-
-        if (false == m_registry.append(entry))
-        {
-            LOG_ERROR("Couldn't add %s to registry.", name.c_str());
-
-            delete entry;
-            entry = nullptr;
-        }
-        else
-        {
-            LOG_INFO("Plugin type %s registered.", name.c_str());
-        }
-    }
-    else
-    {
-        LOG_ERROR("Couldn't add %s to registry.", name.c_str());
-    }
-}
-
 IPluginMaintenance* PluginFactory::createPlugin(const String& name)
 {
     return createPlugin(name, generateUID());
@@ -94,46 +68,29 @@ IPluginMaintenance* PluginFactory::createPlugin(const String& name)
 
 IPluginMaintenance* PluginFactory::createPlugin(const String& name, uint16_t uid)
 {
-    IPluginMaintenance*                     plugin  = nullptr;
-    PluginRegEntry*                         entry   = nullptr;
-    DLinkedListIterator<PluginRegEntry*>    itPluginReg(m_registry);
+    IPluginMaintenance*         plugin                  = nullptr;
+    uint8_t                     pluginTypeListLength    = 0U;
+    const PluginList::Element*  pluginTypeList          = PluginList::getList(pluginTypeListLength);
+    uint8_t                     idx                     = 0U;
 
     /* Walk through registry and find the requested plugin type. */
-    if (true == itPluginReg.first())
+    while((nullptr == plugin) && (pluginTypeListLength > idx))
     {
-        bool isFound = false;
-
-        /* Find plugin type in the registry */
-        entry = *itPluginReg.current();
-
-        while((false == isFound) && (nullptr != entry))
-        {
-            if (name == entry->name)
-            {
-                isFound = true;
-            }
-            else if (false == itPluginReg.next())
-            {
-                entry = nullptr;
-            }
-            else
-            {
-                entry = *itPluginReg.current();
-            }
-        }
+        const PluginList::Element* elem = &pluginTypeList[idx];
 
         /* Plugin type found? */
-        if ((true == isFound) &&
-            (nullptr != entry))
+        if (name == elem->name)
         {
             /* Produce the plugin object. */
-            plugin = entry->createFunc(entry->name, uid);
+            plugin = elem->createFunc(elem->name, uid);
 
             if (nullptr != plugin)
             {
                 m_plugins.append(plugin);
             }
         }
+
+        ++idx;
     }
 
     return plugin;
@@ -157,30 +114,6 @@ void PluginFactory::destroyPlugin(IPluginMaintenance* plugin)
     }
 }
 
-const char* PluginFactory::findFirst()
-{
-    const char* name = nullptr;
-
-    if (true == m_registryIter.first())
-    {
-        name = (*m_registryIter.current())->name.c_str();
-    }
-
-    return name;
-}
-
-const char* PluginFactory::findNext()
-{
-    const char* name = nullptr;
-
-    if (true == m_registryIter.next())
-    {
-        name = (*m_registryIter.current())->name.c_str();
-    }
-
-    return name;
-}
-
 /******************************************************************************
  * Protected Methods
  *****************************************************************************/
diff --git a/src/Plugin/PluginFactory.h b/src/Plugin/PluginFactory.h
index 375e1b7e..164e86da 100644
--- a/src/Plugin/PluginFactory.h
+++ b/src/Plugin/PluginFactory.h
@@ -69,8 +69,6 @@ class PluginFactory
      * Constructs the plugin factory.
      */
     PluginFactory() :
-        m_registry(),
-        m_registryIter(m_registry),
         m_plugins()
     {
     }
@@ -85,14 +83,6 @@ class PluginFactory
     {
     }
 
-    /**
-     * Register a plugin, so the factory is able to produce it.
-     *
-     * @param[in] name          Plugin name
-     * @param[in] createFunc    The plugin creation function.
-     */
-    void registerPlugin(const String& name, IPluginMaintenance::CreateFunc createFunc);
-
     /**
      * Create a plugin by name.
      * The plugin UID is automatically generated.
@@ -120,34 +110,9 @@ class PluginFactory
      */
     void destroyPlugin(IPluginMaintenance* plugin);
 
-    /**
-     * Find first registered plugin type.
-     *
-     * @return If plugin type found, it will return its name otherwise nullptr.
-     */
-    const char* findFirst();
-
-    /**
-     * Find next registered plugin type.
-     *
-     * @return If plugin type found, it will return its name otherwise nullptr.
-     */
-    const char* findNext();
-
 private:
 
-    /**
-     * Plugin registry entry.
-     */
-    struct PluginRegEntry
-    {
-        String                          name;       /**< Plugin name */
-        IPluginMaintenance::CreateFunc  createFunc; /**< Plugin creation function */
-    };
-
-    DLinkedList<PluginRegEntry*>            m_registry;     /**< Plugin registry, which contains all registered plugin types. */
-    DLinkedListIterator<PluginRegEntry*>    m_registryIter; /**< Plugin registry iterator. Exclusive use in findFirst() and findNext()! */
-    DLinkedList<IPluginMaintenance*>        m_plugins;      /**< List with all produced plugin objects. */
+    DLinkedList<IPluginMaintenance*>    m_plugins;  /**< List with all produced plugin objects. */
 
     PluginFactory(const PluginFactory& factory);
     PluginFactory& operator=(const PluginFactory& factory);
diff --git a/src/Plugin/PluginMgr.cpp b/src/Plugin/PluginMgr.cpp
index 12366cd9..0d6e8395 100644
--- a/src/Plugin/PluginMgr.cpp
+++ b/src/Plugin/PluginMgr.cpp
@@ -74,12 +74,20 @@ const char* PluginMgr::MQTT_SPECIAL_CHARACTERS  = "+#*>$"; /* See MQTT specifica
 
 void PluginMgr::begin()
 {
-    createPluginConfigDirectory();
-}
+    SettingsService& settings = SettingsService::getInstance();
 
-void PluginMgr::registerPlugin(const String& name, IPluginMaintenance::CreateFunc createFunc)
-{
-    m_pluginFactory.registerPlugin(name, createFunc);
+    if (false == settings.open(true))
+    {
+        m_deviceId = settings.getHostname().getDefault();
+    }
+    else
+    {
+        m_deviceId = settings.getHostname().getValue();
+
+        settings.close();
+    }
+
+    createPluginConfigDirectory();
 }
 
 IPluginMaintenance* PluginMgr::install(const String& name, uint8_t slotId)
@@ -108,7 +116,7 @@ bool PluginMgr::uninstall(IPluginMaintenance* plugin)
 
         if (true == status)
         {
-            TopicHandlerService::getInstance().unregisterTopics(plugin);
+            TopicHandlerService::getInstance().unregisterTopics(m_deviceId, plugin);
 
             m_pluginFactory.destroyPlugin(plugin);
         }
@@ -117,16 +125,6 @@ bool PluginMgr::uninstall(IPluginMaintenance* plugin)
     return status;
 }
 
-const char* PluginMgr::findFirst()
-{
-    return m_pluginFactory.findFirst();
-}
-
-const char* PluginMgr::findNext()
-{
-    return m_pluginFactory.findNext();
-}
-
 bool PluginMgr::setPluginAliasName(IPluginMaintenance* plugin, const String& alias)
 {
     bool isSuccessful = false;
@@ -136,13 +134,13 @@ bool PluginMgr::setPluginAliasName(IPluginMaintenance* plugin, const String& ali
         (true == isPluginAliasValid(alias)))
     {
         /* First remove current registered topics. */
-        TopicHandlerService::getInstance().unregisterTopics(plugin);
+        TopicHandlerService::getInstance().unregisterTopics(m_deviceId, plugin);
 
         /* Set new alias */
         plugin->setAlias(alias);
 
         /* Register web API, based on new alias. */
-        TopicHandlerService::getInstance().registerTopics(plugin);
+        TopicHandlerService::getInstance().registerTopics(m_deviceId, plugin);
 
         isSuccessful = true;
     }
@@ -150,6 +148,19 @@ bool PluginMgr::setPluginAliasName(IPluginMaintenance* plugin, const String& ali
     return isSuccessful;
 }
 
+void PluginMgr::unregisterAllPluginTopics()
+{
+    uint8_t maxSlots    = DisplayMgr::getInstance().getMaxSlots();
+    uint8_t slotId      = 0U;
+
+    for(slotId = 0U; slotId < maxSlots; ++slotId)
+    {
+        IPluginMaintenance* plugin = DisplayMgr::getInstance().getPluginInSlot(slotId);
+
+        TopicHandlerService::getInstance().unregisterTopics(m_deviceId, plugin);
+    }
+}
+
 bool PluginMgr::load()
 {
     bool                isSuccessful            = true;
@@ -378,7 +389,7 @@ bool PluginMgr::install(IPluginMaintenance* plugin, uint8_t slotId)
 
         if (true == isSuccessful)
         {
-            TopicHandlerService::getInstance().registerTopics(plugin);
+            TopicHandlerService::getInstance().registerTopics(m_deviceId, plugin);
         }
     }
 
diff --git a/src/Plugin/PluginMgr.h b/src/Plugin/PluginMgr.h
index a90c2354..672f6cc7 100644
--- a/src/Plugin/PluginMgr.h
+++ b/src/Plugin/PluginMgr.h
@@ -83,14 +83,6 @@ class PluginMgr
      */
     void begin();
 
-    /**
-     * Register a plugin.
-     *
-     * @param[in] name          Plugin name
-     * @param[in] createFunc    The plugin creation function.
-     */
-    void registerPlugin(const String& name, IPluginMaintenance::CreateFunc createFunc);
-
     /**
      * Install plugin.
      * If no slot id is given, the plugin will be installed in the next available slot.
@@ -111,20 +103,6 @@ class PluginMgr
      */
     bool uninstall(IPluginMaintenance* plugin);
 
-    /**
-     * Find first plugin.
-     *
-     * @return If plugin found, it will return its name otherwise nullptr.
-     */
-    const char* findFirst();
-
-    /**
-     * Find next plugin.
-     *
-     * @return If plugin found, it will return its name otherwise nullptr.
-     */
-    const char* findNext();
-
     /**
      * Set the alias name of a plugin.
      * If the plugin has registered a topic handler, the corresponding URIs will be updated.
@@ -135,6 +113,12 @@ class PluginMgr
      */
     bool setPluginAliasName(IPluginMaintenance* plugin, const String& alias);
 
+    /**
+     * Unregister all plugin topics from the topic handler service.
+     * The plugins will still be installed, but won't get any update from outside.
+     */
+    void unregisterAllPluginTopics();
+
     /**
      * Load plugin installation from persistent memory.
      * It will automatically enable the installed plugins.
@@ -162,12 +146,14 @@ class PluginMgr
     static const char*  MQTT_SPECIAL_CHARACTERS;
 
     PluginFactory   m_pluginFactory;    /**< The plugin factory with the plugin type registry. */
+    String          m_deviceId;         /**< Device id, used for topic registration. */
 
     /**
      * Constructs the plugin manager.
      */
     PluginMgr() :
-        m_pluginFactory()
+        m_pluginFactory(),
+        m_deviceId()
     {
     }
 
diff --git a/src/StateMachine/ConnectedState.cpp b/src/StateMachine/ConnectedState.cpp
index bea2b777..8cebadfc 100644
--- a/src/StateMachine/ConnectedState.cpp
+++ b/src/StateMachine/ConnectedState.cpp
@@ -36,9 +36,10 @@
 #include "SysMsg.h"
 #include "UpdateMgr.h"
 #include "MyWebServer.h"
-#include "ClockDrv.h"
 #include "DisplayMgr.h"
 #include "Services.h"
+#include "SensorDataProvider.h"
+#include "PluginMgr.h"
 
 #include "ConnectingState.h"
 #include "RestartState.h"
@@ -86,7 +87,7 @@ void ConnectedState::entry(StateMachine& sm)
 
     LOG_INFO("Connected.");
 
-    /* Get hostname and notifyURL. */
+    /* Get some settings. */
     if (false == settings.open(true))
     {
         LOG_WARNING("Use default hostname.");
@@ -120,9 +121,6 @@ void ConnectedState::entry(StateMachine& sm)
         const uint32_t  DURATION_NON_SCROLLING  = 4000U; /* ms */
         const uint32_t  SCROLLING_REPEAT_NUM    = 2U;
 
-        /* Start the ClockDriver */
-        ClockDrv::getInstance().init();
-
         /* Notify about successful network connection. */
         DisplayMgr::getInstance().setNetworkStatus(true);
 
@@ -138,63 +136,10 @@ void ConnectedState::entry(StateMachine& sm)
             SysMsg::getInstance().show(infoStr, DURATION_NON_SCROLLING, SCROLLING_REPEAT_NUM);
         }
 
-        /* If a push URL is set, notify about the online status. */
-        if (false == notifyURL.isEmpty())
-        {
-            String      url         = notifyURL;
-            const char* GET_CMD     = "get ";
-            const char* POST_CMD    = "post ";
-            bool        isGet       = true;
-
-            /* URL prefix might indicate the kind of request. */
-            url.toLowerCase();
-            if (0U != url.startsWith(GET_CMD))
-            {
-                url = url.substring(strlen(GET_CMD));
-                isGet = true;
-            }
-            else if (0U != url.startsWith(POST_CMD))
-            {
-                url = url.substring(strlen(POST_CMD));
-                isGet = false;
-            }
-            else
-            {
-                ;
-            }
-
-            if (true == m_client.begin(url))
-            {
-                if (false == m_client.GET())
-                {
-                    LOG_WARNING("GET %s failed.", url.c_str());
-                }
-                else
-                {
-                    LOG_INFO("Notification triggered.");
-                }
-            }
-        }
+        pushUrl(notifyURL);
     }
 }
 
-void ConnectedState::initHttpClient()
-{
-    m_client.regOnResponse([](const HttpResponse& rsp){
-        uint16_t statusCode = rsp.getStatusCode();
-
-        if (HttpStatus::STATUS_CODE_OK == statusCode)
-        {
-            LOG_INFO("Online state reported.");
-        }
-
-    });
-
-    m_client.regOnError([]() {
-        LOG_WARNING("Connection error happened.");
-   });
-}
-
 void ConnectedState::process(StateMachine& sm)
 {
     /* Handle update, there may be one in the background. */
@@ -222,10 +167,25 @@ void ConnectedState::exit(StateMachine& sm)
 {
     UTIL_NOT_USED(sm);
 
-    /* Disconnect all connections */
-    (void)WiFi.disconnect();
+    /* User requested (power off / restart after update) to disconnect? */
+    if (true == WiFi.isConnected())
+    {
+        /* Purge sensor topics (MQTT) */
+        SensorDataProvider::getInstance().end();
+
+        /* Unregister all plugins, which will purge all of their topics (MQTT). */
+        PluginMgr::getInstance().unregisterAllPluginTopics();
 
-    /* Notify about lost network connection. */
+        /* Stop all services now to allow them having graceful disconnection from
+         * servers until the wifi will be disconnected.
+         */
+        Services::stopAll();
+
+        /* Disconnect wifi connection. */
+        (void)WiFi.disconnect();
+    }
+
+    /* Notify about no network connection. */
     DisplayMgr::getInstance().setNetworkStatus(false);
 }
 
@@ -237,6 +197,64 @@ void ConnectedState::exit(StateMachine& sm)
  * Private Methods
  *****************************************************************************/
 
+void ConnectedState::initHttpClient()
+{
+    m_client.regOnResponse([](const HttpResponse& rsp){
+        uint16_t statusCode = rsp.getStatusCode();
+
+        if (HttpStatus::STATUS_CODE_OK == statusCode)
+        {
+            LOG_INFO("Online state reported.");
+        }
+
+    });
+
+    m_client.regOnError([]() {
+        LOG_WARNING("Connection error happened.");
+   });
+}
+
+void ConnectedState::pushUrl(const String& pushUrl)
+{
+    /* If a push URL is set, notify about the online status. */
+    if (false == pushUrl.isEmpty())
+    {
+        String      url         = pushUrl;
+        const char* GET_CMD     = "get ";
+        const char* POST_CMD    = "post ";
+        bool        isGet       = true;
+
+        /* URL prefix might indicate the kind of request. */
+        url.toLowerCase();
+        if (0U != url.startsWith(GET_CMD))
+        {
+            url = url.substring(strlen(GET_CMD));
+            isGet = true;
+        }
+        else if (0U != url.startsWith(POST_CMD))
+        {
+            url = url.substring(strlen(POST_CMD));
+            isGet = false;
+        }
+        else
+        {
+            ;
+        }
+
+        if (true == m_client.begin(url))
+        {
+            if (false == m_client.GET())
+            {
+                LOG_WARNING("GET %s failed.", url.c_str());
+            }
+            else
+            {
+                LOG_INFO("Notification triggered.");
+            }
+        }
+    }
+}
+
 /******************************************************************************
  * External Functions
  *****************************************************************************/
diff --git a/src/StateMachine/ConnectedState.h b/src/StateMachine/ConnectedState.h
index 4dc7439a..011404fd 100644
--- a/src/StateMachine/ConnectedState.h
+++ b/src/StateMachine/ConnectedState.h
@@ -125,6 +125,12 @@ class ConnectedState : public AbstractState
      */
     void initHttpClient(void);
     
+    /**
+     * Notify via URL that the system is online.
+     * 
+     * @param[in] pushUrl   Push URL
+     */
+    void pushUrl(const String& pushUrl);
 };
 
 /******************************************************************************
diff --git a/src/StateMachine/InitState.cpp b/src/StateMachine/InitState.cpp
index a820af84..d56c717b 100644
--- a/src/StateMachine/InitState.cpp
+++ b/src/StateMachine/InitState.cpp
@@ -40,8 +40,10 @@
 #include <Display.h>
 #include <SensorDataProvider.h>
 #include <Wire.h>
+#include <IconTextPlugin.h>
 
 #include "ButtonDrv.h"
+#include "ClockDrv.h"
 #include "DisplayMgr.h"
 #include "SysMsg.h"
 #include "Version.h"
@@ -53,7 +55,6 @@
 #include "JsonFile.h"
 #include "Version.h"
 #include "Services.h"
-#include "PluginList.hpp"
 #include "WiFiUtil.h"
 
 #include "APState.h"
@@ -174,14 +175,14 @@ void InitState::entry(StateMachine& sm)
     }
     else
     {
+        /* Initialize clock driver */
+        ClockDrv::getInstance().init(&m_rtcDrv);
+
         /* Initialize sensors */
         SensorDataProvider::getInstance().begin();
 
         /* Prepare everything for the plugins. */
         PluginMgr::getInstance().begin();
-
-        /* Register plugins. This must be done before system message handler is initialized! */
-        PluginList::registerAll();
     }
 
     /* Continue only if there is no error yet. */
diff --git a/src/StateMachine/InitState.h b/src/StateMachine/InitState.h
index 8f8ec0f3..cf603cc6 100644
--- a/src/StateMachine/InitState.h
+++ b/src/StateMachine/InitState.h
@@ -48,6 +48,13 @@
 #include <IPluginMaintenance.hpp>
 #include <SimpleTimer.hpp>
 
+#if CONFIG_RTC == 1
+#include "Rtc1307Drv.h"
+#else /* CONFIG_RTC == 1 */
+#include "RtcNoneDrv.h"
+#endif /* CONFIG_RTC == 1 */
+
+
 /******************************************************************************
  * Macros
  *****************************************************************************/
@@ -110,13 +117,20 @@ class InitState : public AbstractState
     bool        m_isApModeRequested;    /**< Is wifi AP mode requested? */
     SimpleTimer m_timer;                /**< Timer used to stay for a min. time in this state. */
 
+#if CONFIG_RTC == 1
+    Rtc1307Drv  m_rtcDrv;               /**< RTC driver */
+#else /* CONFIG_RTC == 1 */
+    RtcNoneDrv  m_rtcDrv;               /**< RTC driver without functionality. */
+#endif /* CONFIG_RTC == 1 */
+
     /**
      * Constructs the state.
      */
     InitState() :
         m_isQuiet(false),
         m_isApModeRequested(false),
-        m_timer()
+        m_timer(),
+        m_rtcDrv()
     {
     }
 
diff --git a/src/Web/Pages.cpp b/src/Web/Pages.cpp
index 8627c10d..f416c43a 100644
--- a/src/Web/Pages.cpp
+++ b/src/Web/Pages.cpp
@@ -39,7 +39,7 @@
 #include "UpdateMgr.h"
 #include "DisplayMgr.h"
 #include "RestApi.h"
-#include "PluginMgr.h"
+#include "PluginList.h"
 #include "FileSystem.h"
 
 #include <WiFi.h>
@@ -51,6 +51,8 @@
 #include <lwip/init.h>
 #include <SettingsService.h>
 
+#include <mbedtls/version.h>
+
 /******************************************************************************
  * Compiler Switches
  *****************************************************************************/
@@ -137,6 +139,7 @@ static TmplKeyWordFunc  gTmplKeyWordToFunc[]            =
     "FS_SIZE_USED",         []() -> String { return String(FILESYSTEM.usedBytes()); },
     "HEAP_SIZE",            []() -> String { return String(ESP.getHeapSize()); },
     "HEAP_SIZE_AVAILABLE",  []() -> String { return String(ESP.getFreeHeap()); },
+    "MBED_TLS_VERSION",     []() -> String { return String(MBEDTLS_VERSION_STRING); },
     "PSRAM_SIZE",           []() -> String { return String(ESP.getPsramSize()); },
     "PSRAM_SIZE_AVAILABLE", []() -> String { return String(ESP.getFreePsram()); },
     "HOSTNAME",             tmpl::getHostname,
@@ -148,6 +151,7 @@ static TmplKeyWordFunc  gTmplKeyWordToFunc[]            =
     "SW_BRANCH",            []() -> String { return Version::SOFTWARE_BRANCH; },
     "SW_REVISION",          []() -> String { return Version::SOFTWARE_REV; },
     "SW_VERSION",           []() -> String { return Version::SOFTWARE_VER; },
+    "TARGET",               []() -> String { return Version::TARGET; },
     "WS_ENDPOINT",          []() -> String { return WebConfig::WEBSOCKET_PATH; },
     "WS_PORT",              []() -> String { return String(WebConfig::WEBSOCKET_PORT); },
     "WS_PROTOCOL",          []() -> String { return WebConfig::WEBSOCKET_PROTOCOL; }
@@ -171,10 +175,12 @@ static TmplKeyWordFunc  gTmplKeyWordToFunc[]            =
 
 void Pages::init(AsyncWebServer& srv)
 {
-    const char*         pluginName          = nullptr;
-    String              webLoginUser;
-    String              webLoginPassword;
-    SettingsService&    settings            = SettingsService::getInstance();
+    uint8_t                     pluginTypeListLength    = 0U;
+    const PluginList::Element*  pluginTypeList          = PluginList::getList(pluginTypeListLength);
+    uint8_t                     idx                     = 0U;
+    String                      webLoginUser;
+    String                      webLoginPassword;
+    SettingsService&            settings                = SettingsService::getInstance();
 
     if (false == settings.open(true))
     {
@@ -232,10 +238,10 @@ void Pages::init(AsyncWebServer& srv)
         .setAuthentication(webLoginUser.c_str(), webLoginPassword.c_str());
 
     /* Add one page per plugin. */
-    pluginName = PluginMgr::getInstance().findFirst();
-    while(nullptr != pluginName)
+    while(pluginTypeListLength > idx)
     {
-        String uri = PLUGIN_PAGE_PATH + pluginName;
+        const PluginList::Element*  elem    = &pluginTypeList[idx];
+        String                      uri     = PLUGIN_PAGE_PATH + elem->name;
         
         (void)srv.on(   uri.c_str(),
                         HTTP_GET,
@@ -257,15 +263,10 @@ void Pages::init(AsyncWebServer& srv)
 
                         }).setAuthentication(webLoginUser.c_str(), webLoginPassword.c_str());;
 
-        pluginName = PluginMgr::getInstance().findNext();
+        ++idx;
     }
 }
 
-/**
- * Error web page used in case a requested path was not found.
- *
- * @param[in] request   HTTP request
- */
 void Pages::error(AsyncWebServerRequest* request)
 {
     if (nullptr == request)
diff --git a/src/Web/RestApi.cpp b/src/Web/RestApi.cpp
index de82312a..765483ed 100644
--- a/src/Web/RestApi.cpp
+++ b/src/Web/RestApi.cpp
@@ -37,10 +37,12 @@
 #include "DisplayMgr.h"
 #include "Version.h"
 #include "PluginMgr.h"
+#include "PluginList.h"
 #include "WiFiUtil.h"
 #include "FileSystem.h"
 #include "RestUtil.h"
 #include "SlotList.h"
+#include "ButtonActions.h"
 
 #include <Util.h>
 #include <WiFi.h>
@@ -70,6 +72,42 @@ typedef struct
 
 } ContentTypeElem;
 
+/**
+ * Virtual button which can be triggered via REST API.
+ */
+class RestApiButton : public ButtonActions
+{
+public:
+
+    /**
+     * Construct virtual button instance.
+     */
+    RestApiButton() :
+        ButtonActions()
+    {
+    }
+
+    /**
+     * Destroy virtual button instance.
+     */
+    virtual ~RestApiButton()
+    {
+    }
+
+    /**
+     * Execute action by button action id.
+     * 
+     * @param[in] id    Button action id
+     */
+    void executeAction(ButtonActionId id)
+    {
+        ButtonActions::executeAction(id);
+    }
+
+private:
+
+};
+
 /******************************************************************************
  * Prototypes
  *****************************************************************************/
@@ -200,10 +238,38 @@ static void handleButton(AsyncWebServerRequest* request)
     }
     else
     {
-        DisplayMgr::getInstance().activateNextSlot();
- 
-        (void)RestUtil::prepareRspSuccess(jsonDoc);
-        httpStatusCode = HttpStatus::STATUS_CODE_OK;
+        ButtonActionId  actionId        = BUTTON_ACTION_ID_ACTIVATE_NEXT_SLOT; /* Default */
+        bool            isSuccessful    = true;
+
+        if (true == request->hasArg("actionId"))
+        {
+            int32_t i32ActionId = request->arg("actionId").toInt();
+
+            if ((0 > i32ActionId) ||
+                (BUTTON_ACTION_ID_MAX <= i32ActionId))
+            {
+                isSuccessful = false;
+            }
+            else
+            {
+                actionId = static_cast<ButtonActionId>(i32ActionId);
+            }
+        }
+
+        if (false == isSuccessful)
+        {
+            RestUtil::prepareRspError(jsonDoc, "Invalid action id.");
+            httpStatusCode = HttpStatus::STATUS_CODE_METHOD_NOT_ALLOWED;
+        }
+        else
+        {
+            RestApiButton buttonActions;
+
+            buttonActions.executeAction(actionId);
+
+            (void)RestUtil::prepareRspSuccess(jsonDoc);
+            httpStatusCode = HttpStatus::STATUS_CODE_OK;
+        } 
     }
 
     RestUtil::sendJsonRsp(request, jsonDoc, httpStatusCode);
@@ -611,14 +677,17 @@ static void handlePlugins(AsyncWebServerRequest* request)
     }
     else
     {
-        JsonVariant dataObj     = RestUtil::prepareRspSuccess(jsonDoc);
-        JsonArray   pluginArray = dataObj.createNestedArray("plugins");
-        const char* pluginName  = PluginMgr::getInstance().findFirst();
+        JsonVariant                 dataObj                 = RestUtil::prepareRspSuccess(jsonDoc);
+        JsonArray                   pluginArray             = dataObj.createNestedArray("plugins");
+        uint8_t                     pluginTypeListLength    = 0U;
+        const PluginList::Element*  pluginTypeList          = PluginList::getList(pluginTypeListLength);
+        uint8_t                     idx                     = 0U;
 
-        while(nullptr != pluginName)
+        while(pluginTypeListLength > idx)
         {
-            pluginArray.add(pluginName);
-            pluginName = PluginMgr::getInstance().findNext();
+            pluginArray.add(pluginTypeList[idx].name);
+            
+            ++idx;
         }
 
         httpStatusCode = HttpStatus::STATUS_CODE_OK;
@@ -1484,15 +1553,14 @@ static void handleFilePost(AsyncWebServerRequest* request)
  */
 static void uploadHandler(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final)
 {
-    static File fd;
-    bool        isError = false;
+    bool isError = false;
 
     /* Begin of upload? */
     if (0 == index)
     {
-        fd = FILESYSTEM.open(filename, "w");
+        request->_tempFile = FILESYSTEM.open(filename, "w");
 
-        if (false == fd)
+        if (false == request->_tempFile)
         {
             isError = true;
         }
@@ -1502,9 +1570,9 @@ static void uploadHandler(AsyncWebServerRequest *request, const String& filename
         }
     }
 
-    if (true == fd)
+    if (true == request->_tempFile)
     {
-        (void)fd.write(data, len);
+        (void)request->_tempFile.write(data, len);
     }
 
     if ((true == final) &&
@@ -1512,13 +1580,13 @@ static void uploadHandler(AsyncWebServerRequest *request, const String& filename
     {        
         LOG_INFO("File %s successful written.", filename.c_str());
 
-        fd.close();
+        request->_tempFile.close();
     }
     else if (true == isError)
     {
         LOG_INFO("File %s upload aborted.", filename.c_str());
 
-        fd.close();
+        request->_tempFile.close();
     }
 
     if (true == isError)
diff --git a/src/Web/RestUtil.cpp b/src/Web/RestUtil.cpp
index 6d6be1f5..68733391 100644
--- a/src/Web/RestUtil.cpp
+++ b/src/Web/RestUtil.cpp
@@ -72,13 +72,6 @@
  * External Functions
  *****************************************************************************/
 
-/**
- * Prepare JSON document for success response.
- * 
- * @param[out]  jsonDoc JSON document
- * 
- * @return JSON object where to add additional data.
- */
 JsonVariant RestUtil::prepareRspSuccess(JsonDocument& jsonDoc)
 {
     JsonObject dataObj = jsonDoc.createNestedObject("data");
@@ -88,12 +81,6 @@ JsonVariant RestUtil::prepareRspSuccess(JsonDocument& jsonDoc)
     return dataObj;
 }
 
-/**
- * Prepare JSON document for error response.
- * 
- * @param[out]  jsonDoc JSON document where to add error response.
- * @param[in]   msg     Error message
- */
 void RestUtil::prepareRspError(JsonDocument& jsonDoc, const char* msg)
 {
     JsonObject errorObj = jsonDoc.createNestedObject("error");
@@ -102,23 +89,11 @@ void RestUtil::prepareRspError(JsonDocument& jsonDoc, const char* msg)
     jsonDoc["status"]   = "error";
 }
 
-/**
- * Prepare JSON document for concrete error response: HTTP method not supported.
- * 
- * @param[out]  jsonDoc JSON document where to add error response.
- */
 void RestUtil::prepareRspErrorHttpMethodNotSupported(JsonDocument& jsonDoc)
 {
     prepareRspError(jsonDoc, "HTTP method not supported.");
 }
 
-/**
- * Send a application/json response to the client back.
- * 
- * @param[in] request           Client request
- * @param[in] jsonDoc           JSON response document
- * @param[in] httpStatusCode    HTTP status code
- */
 void RestUtil::sendJsonRsp(AsyncWebServerRequest* request, const JsonDocument& jsonDoc, uint32_t httpStatusCode)
 {
     if (true == jsonDoc.overflowed())
diff --git a/src/Web/WebSocket.cpp b/src/Web/WebSocket.cpp
index 61110574..b525e2b8 100644
--- a/src/Web/WebSocket.cpp
+++ b/src/Web/WebSocket.cpp
@@ -193,7 +193,7 @@ void WebSocketSrv::onEvent(AsyncWebSocket* server, AsyncWebSocketClient* client,
     {
     /* Client connected */
     case WS_EVT_CONNECT:
-        getInstance().onConnect(server, client, reinterpret_cast<AsyncWebServerRequest*>(arg));
+        getInstance().onConnect(server, client, static_cast<AsyncWebServerRequest*>(arg));
         break;
 
     /* Client disconnected */
@@ -208,12 +208,12 @@ void WebSocketSrv::onEvent(AsyncWebSocket* server, AsyncWebSocketClient* client,
 
     /* Remote error */
     case WS_EVT_ERROR:
-        getInstance().onError(server, client, *reinterpret_cast<uint16_t*>(arg), reinterpret_cast<const char*>(data), len);
+        getInstance().onError(server, client, *static_cast<uint16_t*>(arg), reinterpret_cast<const char*>(data), len);
         break;
 
     /* Data */
     case WS_EVT_DATA:
-        getInstance().onData(server, client, reinterpret_cast<AwsFrameInfo*>(arg), data, len);
+        getInstance().onData(server, client, static_cast<AwsFrameInfo*>(arg), data, len);
         break;
 
     default:
@@ -287,7 +287,10 @@ void WebSocketSrv::onData(AsyncWebSocket* server, AsyncWebSocketClient* client,
         /* Handle text message */
         else
         {
-            handleMsg(server, client, reinterpret_cast<const char*>(data), len);
+            const void* vData   = data;
+            const char* cData   = static_cast<const char*>(vData);
+
+            handleMsg(server, client, cData, len);
         }
     }
     /* Message is comprised of multiple frames or the frame is split into multiple packets */
@@ -301,8 +304,8 @@ void WebSocketSrv::onData(AsyncWebSocket* server, AsyncWebSocketClient* client,
 void WebSocketSrv::handleMsg(AsyncWebSocket* server, AsyncWebSocketClient* client, const char* msg, size_t msgLen)
 {
     size_t      msgIndex    = 0U;
-    String      cmd;
-    String      par;
+    const char* cmd         = nullptr;
+    size_t      cmdLength   = 0U;
     WsCmd*      wsCmd       = nullptr;
     const char  DELIMITER   = ';';
 
@@ -321,21 +324,23 @@ void WebSocketSrv::handleMsg(AsyncWebSocket* server, AsyncWebSocketClient* clien
     }
 
     /* Get command string */
+    cmd = &msg[msgIndex];
     while((msgLen > msgIndex) && (DELIMITER != msg[msgIndex]))
     {
-        cmd += msg[msgIndex];
+        ++cmdLength;
         ++msgIndex;
     }
 
     /* Command string not empty? */
-    if (0 < cmd.length())
+    if (0 < cmdLength)
     {
         uint8_t index = 0U;
 
         /* Find command object */
         while((nullptr == wsCmd) && (index < UTIL_ARRAY_NUM(gWsCommands)))
         {
-            if (cmd == gWsCommands[index]->getCmd())
+            /* Note, cmd is NOT terminated! */
+            if (0 == strncmp(gWsCommands[index]->getCmd(), cmd, cmdLength))
             {
                 wsCmd = gWsCommands[index];
             }
@@ -354,28 +359,39 @@ void WebSocketSrv::handleMsg(AsyncWebSocket* server, AsyncWebSocketClient* clien
             if ((msgLen > msgIndex) &&
                 (DELIMITER == msg[msgIndex]))
             {
+                const char* par;
+                size_t      parLength;
+                String      parStr;
+
                 /* Overstep delimiter */
                 ++msgIndex;
 
+                par = &msg[msgIndex];
+                parLength = 0U;
                 while(msgLen > msgIndex)
                 {
                     if (DELIMITER == msg[msgIndex])
                     {
-                        wsCmd->setPar(par.c_str());
-                        par.clear();
+                        parStr = String(par, parLength);
+
+                        wsCmd->setPar(parStr.c_str());
+
+                        par = &msg[msgIndex + 1U];
+                        parLength = 0U;
                     }
                     else
                     {
-                        par += msg[msgIndex];
+                        ++parLength;
                     }
 
                     ++msgIndex;
                 }
 
-                wsCmd->setPar(par.c_str());
+                parStr = String(par, parLength);
+                wsCmd->setPar(parStr.c_str());
             }
 
-            /* Execute command */
+            /* Execute command (attention, its called in callback context). */
             wsCmd->execute(server, client);
         }
     }
diff --git a/src/Web/WsCommand/WsCmd.cpp b/src/Web/WsCommand/WsCmd.cpp
index 27a84777..f284a564 100644
--- a/src/Web/WsCommand/WsCmd.cpp
+++ b/src/Web/WsCommand/WsCmd.cpp
@@ -71,14 +71,15 @@ const char*    WsCmd::NACK      = "NACK";
  * Protected Methods
  *****************************************************************************/
 
-void WsCmd::sendPositiveResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const String& msg)
+void WsCmd::sendPositiveResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const char* msg)
 {
     if ((nullptr != server) &&
         (nullptr != client))
     {
         String rsp = ACK;
 
-        if (false == msg.isEmpty())
+        if ((nullptr != msg) &&
+            ('\0' != msg[0U]))
         {
             rsp += DELIMITER;
             rsp += msg;
@@ -90,10 +91,10 @@ void WsCmd::sendPositiveResponse(AsyncWebSocket* server, AsyncWebSocketClient* c
 
 void WsCmd::sendPositiveResponse(AsyncWebSocket* server, AsyncWebSocketClient* client)
 {
-    sendPositiveResponse(server, client, "");
+    sendPositiveResponse(server, client, nullptr);
 }
 
-void WsCmd::sendNegativeResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const String& msg)
+void WsCmd::sendNegativeResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const char* msg)
 {
     if ((nullptr != server) &&
         (nullptr != client))
@@ -101,7 +102,16 @@ void WsCmd::sendNegativeResponse(AsyncWebSocket* server, AsyncWebSocketClient* c
         String rsp = NACK;
 
         rsp += DELIMITER;
-        rsp += msg;
+
+        if ((nullptr != msg) &&
+            ('\0' != msg[0U]))
+        {
+            rsp += msg;
+        }
+        else
+        {
+            rsp += "\"Unknown.\"";
+        }
 
         server->text(client->id(), rsp);
     }
diff --git a/src/Web/WsCommand/WsCmd.h b/src/Web/WsCommand/WsCmd.h
index 352a7d42..fd17403f 100644
--- a/src/Web/WsCommand/WsCmd.h
+++ b/src/Web/WsCommand/WsCmd.h
@@ -82,7 +82,7 @@ class WsCmd
      * 
      * @return Command string
      */
-    const String& getCmd() const
+    const char* getCmd() const
     {
         return m_cmd;
     }
@@ -113,6 +113,42 @@ class WsCmd
     /** Negative response code. */
     static const char*    NACK;
 
+    /**
+     * Prepare a positive response message.
+     * The last added element will always be a delimiter.
+     * 
+     * @param[out] msg  Message to prepare
+     */
+    void preparePositiveResponse(String& msg)
+    {
+        msg = ACK;
+        msg += DELIMITER;
+    }
+
+    /**
+     * Prepare a negative response message.
+     * The last added element will always be a delimiter.
+     * 
+     * @param[out] msg  Message to prepare
+     */
+    void prepareNegativeResponse(String& msg)
+    {
+        msg = NACK;
+        msg += DELIMITER;
+    }
+
+    /**
+     * Send a response to the client.
+     * 
+     * @param[in] server    Websocket server which is used to send a message to the client.
+     * @param[in] client    The client the message belongs to.
+     * @param[in] msg       The response messsage.
+     */
+    void sendResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const String& msg)
+    {
+        server->text(client->id(), msg);
+    }
+
     /**
      * Send positive response to the client.
      * 
@@ -120,7 +156,7 @@ class WsCmd
      * @param[in] client    The client the message belongs to.
      * @param[in] msg       The negative response messsage.
      */
-    void sendPositiveResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const String& msg);
+    void sendPositiveResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const char* msg);
 
     /**
      * Send negative response to the client.
@@ -138,11 +174,11 @@ class WsCmd
      * @param[in] client    The client the message belongs to.
      * @param[in] msg       The negative response messsage.
      */
-    void sendNegativeResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const String& msg);
+    void sendNegativeResponse(AsyncWebSocket* server, AsyncWebSocketClient* client, const char* msg);
 
 private:
 
-    String  m_cmd;  /**< Command */
+    const char* m_cmd;  /**< Command */
 
     WsCmd();
     WsCmd(const WsCmd& cmd);
diff --git a/src/Web/WsCommand/WsCmdAlias.cpp b/src/Web/WsCommand/WsCmdAlias.cpp
index 68be4e4a..2dc85bf0 100644
--- a/src/Web/WsCommand/WsCmdAlias.cpp
+++ b/src/Web/WsCommand/WsCmdAlias.cpp
@@ -84,11 +84,13 @@ void WsCmdAlias::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
             (void)DisplayMgr::getInstance().setPluginAliasName(m_pluginUid, m_alias);
         }
 
-        msg = "\"";
+        preparePositiveResponse(msg);
+
+        msg += "\"";
         msg += DisplayMgr::getInstance().getPluginAliasName(m_pluginUid);
         msg += "\"";
 
-        sendPositiveResponse(server, client, msg);
+        sendResponse(server, client, msg);
     }
 
     m_isError = false;
diff --git a/src/Web/WsCommand/WsCmdBrightness.cpp b/src/Web/WsCommand/WsCmdBrightness.cpp
index bc67c46b..c427afad 100644
--- a/src/Web/WsCommand/WsCmdBrightness.cpp
+++ b/src/Web/WsCommand/WsCmdBrightness.cpp
@@ -93,11 +93,13 @@ void WsCmdBrightness::execute(AsyncWebSocket* server, AsyncWebSocketClient* clie
             ;
         }
 
-        msg  = DisplayMgr::getInstance().getBrightness();
+        preparePositiveResponse(msg);
+
+        msg += DisplayMgr::getInstance().getBrightness();
         msg += DELIMITER;
         msg += (true == DisplayMgr::getInstance().getAutoBrightnessAdjustment()) ? 1 : 0;
 
-        sendPositiveResponse(server, client, msg);
+        sendResponse(server, client, msg);
     }
 
     m_isError = false;
diff --git a/src/Web/WsCommand/WsCmdButton.cpp b/src/Web/WsCommand/WsCmdButton.cpp
index 1c63b13a..6e1f82b1 100644
--- a/src/Web/WsCommand/WsCmdButton.cpp
+++ b/src/Web/WsCommand/WsCmdButton.cpp
@@ -33,7 +33,7 @@
  * Includes
  *****************************************************************************/
 #include "WsCmdButton.h"
-#include "DisplayMgr.h"
+#include "ButtonActions.h"
 
 #include <Util.h>
 
@@ -76,7 +76,7 @@ void WsCmdButton::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
     }
     else
     {
-        DisplayMgr::getInstance().activateNextSlot();
+        executeAction(m_actionId);
 
         sendPositiveResponse(server, client);
     }
@@ -86,9 +86,16 @@ void WsCmdButton::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
 
 void WsCmdButton::setPar(const char* par)
 {
-    UTIL_NOT_USED(par);
+    uint8_t actionId;
 
-    m_isError = true;
+    if (false == Util::strToUInt8(par, actionId))
+    {
+        m_isError = true;
+    }
+    else
+    {
+        m_actionId = static_cast<ButtonActionId>(actionId);
+    }
 }
 
 /******************************************************************************
diff --git a/src/Web/WsCommand/WsCmdButton.h b/src/Web/WsCommand/WsCmdButton.h
index cb9c0d29..cade8191 100644
--- a/src/Web/WsCommand/WsCmdButton.h
+++ b/src/Web/WsCommand/WsCmdButton.h
@@ -44,6 +44,7 @@
  * Includes
  *****************************************************************************/
 #include "WsCmd.h"
+#include "ButtonActions.h"
 
 /******************************************************************************
  * Macros
@@ -56,7 +57,7 @@
 /**
  * Websocket command to control the virtual user button.
  */
-class WsCmdButton: public WsCmd
+class WsCmdButton: public WsCmd, public ButtonActions
 {
 public:
 
@@ -65,7 +66,9 @@ class WsCmdButton: public WsCmd
      */
     WsCmdButton() :
         WsCmd("BUTTON"),
-        m_isError(false)
+        ButtonActions(),
+        m_isError(false),
+        m_actionId(BUTTON_ACTION_ID_ACTIVATE_NEXT_SLOT) /* Default */
     {
     }
 
@@ -93,7 +96,8 @@ class WsCmdButton: public WsCmd
 
 private:
 
-    bool    m_isError;  /**< Any error happened during parameter reception? */
+    bool            m_isError;  /**< Any error happened during parameter reception? */
+    ButtonActionId  m_actionId; /**< Id of the action, which to execute. */
 
     WsCmdButton(const WsCmdButton& cmd);
     WsCmdButton& operator=(const WsCmdButton& cmd);
diff --git a/src/Web/WsCommand/WsCmdEffect.cpp b/src/Web/WsCommand/WsCmdEffect.cpp
index 7b222d41..8e6871bb 100644
--- a/src/Web/WsCommand/WsCmdEffect.cpp
+++ b/src/Web/WsCommand/WsCmdEffect.cpp
@@ -83,9 +83,11 @@ void WsCmdEffect::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
             DisplayMgr::getInstance().activateNextFadeEffect(static_cast<DisplayMgr::FadeEffect>(m_fadeEffect));
         }
 
-        msg = DisplayMgr::getInstance().getFadeEffect();
+        preparePositiveResponse(msg);
 
-        sendPositiveResponse(server, client, msg);
+        msg += DisplayMgr::getInstance().getFadeEffect();
+
+        sendResponse(server, client, msg);
     }
 
     m_isError = false;
diff --git a/src/Web/WsCommand/WsCmdGetDisp.cpp b/src/Web/WsCommand/WsCmdGetDisp.cpp
index db442885..022f3fe6 100644
--- a/src/Web/WsCommand/WsCmdGetDisp.cpp
+++ b/src/Web/WsCommand/WsCmdGetDisp.cpp
@@ -78,27 +78,40 @@ void WsCmdGetDisp::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
     }
     else
     {
-        uint32_t    index       = 0U;
-        String      msg;
         IDisplay&   display     = Display::getInstance();
-        uint32_t    framebuffer[display.getWidth() * display.getHeight()];
-        uint8_t     slotId      = SlotList::SLOT_ID_INVALID;
+        size_t      fbLength    = display.getWidth() * display.getHeight();
+        uint32_t*   framebuffer = new(std::nothrow) uint32_t[fbLength];
 
-        DisplayMgr::getInstance().getFBCopy(framebuffer, UTIL_ARRAY_NUM(framebuffer), &slotId);
+        if (nullptr == framebuffer)
+        {
+            sendNegativeResponse(server, client, "\"Internal error.\"");
+        }
+        else
+        {
+            uint32_t    index       = 0U;
+            String      msg;
+            uint8_t     slotId      = SlotList::SLOT_ID_INVALID;
 
-        msg  = slotId;
-        msg += DELIMITER;
-        msg += display.getWidth();
-        msg += DELIMITER;
-        msg += display.getHeight();
+            DisplayMgr::getInstance().getFBCopy(framebuffer, fbLength, &slotId);
 
-        for(index = 0U; index <  UTIL_ARRAY_NUM(framebuffer); ++index)
-        {
+            preparePositiveResponse(msg);
+
+            msg += slotId;
+            msg += DELIMITER;
+            msg += display.getWidth();
             msg += DELIMITER;
-            msg += Util::uint32ToHex(framebuffer[index]);
+            msg += display.getHeight();
+
+            for(index = 0U; index <  fbLength; ++index)
+            {
+                msg += DELIMITER;
+                msg += Util::uint32ToHex(framebuffer[index]);
+            }
+
+            delete[] framebuffer;
+            
+            sendResponse(server, client, msg);
         }
-        
-        sendPositiveResponse(server, client, msg);
     }
 
     m_isError = false;
diff --git a/src/Web/WsCommand/WsCmdInstall.cpp b/src/Web/WsCommand/WsCmdInstall.cpp
index 65a44506..136a2801 100644
--- a/src/Web/WsCommand/WsCmdInstall.cpp
+++ b/src/Web/WsCommand/WsCmdInstall.cpp
@@ -86,7 +86,9 @@ void WsCmdInstall::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
         }
         else
         {
-            msg  = DisplayMgr::getInstance().getSlotIdByPluginUID(plugin->getUID());
+            preparePositiveResponse(msg);
+
+            msg += DisplayMgr::getInstance().getSlotIdByPluginUID(plugin->getUID());
             msg += DELIMITER;
             msg += plugin->getUID();
 
@@ -94,9 +96,9 @@ void WsCmdInstall::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
 
             /* Save current installed plugins to persistent memory. */
             PluginMgr::getInstance().save();
-        }
 
-        sendPositiveResponse(server, client, msg);
+            sendResponse(server, client, msg);
+        }
     }
 
     m_isError = false;
diff --git a/src/Web/WsCommand/WsCmdIperf.cpp b/src/Web/WsCommand/WsCmdIperf.cpp
index 261964bd..f5c08698 100644
--- a/src/Web/WsCommand/WsCmdIperf.cpp
+++ b/src/Web/WsCommand/WsCmdIperf.cpp
@@ -81,16 +81,18 @@ void WsCmdIperf::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
     {
         String msg;
 
+        preparePositiveResponse(msg);
+
         if (false == m_isIperfRunning)
         {
-            msg = "0";
+            msg += "0";
         }
         else
         {
-            msg = "1";
+            msg += "1";
         }
         
-        sendPositiveResponse(server, client, msg);
+        sendResponse(server, client, msg);
     }
     /* Start iperf? */
     else if (CMD_START == m_cmd)
@@ -101,7 +103,11 @@ void WsCmdIperf::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
         }
         else
         {
-            String msg = "1";
+            String msg;
+            
+            preparePositiveResponse(msg);
+
+            msg += "1";
 
             LOG_INFO("iperf started: mode = %s-%s sip = %u.%u.%u.%u:%u, interval = %us, time = %us",
                 (m_cfg.flag & IPERF_FLAG_TCP) ? "tcp" : "udp",
@@ -109,7 +115,7 @@ void WsCmdIperf::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
                 m_cfg.sip & 0xffU, (m_cfg.sip >> 8) & 0xffU, (m_cfg.sip >> 16) & 0xffU, (m_cfg.sip >>24) & 0xffU, m_cfg.sport,
                 m_cfg.interval, m_cfg.time);
 
-            sendPositiveResponse(server, client, msg);
+            sendResponse(server, client, msg);
         }
     }
     /* Stop iperf? */
@@ -121,11 +127,15 @@ void WsCmdIperf::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
         }
         else
         {
-            String msg = "0";
+            String msg;
+            
+            preparePositiveResponse(msg);
+            
+            msg += "0";
 
             LOG_INFO("iperf stopped.");
 
-            sendPositiveResponse(server, client, msg);
+            sendResponse(server, client, msg);
         }
     }
     else
diff --git a/src/Web/WsCommand/WsCmdLog.cpp b/src/Web/WsCommand/WsCmdLog.cpp
index 1d9816e5..c0f64f6e 100644
--- a/src/Web/WsCommand/WsCmdLog.cpp
+++ b/src/Web/WsCommand/WsCmdLog.cpp
@@ -94,17 +94,19 @@ void WsCmdLog::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
 
         selectedSink = Logging::getInstance().getSelectedSink();
 
+        preparePositiveResponse(msg);
+
         if ((nullptr == selectedSink) ||
             (selectedSink->getName() != "Websocket"))
         {
-            msg = "0";
+            msg += "0";
         }
         else
         {
-            msg = "1";
+            msg += "1";
         }
 
-        sendPositiveResponse(server, client, msg);
+        sendResponse(server, client, msg);
     }
 
     m_cnt       = 0U;
diff --git a/src/Web/WsCommand/WsCmdPlugins.cpp b/src/Web/WsCommand/WsCmdPlugins.cpp
index a80395f5..cd9cba92 100644
--- a/src/Web/WsCommand/WsCmdPlugins.cpp
+++ b/src/Web/WsCommand/WsCmdPlugins.cpp
@@ -33,7 +33,7 @@
  * Includes
  *****************************************************************************/
 #include "WsCmdPlugins.h"
-#include "PluginMgr.h"
+#include "PluginList.h"
 
 #include <Util.h>
 
@@ -76,27 +76,28 @@ void WsCmdPlugins::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
     }
     else
     {
-        String      msg;
-        uint8_t     cnt         = 0U;
-        const char* pluginName  = PluginMgr::getInstance().findFirst();
+        String                      msg;
+        uint8_t                     pluginTypeListLength    = 0U;
+        const PluginList::Element*  pluginTypeList          = PluginList::getList(pluginTypeListLength);
+        uint8_t                     idx                     = 0U;
 
-        while(nullptr != pluginName)
+        preparePositiveResponse(msg);
+
+        while(pluginTypeListLength > idx)
         {
-            if (0 < cnt)
+            if (0 < idx)
             {
                 msg += DELIMITER;
             }
 
             msg += "\"";
-            msg += pluginName;
+            msg += pluginTypeList[idx].name;
             msg += "\"";
 
-            pluginName = PluginMgr::getInstance().findNext();
-
-            ++cnt;
+            ++idx;
         }
 
-        sendPositiveResponse(server, client, msg);
+        sendResponse(server, client, msg);
     }
 
     m_isError = false;
diff --git a/src/Web/WsCommand/WsCmdSlotDuration.cpp b/src/Web/WsCommand/WsCmdSlotDuration.cpp
index a1ccc46b..57b8bdf6 100644
--- a/src/Web/WsCommand/WsCmdSlotDuration.cpp
+++ b/src/Web/WsCommand/WsCmdSlotDuration.cpp
@@ -89,9 +89,11 @@ void WsCmdSlotDuration::execute(AsyncWebSocket* server, AsyncWebSocketClient* cl
             }
         }
 
-        msg = DisplayMgr::getInstance().getSlotDuration(m_slotId);
+        preparePositiveResponse(msg);
 
-        sendPositiveResponse(server, client, msg);
+        msg += DisplayMgr::getInstance().getSlotDuration(m_slotId);
+
+        sendResponse(server, client, msg);
     }
 
     m_isError = false;
diff --git a/src/Web/WsCommand/WsCmdSlots.cpp b/src/Web/WsCommand/WsCmdSlots.cpp
index bd3d5888..744816ac 100644
--- a/src/Web/WsCommand/WsCmdSlots.cpp
+++ b/src/Web/WsCommand/WsCmdSlots.cpp
@@ -82,7 +82,9 @@ void WsCmdSlots::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
         uint8_t     slotId      = SlotList::SLOT_ID_INVALID;
         uint8_t     stickySlot  = displayMgr.getStickySlot();
 
-        msg = displayMgr.getMaxSlots();
+        preparePositiveResponse(msg);
+
+        msg += displayMgr.getMaxSlots();
 
         /* Provides for every slot:
          * - Name of plugin.
@@ -120,7 +122,7 @@ void WsCmdSlots::execute(AsyncWebSocket* server, AsyncWebSocketClient* client)
             msg += duration;
         }
 
-        sendPositiveResponse(server, client, msg);
+        sendResponse(server, client, msg);
     }
 
     m_isError = false;
diff --git a/src/main.cpp b/src/main.cpp
index 2f183b43..225cdc79 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -41,7 +41,6 @@
 
 #include "InitState.h"
 #include "RestartState.h"
-#include "OffState.h"
 #include "TaskMon.h"
 #include "MemMon.h"
 #include "ResetMon.h"
@@ -222,19 +221,12 @@ void loop()
 
     /* Handle button actions only if
      * - No update is running.
-     * - Not in OffState.
      * - Not in RestartState.
      */
     if ((false == UpdateMgr::getInstance().isUpdateRunning()) &&
-        (&OffState::getInstance() != gSysStateMachine.getState()) &&
         (&RestartState::getInstance() != gSysStateMachine.getState()))
     {
         gButtonHandler.process();
-
-        if (true == gButtonHandler.isSwitchOffRequested())
-        {
-            gSysStateMachine.setState(OffState::getInstance());
-        }
     }
 
     /* Schedule other tasks with same or lower priority. */
diff --git a/test/test_Logging/TestLogging.cpp b/test/test_Logging/TestLogging.cpp
index 1ea3c8d7..23820987 100644
--- a/test/test_Logging/TestLogging.cpp
+++ b/test/test_Logging/TestLogging.cpp
@@ -129,6 +129,7 @@ static void testLogging()
     const char*     LOG_MODULE      = strrchr(__FILE__, '\\'); /* Windows backslash */
     const char*     TEST_STRING_1   = "TestMessage";
     const String    TEST_STRING_2   = "TestMessageAsString";
+    const char*     LOG_FORMAT      = "%*s %*s:%.*d %s\n";
     char            expectedLogMessage[128];
     int             lineNo          = 0;
 
@@ -167,7 +168,7 @@ static void testLogging()
 
     /* Check expected error log output, with type const char* string. */
     LOG_ERROR(TEST_STRING_1); lineNo = __LINE__;
-    (void)snprintf(expectedLogMessage, sizeof(expectedLogMessage), "%*s %*s:%*d %s\n",
+    (void)snprintf(expectedLogMessage, sizeof(expectedLogMessage), LOG_FORMAT,
         LogSinkPrinter::LOG_LEVEL_LEN,
         "ERROR  ",
         LogSinkPrinter::FILENAME_LEN,
@@ -184,7 +185,7 @@ static void testLogging()
 
     /* Check expected error log output, with type const String string. */
     LOG_ERROR(TEST_STRING_2);  lineNo = __LINE__;
-    (void)snprintf(expectedLogMessage, sizeof(expectedLogMessage), "%*s %*s:%*d %s\n",
+    (void)snprintf(expectedLogMessage, sizeof(expectedLogMessage), LOG_FORMAT,
         LogSinkPrinter::LOG_LEVEL_LEN,
         "ERROR  ",
         LogSinkPrinter::FILENAME_LEN,