From 7909997398ff4177f660e26db0c96677a199b69d Mon Sep 17 00:00:00 2001
From: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
Date: Wed, 6 Sep 2023 20:08:20 +0200
Subject: [PATCH 1/8] Update install_pr.sh

Only run named  'Hyperion PR Build' have artifacts
---
 bin/scripts/install_pr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/scripts/install_pr.sh b/bin/scripts/install_pr.sh
index ce029a08..8549f797 100755
--- a/bin/scripts/install_pr.sh
+++ b/bin/scripts/install_pr.sh
@@ -136,7 +136,7 @@ import json,sys
 data = json.load(sys.stdin)
 
 for i in data['workflow_runs']:
-	if i['head_sha'] == '"$head_sha"':
+	if i['head_sha'] == '"$head_sha"' and i['name'] == 'Hyperion PR Build':
 		print(i['id'])
 		break
 """ 2>/dev/null)

From 48cea4ad9b1bf3ea40e2ac5c8465639f9f08565c Mon Sep 17 00:00:00 2001
From: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
Date: Sat, 30 Sep 2023 18:00:38 +0200
Subject: [PATCH 2/8] Focus on relevant PRs

---
 bin/scripts/install_pr.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/scripts/install_pr.sh b/bin/scripts/install_pr.sh
index 8549f797..bab790a0 100755
--- a/bin/scripts/install_pr.sh
+++ b/bin/scripts/install_pr.sh
@@ -93,7 +93,7 @@ else
 fi
 
 # Determine if PR number exists
-pulls=$(request_call "$api_url/pulls")
+pulls=$(request_call "$api_url/pulls?state=open")
 
 pr_exists=$(echo "$pulls" | tr '\r\n' ' ' | ${pythonCmd} -c """
 import json,sys
@@ -106,7 +106,7 @@ for i in data:
 """ 2>/dev/null)
 
 if [ "$pr_exists" != "exists" ]; then
-	echo "---> Pull Request $pr_number not found -> abort"
+	echo "---> Pull Request $pr_number not found as open PR -> abort"
 	exit 1
 fi
 
@@ -122,7 +122,7 @@ for i in data:
 """ 2>/dev/null)
 
 if [ -z "$head_sha" ]; then
-	echo "---> The specified PR #$pr_number has no longer any artifacts."
+	echo "---> The specified PR #$pr_number has no longer any artifacts or has been closed."
 	echo "---> It may be older than 14 days. Ask the PR creator to recreate the artifacts at the following URL:"
 	echo "---> https://github.com/hyperion-project/hyperion.ng/pull/$pr_number"
 	exit 1
@@ -130,13 +130,13 @@ fi
 
 if [ -z "$run_id" ]; then
 # Determine run_id from head_sha
-runs=$(request_call "$api_url/actions/runs")
+runs=$(request_call "$api_url/actions/runs?head_sha=$head_sha")
 run_id=$(echo "$runs" | tr '\r\n' ' ' | ${pythonCmd} -c """
 import json,sys
 data = json.load(sys.stdin)
 
 for i in data['workflow_runs']:
-	if i['head_sha'] == '"$head_sha"' and i['name'] == 'Hyperion PR Build':
+	if i['name'] == 'Hyperion PR Build':
 		print(i['id'])
 		break
 """ 2>/dev/null)

From 08dc59c88561baa7dae422187060489c9b6b6f02 Mon Sep 17 00:00:00 2001
From: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
Date: Sun, 1 Oct 2023 21:56:53 +0200
Subject: [PATCH 3/8] Fix #1630 - Audio Capture settings are ignored  (#1640)

* Fix macOS build

* Update minimum cmake version

* Correct compile errorswith Qt6.7

* Update minimum cmake version (2)

* Use C++17

* Correct compile errors with Qt6.7

* Replace unsupported Lambda UniqueConnection

* Support UTF-8 Output on console

* Fix #1630
---
 CMakeLists.txt                                | 34 +++++++-------
 assets/webconfig/js/content_grabber.js        |  6 +--
 cmake/Dependencies.cmake                      |  1 +
 dependencies/CMakeLists-qmdnsengine.txt.in    |  2 +-
 dependencies/CMakeLists.txt                   |  8 ++--
 include/api/JsonAPI.h                         |  5 ++
 include/grabber/AudioGrabberWindows.h         | 14 +++---
 include/hyperion/ImageToLedsMap.h             | 10 ++--
 include/utils/global_defines.h                |  2 +-
 libsrc/api/JsonAPI.cpp                        | 37 +++++++++------
 libsrc/api/JsonCB.cpp                         |  2 +-
 libsrc/db/DBManager.cpp                       | 11 +++--
 libsrc/effectengine/EffectFileHandler.cpp     | 12 ++---
 libsrc/forwarder/MessageForwarder.cpp         | 10 ++--
 libsrc/grabber/audio/AudioGrabber.cpp         | 46 +++++++++++++------
 libsrc/grabber/audio/AudioGrabberWindows.cpp  |  8 +++-
 libsrc/grabber/audio/CMakeLists.txt           |  2 +-
 libsrc/grabber/qt/QtGrabber.cpp               |  2 +-
 libsrc/hyperion/ComponentRegister.cpp         |  2 +-
 libsrc/hyperion/SettingsManager.cpp           | 32 ++++++++-----
 .../leddevice/dev_net/LedDevicePhilipsHue.cpp |  2 +-
 libsrc/leddevice/dev_net/LedDeviceWled.cpp    |  8 ++--
 libsrc/utils/Logger.cpp                       |  2 +-
 .../utils/jsonschema/QJsonSchemaChecker.cpp   |  4 +-
 src/hyperion-aml/CMakeLists.txt               |  2 +-
 src/hyperion-dispmanx/CMakeLists.txt          |  2 +-
 src/hyperion-framebuffer/CMakeLists.txt       |  2 +-
 src/hyperion-osx/CMakeLists.txt               |  2 +-
 src/hyperion-qt/CMakeLists.txt                |  2 +-
 src/hyperion-remote/CMakeLists.txt            |  2 +-
 src/hyperion-remote/hyperion-remote.cpp       |  4 +-
 src/hyperion-v4l2/CMakeLists.txt              |  2 +-
 src/hyperion-x11/CMakeLists.txt               |  2 +-
 src/hyperion-xcb/CMakeLists.txt               |  2 +-
 src/hyperiond/console.h                       |  1 +
 src/hyperiond/main.cpp                        |  4 +-
 36 files changed, 169 insertions(+), 120 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbb1ef3f..813cb750 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 
 message( STATUS "CMake Version: ${CMAKE_VERSION}" )
 
@@ -38,26 +38,24 @@ if ( CCACHE_FOUND )
 	set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 endif(CCACHE_FOUND)
 
-# enable C++14; MSVC doesn't have c++14 feature switch
-if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-	if(APPLE)
-		include(CheckCXXCompilerFlag)
-		CHECK_CXX_COMPILER_FLAG("Werror=unguarded-availability" REQUIRED_UNGUARDED_AVAILABILITY)
-		if(REQUIRED_UNGUARDED_AVAILABILITY)
-			list(APPEND CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "Werror=unguarded-availability")
-		endif()
+# enable C++17
+if(APPLE)
+	include(CheckCXXCompilerFlag)
+	CHECK_CXX_COMPILER_FLAG("Werror=unguarded-availability" REQUIRED_UNGUARDED_AVAILABILITY)
+	if(REQUIRED_UNGUARDED_AVAILABILITY)
+		list(APPEND CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "Werror=unguarded-availability")
 	endif()
-
-	if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "GNU")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi")
-	endif()
-
-	set(CMAKE_CXX_STANDARD 14)
-	set(CXX_STANDARD_REQUIRED ON)
-	set(CXX_EXTENSIONS OFF)
 endif()
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "GNU")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi")
+endif()
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 # Set build variables
 # Grabber
 SET ( DEFAULT_AMLOGIC                     OFF )
diff --git a/assets/webconfig/js/content_grabber.js b/assets/webconfig/js/content_grabber.js
index 20da6030..6136673a 100755
--- a/assets/webconfig/js/content_grabber.js
+++ b/assets/webconfig/js/content_grabber.js
@@ -327,7 +327,7 @@ $(document).ready(function () {
       var saveOptions = conf_editor_screen.getValue();
 
       var instCaptOptions = window.serverConfig.instCapture;
-      instCaptOptions.systemEnable = true;
+      instCaptOptions.systemEnable = saveOptions.framegrabber.enable;
       saveOptions.instCapture = instCaptOptions;
 
       requestWriteConfig(saveOptions);
@@ -679,7 +679,7 @@ $(document).ready(function () {
       var saveOptions = conf_editor_video.getValue();
 
       var instCaptOptions = window.serverConfig.instCapture;
-      instCaptOptions.v4lEnable = true;
+      instCaptOptions.v4lEnable = saveOptions.grabberV4L2.enable;
       saveOptions.instCapture = instCaptOptions;
 
       requestWriteConfig(saveOptions);
@@ -805,7 +805,7 @@ $(document).ready(function () {
       const saveOptions = conf_editor_audio.getValue();
 
       const instCaptOptions = window.serverConfig.instCapture;
-      instCaptOptions.audioEnable = true;
+      instCaptOptions.audioEnable = saveOptions.grabberAudio.enable;
       saveOptions.instCapture = instCaptOptions;
 
       requestWriteConfig(saveOptions);
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 08120831..40ada3e1 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -48,6 +48,7 @@ macro(DeployMacOS TARGET)
 				foreach(PLUGIN "platforms" "sqldrivers" "imageformats")
 					if(EXISTS ${PLUGIN_DIR}/${PLUGIN})
 						file(GLOB files "${PLUGIN_DIR}/${PLUGIN}/*")
+						list(FILTER files EXCLUDE REGEX ".*libqwebp\\.dylib$")
 						foreach(file ${files})
 								file(GET_RUNTIME_DEPENDENCIES
 								EXECUTABLES ${file}
diff --git a/dependencies/CMakeLists-qmdnsengine.txt.in b/dependencies/CMakeLists-qmdnsengine.txt.in
index 12e45328..b3f0812a 100644
--- a/dependencies/CMakeLists-qmdnsengine.txt.in
+++ b/dependencies/CMakeLists-qmdnsengine.txt.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.5)
 
 project(qmdnsengine)
 
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
index c13e96cc..bc5044be 100644
--- a/dependencies/CMakeLists.txt
+++ b/dependencies/CMakeLists.txt
@@ -133,6 +133,9 @@ endif()
 
 if(ENABLE_PROTOBUF_SERVER)
 	set(USE_SYSTEM_PROTO_LIBS ${DEFAULT_USE_SYSTEM_PROTO_LIBS} CACHE BOOL "use protobuf library from system")
+	
+	# defines for 3rd party sub-modules
+	set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Build abseil-cpp with C++ version requirements propagated")	
 
 	if (USE_SYSTEM_PROTO_LIBS)
 		find_package(Protobuf REQUIRED)
@@ -161,9 +164,6 @@ if(ENABLE_PROTOBUF_SERVER)
 		# define the protobuf library
 		set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
 		
-		# defines for 3rd party sub-modules
-		set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Build abseil-cpp with C++ version requirements propagated")
-		
 	endif()
 
 	# redefine at parent scope
@@ -270,7 +270,7 @@ if(ENABLE_DEV_NETWORK)
 			set(USE_SYSTEM_MBEDTLS_LIBS OFF)
 		endif (NOT MBEDTLS_FOUND)
 else()
-		cmake_minimum_required(VERSION 3.2)
+		cmake_minimum_required(VERSION 3.5.1)
 
 		set(CMAKE_POLICY_DEFAULT_CMP0071 NEW)
 
diff --git a/include/api/JsonAPI.h b/include/api/JsonAPI.h
index 6346ce72..3880fc42 100644
--- a/include/api/JsonAPI.h
+++ b/include/api/JsonAPI.h
@@ -88,6 +88,11 @@ private slots:
 	///
 	void handleInstanceStateChange(InstanceState state, quint8 instance, const QString &name = QString());
 
+	///
+	/// @brief Stream a new LED Colors update
+	///
+	void streamLedColorsUpdate();
+
 signals:
 	///
 	/// Signal emits with the reply message provided with handleMessage()
diff --git a/include/grabber/AudioGrabberWindows.h b/include/grabber/AudioGrabberWindows.h
index 747212c2..9c3945b6 100644
--- a/include/grabber/AudioGrabberWindows.h
+++ b/include/grabber/AudioGrabberWindows.h
@@ -39,8 +39,8 @@ class AudioGrabberWindows : public AudioGrabber
 		HANDLE notificationEvent;
 		std::atomic<bool> isRunning{ false };
 
-static BOOL CALLBACK DirectSoundEnumProcessor(LPGUID deviceIdGuid, LPCTSTR deviceDescStr,
-	LPCTSTR deviceModelStr, LPVOID context)
+static BOOL CALLBACK DirectSoundEnumProcessor(LPGUID deviceIdGuid, LPCWSTR deviceDescStr,
+	LPCWSTR deviceModelStr, LPVOID context)
 {
 	// Skip undefined audio devices
 	if (deviceIdGuid == NULL)
@@ -50,12 +50,15 @@ static BOOL CALLBACK DirectSoundEnumProcessor(LPGUID deviceIdGuid, LPCTSTR devic
 
 	AudioGrabber::DeviceProperties device;
 
+	// Process Device Information
+	QString deviceName = QString::fromWCharArray(deviceDescStr);
+
 	// Process Device ID
 	LPOLESTR deviceIdStr;
 	HRESULT res = StringFromCLSID(*deviceIdGuid, &deviceIdStr);
 	if (FAILED(res))
 	{
-		Error(Logger::getInstance("AUDIOGRABBER"), "Failed to get CLSID-string for %s with error: 0x%08x: %s", deviceDescStr, res, std::system_category().message(res).c_str());
+		Error(Logger::getInstance("AUDIOGRABBER"), "Failed to get CLSID-string for %s with error: 0x%08x: %s", QSTRING_CSTR(deviceName), res, std::system_category().message(res).c_str());
 		return FALSE;
 	}
 
@@ -63,10 +66,7 @@ static BOOL CALLBACK DirectSoundEnumProcessor(LPGUID deviceIdGuid, LPCTSTR devic
 
 	CoTaskMemFree(deviceIdStr);
 
-	// Process Device Information
-	QString deviceName = QString::fromLocal8Bit(deviceDescStr);
-
-	Debug(Logger::getInstance("AUDIOGRABBER"), "Found Audio Device: %s", deviceDescStr);
+	Debug(Logger::getInstance("AUDIOGRABBER"), "Found Audio Device: %s", QSTRING_CSTR(deviceName));
 
 	device.id = deviceId;
 	device.name = deviceName;
diff --git a/include/hyperion/ImageToLedsMap.h b/include/hyperion/ImageToLedsMap.h
index 17662f28..45e7bb5a 100644
--- a/include/hyperion/ImageToLedsMap.h
+++ b/include/hyperion/ImageToLedsMap.h
@@ -413,9 +413,13 @@ namespace hyperion
 			}
 
 			// Compute the average of each color channel
-			const uint8_t avgRed   = uint8_t(std::min(std::lround(sqrt(static_cast<double>(cummRed/pixelNum))), 255L));
-			const uint8_t avgGreen = uint8_t(std::min(std::lround(sqrt(static_cast<double>(cummGreen/pixelNum))), 255L));
-			const uint8_t avgBlue  = uint8_t(std::min(std::lround(sqrt(static_cast<double>(cummBlue/pixelNum))), 255L));
+
+			#ifdef WIN32
+				#undef min
+			#endif
+			const uint8_t avgRed = static_cast<uint8_t>(std::min(std::lround(std::sqrt(static_cast<double>(cummRed / pixelNum))), 255L));
+			const uint8_t avgGreen = static_cast<uint8_t>(std::min(std::lround(sqrt(static_cast<double>(cummGreen / pixelNum))), 255L));
+			const uint8_t avgBlue = static_cast<uint8_t>(std::min(std::lround(sqrt(static_cast<double>(cummBlue / pixelNum))), 255L));
 
 			// Return the computed color
 			return {avgRed, avgGreen, avgBlue};
diff --git a/include/utils/global_defines.h b/include/utils/global_defines.h
index e5a6808e..e948fb97 100644
--- a/include/utils/global_defines.h
+++ b/include/utils/global_defines.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define QSTRING_CSTR(str) str.toLocal8Bit().constData()
+#define QSTRING_CSTR(str) str.toUtf8().constData()
 typedef QList< int > QIntList;
 
 
diff --git a/libsrc/api/JsonAPI.cpp b/libsrc/api/JsonAPI.cpp
index 212dc14b..75863ca2 100644
--- a/libsrc/api/JsonAPI.cpp
+++ b/libsrc/api/JsonAPI.cpp
@@ -140,6 +140,8 @@ void JsonAPI::initialize()
 	connect(this, &JsonAPI::toggleSuspendAll, _instanceManager, &HyperionIManager::triggerToggleSuspend);
 	connect(this, &JsonAPI::idleAll, _instanceManager, &HyperionIManager::triggerIdle);
 	connect(this, &JsonAPI::toggleIdleAll, _instanceManager, &HyperionIManager::triggerToggleIdle);
+
+	connect(_ledStreamTimer, &QTimer::timeout, this, &JsonAPI::streamLedColorsUpdate, Qt::UniqueConnection);
 }
 
 bool JsonAPI::handleInstanceSwitch(quint8 inst, bool forced)
@@ -404,7 +406,7 @@ void JsonAPI::handleServerInfoCommand(const QJsonObject &message, const QString
 	activePriorities.removeAll(PriorityMuxer::LOWEST_PRIORITY);
 	int currentPriority = _hyperion->getCurrentPriority();
 
-	for(int priority : qAsConst(activePriorities))
+	for(int priority : std::as_const(activePriorities))
 	{
 		const Hyperion::InputInfo &priorityInfo = _hyperion->getPriorityInfo(priority);
 
@@ -1139,6 +1141,11 @@ void JsonAPI::handleComponentStateCommand(const QJsonObject &message, const QStr
 	sendSuccessReply(command, tan);
 }
 
+void JsonAPI::streamLedColorsUpdate()
+{
+	emit streamLedcolorsUpdate(_currentLedValues);
+}
+
 void JsonAPI::handleLedColorsCommand(const QJsonObject &message, const QString &command, int tan)
 {
 	// create result
@@ -1154,21 +1161,21 @@ void JsonAPI::handleLedColorsCommand(const QJsonObject &message, const QString &
 		_streaming_leds_reply["tan"] = tan;
 
 		connect(_hyperion, &Hyperion::rawLedColors, this, [=](const std::vector<ColorRgb> &ledValues) {
-			_currentLedValues = ledValues;
 
-			// necessary because Qt::UniqueConnection for lambdas does not work until 5.9
-			// see: https://bugreports.qt.io/browse/QTBUG-52438
-			if (!_ledStreamConnection)
-				_ledStreamConnection = connect(_ledStreamTimer, &QTimer::timeout, this, [=]() {
-					emit streamLedcolorsUpdate(_currentLedValues);
-				},
-				Qt::UniqueConnection);
+			if (ledValues != _currentLedValues)
+			{
+				_currentLedValues = ledValues;
+				if (!_ledStreamTimer->isActive() || _ledStreamTimer->interval() != streaming_interval)
+				{
+					_ledStreamTimer->start(streaming_interval);
+				}
+			}
+			else
+			{
+				_ledStreamTimer->stop();
+			}
+		});
 
-			// start the timer
-			if (!_ledStreamTimer->isActive() || _ledStreamTimer->interval() != streaming_interval)
-				_ledStreamTimer->start(streaming_interval);
-		},
-		Qt::UniqueConnection);
 		// push once
 		_hyperion->update();
 	}
@@ -1387,7 +1394,7 @@ void JsonAPI::handleAuthorizeCommand(const QJsonObject &message, const QString &
 		if (API::getPendingTokenRequests(vec))
 		{
 			QJsonArray arr;
-			for (const auto &entry : qAsConst(vec))
+			for (const auto &entry : std::as_const(vec))
 			{
 				QJsonObject obj;
 				obj["comment"] = entry.comment;
diff --git a/libsrc/api/JsonCB.cpp b/libsrc/api/JsonCB.cpp
index 965abf37..e3c4b32a 100644
--- a/libsrc/api/JsonCB.cpp
+++ b/libsrc/api/JsonCB.cpp
@@ -199,7 +199,7 @@ void JsonCB::handlePriorityUpdate(int currentPriority, const PriorityMuxer::Inpu
 
 	activePriorities.removeAll(PriorityMuxer::LOWEST_PRIORITY);
 
-	for (int priority : qAsConst(activePriorities)) {
+	for (int priority : std::as_const(activePriorities)) {
 
 		const Hyperion::InputInfo& priorityInfo = activeInputs[priority];
 
diff --git a/libsrc/db/DBManager.cpp b/libsrc/db/DBManager.cpp
index a8711c15..f4494967 100644
--- a/libsrc/db/DBManager.cpp
+++ b/libsrc/db/DBManager.cpp
@@ -7,6 +7,7 @@
 #include <QThreadStorage>
 #include <QUuid>
 #include <QDir>
+#include <QMetaType>
 
 #ifdef _WIN32
 	#include <stdexcept>
@@ -425,15 +426,15 @@ void DBManager::doAddBindValue(QSqlQuery& query, const QVariantList& variants) c
 		auto t = variant.userType();
 		switch(t)
 		{
-			case QVariant::UInt:
-			case QVariant::Int:
-			case QVariant::Bool:
+			case QMetaType::UInt:
+			case QMetaType::Int:
+			case QMetaType::Bool:
 				query.addBindValue(variant.toInt());
 				break;
-			case QVariant::Double:
+			case QMetaType::Double:
 				query.addBindValue(variant.toFloat());
 				break;
-			case QVariant::ByteArray:
+			case QMetaType::QByteArray:
 				query.addBindValue(variant.toByteArray());
 				break;
 			default:
diff --git a/libsrc/effectengine/EffectFileHandler.cpp b/libsrc/effectengine/EffectFileHandler.cpp
index e1389e83..3d1c77eb 100644
--- a/libsrc/effectengine/EffectFileHandler.cpp
+++ b/libsrc/effectengine/EffectFileHandler.cpp
@@ -224,7 +224,7 @@ void EffectFileHandler::updateEffects()
 	}
 
 	QMap<QString, EffectDefinition> availableEffects;
-	for (const QString& path : qAsConst(efxPathList))
+	for (const QString& path : std::as_const(efxPathList))
 	{
 		QDir directory(path);
 		if (!directory.exists())
@@ -241,8 +241,8 @@ void EffectFileHandler::updateEffects()
 		else
 		{
 			int efxCount = 0;
-			QStringList filenames = directory.entryList(QStringList() << "*.json", QDir::Files, QDir::Name | QDir::IgnoreCase);
-			for (const QString& filename : qAsConst(filenames))
+			const QStringList filenames = directory.entryList(QStringList() << "*.json", QDir::Files, QDir::Name | QDir::IgnoreCase);
+			for (const QString& filename : filenames)
 			{
 				EffectDefinition def;
 				if (loadEffectDefinition(path, filename, def))
@@ -268,8 +268,8 @@ void EffectFileHandler::updateEffects()
 
 			QString schemaPath = path + "schema" + '/';
 			directory.setPath(schemaPath);
-			QStringList schemaFileNames = directory.entryList(QStringList() << "*.json", QDir::Files, QDir::Name | QDir::IgnoreCase);
-			for (const QString& schemaFileName : qAsConst(schemaFileNames))
+			const QStringList schemaFileNames = directory.entryList(QStringList() << "*.json", QDir::Files, QDir::Name | QDir::IgnoreCase);
+			for (const QString& schemaFileName : schemaFileNames)
 			{
 				EffectSchema pyEffect;
 				if (loadEffectSchema(path, directory.filePath(schemaFileName), pyEffect))
@@ -282,7 +282,7 @@ void EffectFileHandler::updateEffects()
 		}
 	}
 
-	for (const auto& item : qAsConst(availableEffects))
+	for (const auto& item : std::as_const(availableEffects))
 	{
 		_availableEffects.push_back(item);
 	}
diff --git a/libsrc/forwarder/MessageForwarder.cpp b/libsrc/forwarder/MessageForwarder.cpp
index b795cbe8..3720ad54 100644
--- a/libsrc/forwarder/MessageForwarder.cpp
+++ b/libsrc/forwarder/MessageForwarder.cpp
@@ -269,7 +269,7 @@ int MessageForwarder::startJsonTargets(const QJsonObject& config)
 
 		if (!_jsonTargets.isEmpty())
 		{
-			for (const auto& targetHost : qAsConst(_jsonTargets))
+			for (const auto& targetHost : std::as_const(_jsonTargets))
 			{
 				Info(_log, "Forwarding now to JSON-target host: %s port: %u", QSTRING_CSTR(targetHost.host.toString()), targetHost.port);
 			}
@@ -286,7 +286,7 @@ void MessageForwarder::stopJsonTargets()
 	if (!_jsonTargets.isEmpty())
 	{
 		disconnect(_hyperion, &Hyperion::forwardJsonMessage, nullptr, nullptr);
-		for (const auto& targetHost : qAsConst(_jsonTargets))
+		for (const auto& targetHost : std::as_const(_jsonTargets))
 		{
 			Info(_log, "Stopped forwarding to JSON-target host: %s port: %u", QSTRING_CSTR(targetHost.host.toString()), targetHost.port);
 		}
@@ -373,7 +373,7 @@ int MessageForwarder::startFlatbufferTargets(const QJsonObject& config)
 
 		if (!_flatbufferTargets.isEmpty())
 		{
-			for (const auto& targetHost : qAsConst(_flatbufferTargets))
+			for (const auto& targetHost : std::as_const(_flatbufferTargets))
 			{
 				Info(_log, "Forwarding now to Flatbuffer-target host: %s port: %u", QSTRING_CSTR(targetHost.host.toString()), targetHost.port);
 			}
@@ -399,7 +399,7 @@ void MessageForwarder::stopFlatbufferTargets()
 			_messageForwarderFlatBufHelper = nullptr;
 		}
 
-		for (const auto& targetHost : qAsConst(_flatbufferTargets))
+		for (const auto& targetHost : std::as_const(_flatbufferTargets))
 		{
 			Info(_log, "Stopped forwarding to Flatbuffer-target host: %s port: %u", QSTRING_CSTR(targetHost.host.toString()), targetHost.port);
 		}
@@ -412,7 +412,7 @@ void MessageForwarder::forwardJsonMessage(const QJsonObject& message)
 	if (_forwarder_enabled)
 	{
 		QTcpSocket client;
-		for (const auto& targetHost : qAsConst(_jsonTargets))
+		for (const auto& targetHost : std::as_const(_jsonTargets))
 		{
 			client.connectToHost(targetHost.host, targetHost.port);
 			if (client.waitForConnected(CONNECT_TIMEOUT.count()))
diff --git a/libsrc/grabber/audio/AudioGrabber.cpp b/libsrc/grabber/audio/AudioGrabber.cpp
index 1e625a1e..4f4eccbd 100644
--- a/libsrc/grabber/audio/AudioGrabber.cpp
+++ b/libsrc/grabber/audio/AudioGrabber.cpp
@@ -9,6 +9,15 @@
 // Constants
 namespace {
 	const uint16_t RESOLUTION = 255;
+
+	//Constants vuMeter
+	const QJsonArray DEFAULT_HOTCOLOR { 255,0,0 };
+	const QJsonArray DEFAULT_WARNCOLOR { 255,255,0 };
+	const QJsonArray DEFAULT_SAFECOLOR { 0,255,0 };
+	const int DEFAULT_WARNVALUE { 80 };
+	const int DEFAULT_SAFEVALUE { 45 };
+	const int DEFAULT_MULTIPLIER { 0 };
+	const int DEFAULT_TOLERANCE { 20 };
 }
 
 #if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
@@ -28,12 +37,12 @@ AudioGrabber::AudioGrabber()
 	, _deviceProperties()
 	, _device("none")
 	, _hotColor(QColorConstants::Red)
-	, _warnValue(80)
+	, _warnValue(DEFAULT_WARNVALUE)
 	, _warnColor(QColorConstants::Yellow)
-	, _safeValue(45)
+	, _safeValue(DEFAULT_SAFEVALUE)
 	, _safeColor(QColorConstants::Green)
-	, _multiplier(0)
-	, _tolerance(20)
+	, _multiplier(DEFAULT_MULTIPLIER)
+	, _tolerance(DEFAULT_TOLERANCE)
 	, _dynamicMultiplier(INT16_MAX)
 	, _started(false)
 {
@@ -61,18 +70,27 @@ void AudioGrabber::setDevice(const QString& device)
 
 void AudioGrabber::setConfiguration(const QJsonObject& config)
 {
-	QJsonArray hotColorArray = config["hotColor"].toArray(QJsonArray::fromVariantList(QList<QVariant>({ QVariant(255), QVariant(0), QVariant(0) })));
-	QJsonArray warnColorArray = config["warnColor"].toArray(QJsonArray::fromVariantList(QList<QVariant>({ QVariant(255), QVariant(255), QVariant(0) })));
-	QJsonArray safeColorArray = config["safeColor"].toArray(QJsonArray::fromVariantList(QList<QVariant>({ QVariant(0), QVariant(255), QVariant(0) })));
+	QString audioEffect = config["audioEffect"].toString();
+	QJsonObject audioEffectConfig = config[audioEffect].toObject();
 
-	_hotColor = QColor(hotColorArray.at(0).toInt(), hotColorArray.at(1).toInt(), hotColorArray.at(2).toInt());
-	_warnColor = QColor(warnColorArray.at(0).toInt(), warnColorArray.at(1).toInt(), warnColorArray.at(2).toInt());
-	_safeColor = QColor(safeColorArray.at(0).toInt(), safeColorArray.at(1).toInt(), safeColorArray.at(2).toInt());
+	if (audioEffect == "vuMeter")
+	{
+		QJsonArray hotColorArray = audioEffectConfig.value("hotColor").toArray(DEFAULT_HOTCOLOR);
+		QJsonArray warnColorArray = audioEffectConfig.value("warnColor").toArray(DEFAULT_WARNCOLOR);
+		QJsonArray safeColorArray = audioEffectConfig.value("safeColor").toArray(DEFAULT_SAFECOLOR);
 
-	_warnValue = config["warnValue"].toInt(80);
-	_safeValue = config["safeValue"].toInt(45);
-	_multiplier = config["multiplier"].toDouble(0);
-	_tolerance = config["tolerance"].toInt(20);
+		_hotColor = QColor(hotColorArray.at(0).toInt(), hotColorArray.at(1).toInt(), hotColorArray.at(2).toInt());
+		_warnColor = QColor(warnColorArray.at(0).toInt(), warnColorArray.at(1).toInt(), warnColorArray.at(2).toInt());
+		_safeColor = QColor(safeColorArray.at(0).toInt(), safeColorArray.at(1).toInt(), safeColorArray.at(2).toInt());
+		_warnValue = audioEffectConfig["warnValue"].toInt(DEFAULT_WARNVALUE);
+		_safeValue = audioEffectConfig["safeValue"].toInt(DEFAULT_SAFEVALUE);
+		_multiplier = audioEffectConfig["multiplier"].toDouble(DEFAULT_MULTIPLIER);
+		_tolerance = audioEffectConfig["tolerance"].toInt(DEFAULT_MULTIPLIER);
+	}
+	else
+	{
+		Error(_log, "Unknow Audio-Effect: \"%s\" configured", QSTRING_CSTR(audioEffect));
+	}
 }
 
 void AudioGrabber::resetMultiplier()
diff --git a/libsrc/grabber/audio/AudioGrabberWindows.cpp b/libsrc/grabber/audio/AudioGrabberWindows.cpp
index 07837bd1..8a2228c3 100644
--- a/libsrc/grabber/audio/AudioGrabberWindows.cpp
+++ b/libsrc/grabber/audio/AudioGrabberWindows.cpp
@@ -1,4 +1,7 @@
 #include <grabber/AudioGrabberWindows.h>
+
+#include <climits>
+
 #include <QImage>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -61,7 +64,10 @@ bool AudioGrabberWindows::configureCaptureInterface()
 	// wFormatTag, nChannels, nSamplesPerSec, mAvgBytesPerSec,
 	// nBlockAlign, wBitsPerSample, cbSize
 
-	notificationSize = max(1024, audioFormat.nAvgBytesPerSec / 8);
+	#ifdef WIN32
+		#undef max
+	#endif
+	notificationSize = std::max(static_cast<DWORD>(1024), static_cast<DWORD>(audioFormat.nAvgBytesPerSec / 8));
 	notificationSize -= notificationSize % audioFormat.nBlockAlign;
 
 	bufferCaptureSize = notificationSize * AUDIO_NOTIFICATION_COUNT;
diff --git a/libsrc/grabber/audio/CMakeLists.txt b/libsrc/grabber/audio/CMakeLists.txt
index 187fa9d0..714c5883 100644
--- a/libsrc/grabber/audio/CMakeLists.txt
+++ b/libsrc/grabber/audio/CMakeLists.txt
@@ -2,8 +2,8 @@
 SET( CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber )
 SET( CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/audio )
 
-
 if (WIN32)
+    add_definitions(-DUNICODE -D_UNICODE)
     FILE ( GLOB AUDIO_GRABBER_SOURCES "${CURRENT_HEADER_DIR}/Audio*Windows.h"  "${CURRENT_HEADER_DIR}/AudioGrabber.h"  "${CURRENT_HEADER_DIR}/AudioWrapper.h"  "${CURRENT_SOURCE_DIR}/*.h"  "${CURRENT_SOURCE_DIR}/*Windows.cpp"  "${CURRENT_SOURCE_DIR}/AudioGrabber.cpp"  "${CURRENT_SOURCE_DIR}/AudioWrapper.cpp")
 elseif(${CMAKE_SYSTEM} MATCHES "Linux")
     FILE ( GLOB AUDIO_GRABBER_SOURCES "${CURRENT_HEADER_DIR}/Audio*Linux.h"  "${CURRENT_HEADER_DIR}/AudioGrabber.h"  "${CURRENT_HEADER_DIR}/AudioWrapper.h"  "${CURRENT_SOURCE_DIR}/*.h"  "${CURRENT_SOURCE_DIR}/*Linux.cpp"  "${CURRENT_SOURCE_DIR}/AudioGrabber.cpp"  "${CURRENT_SOURCE_DIR}/AudioWrapper.cpp")
diff --git a/libsrc/grabber/qt/QtGrabber.cpp b/libsrc/grabber/qt/QtGrabber.cpp
index b3f35182..cb6e0c5c 100644
--- a/libsrc/grabber/qt/QtGrabber.cpp
+++ b/libsrc/grabber/qt/QtGrabber.cpp
@@ -103,7 +103,7 @@ bool QtGrabber::setupDisplay()
 
 			Info(_log, "Available Displays:");
 			int index = 0;
-			for (auto* screen : qAsConst(screens))
+			for (auto* screen : std::as_const(screens))
 			{
 				const QRect geo = screen->geometry();
 				Info(_log, "Display %d: Name: %s Resolution: [%dx%d], Geometry: (L,T,R,B) %d,%d,%d,%d Depth:%dbit", index, QSTRING_CSTR(screen->name()), geo.width(), geo.height(), geo.x(), geo.y(), geo.x() + geo.width(), geo.y() + geo.height(), screen->depth());
diff --git a/libsrc/hyperion/ComponentRegister.cpp b/libsrc/hyperion/ComponentRegister.cpp
index fd2f261d..9a040caf 100644
--- a/libsrc/hyperion/ComponentRegister.cpp
+++ b/libsrc/hyperion/ComponentRegister.cpp
@@ -61,7 +61,7 @@ ComponentRegister::ComponentRegister(Hyperion* hyperion)
 	vect << COMP_FORWARDER;
 #endif
 
-	for(auto e : qAsConst(vect))
+	for(auto e : std::as_const(vect))
 	{
 		_componentStates.emplace(e, (e == COMP_ALL));
 	}
diff --git a/libsrc/hyperion/SettingsManager.cpp b/libsrc/hyperion/SettingsManager.cpp
index b9d78edc..e9fa5805 100644
--- a/libsrc/hyperion/SettingsManager.cpp
+++ b/libsrc/hyperion/SettingsManager.cpp
@@ -58,9 +58,9 @@ SettingsManager::SettingsManager(quint8 instance, QObject* parent, bool readonly
 	}
 
 	// transform json to string lists
-	QStringList keyList = defaultConfig.keys();
+	const QStringList keyList = defaultConfig.keys();
 	QStringList defValueList;
-	for (const auto& key : qAsConst(keyList))
+	for (const auto& key : keyList)
 	{
 		if (defaultConfig[key].isObject())
 		{
@@ -73,7 +73,7 @@ SettingsManager::SettingsManager(quint8 instance, QObject* parent, bool readonly
 	}
 
 	// fill database with default data if required
-	for (const auto& key : qAsConst(keyList))
+	for (const auto& key : keyList)
 	{
 		QString val = defValueList.takeFirst();
 		// prevent overwrite
@@ -86,7 +86,7 @@ SettingsManager::SettingsManager(quint8 instance, QObject* parent, bool readonly
 	// need to validate all data in database construct the entire data object
 	// TODO refactor schemaChecker to accept QJsonArray in validate(); QJsonDocument container? To validate them per entry...
 	QJsonObject dbConfig;
-	for (const auto& key : qAsConst(keyList))
+	for (const auto& key : keyList)
 	{
 		QJsonDocument doc = _sTable->getSettingsRecord(key);
 		if (doc.isArray())
@@ -242,9 +242,9 @@ bool SettingsManager::saveSettings(QJsonObject config, bool correct)
 	_qconfig = config;
 
 	// extract keys and data
-	QStringList keyList = config.keys();
+	const QStringList keyList = config.keys();
 	QStringList newValueList;
-	for (const auto& key : qAsConst(keyList))
+	for (const auto& key : keyList)
 	{
 		if (config[key].isObject())
 		{
@@ -258,7 +258,7 @@ bool SettingsManager::saveSettings(QJsonObject config, bool correct)
 
 	bool rc = true;
 	// compare database data with new data to emit/save changes accordingly
-	for (const auto& key : qAsConst(keyList))
+	for (const auto& key : keyList)
 	{
 		QString data = newValueList.takeFirst();
 		if (_sTable->getSettingsRecordString(key) != data)
@@ -269,7 +269,15 @@ bool SettingsManager::saveSettings(QJsonObject config, bool correct)
 			}
 			else
 			{
-				emit settingsChanged(settings::stringToType(key), QJsonDocument::fromJson(data.toLocal8Bit()));
+				QJsonParseError error;
+				QJsonDocument jsonDocument = QJsonDocument::fromJson(data.toUtf8(), &error);
+				if (error.error != QJsonParseError::NoError) {
+					Error(_log, "Error parsing JSON: %s", QSTRING_CSTR(error.errorString()));
+					rc = false;
+				}
+				else {
+					emit settingsChanged(settings::stringToType(key), jsonDocument);
+				}
 			}
 		}
 	}
@@ -618,10 +626,10 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 					QJsonArray json;
 					if (newForwarderConfig.contains("json"))
 					{
-						QJsonArray oldJson = newForwarderConfig["json"].toArray();
+						const QJsonArray oldJson = newForwarderConfig["json"].toArray();
 						QJsonObject newJsonConfig;
 
-						for (const QJsonValue& value : qAsConst(oldJson))
+						for (const QJsonValue& value : oldJson)
 						{
 							if (value.isString())
 							{
@@ -661,10 +669,10 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 					QJsonArray flatbuffer;
 					if (newForwarderConfig.contains("flat"))
 					{
-						QJsonArray oldFlatbuffer = newForwarderConfig["flat"].toArray();
+						const QJsonArray oldFlatbuffer = newForwarderConfig["flat"].toArray();
 						QJsonObject newFlattbufferConfig;
 
-						for (const QJsonValue& value : qAsConst(oldFlatbuffer))
+						for (const QJsonValue& value : oldFlatbuffer)
 						{
 							if (value.isString())
 							{
diff --git a/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp b/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
index 8f73ae5f..ba008ab0 100644
--- a/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
+++ b/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
@@ -1126,7 +1126,7 @@ bool LedDevicePhilipsHue::setLights()
 
 	if( !lArray.empty() )
 	{
-		for (const QJsonValue &id : qAsConst(lArray))
+		for (const QJsonValue &id : std::as_const(lArray))
 		{
 			int lightId = id.toString().toInt();
 			if( lightId > 0 )
diff --git a/libsrc/leddevice/dev_net/LedDeviceWled.cpp b/libsrc/leddevice/dev_net/LedDeviceWled.cpp
index 3ada5091..e23a8c9b 100644
--- a/libsrc/leddevice/dev_net/LedDeviceWled.cpp
+++ b/libsrc/leddevice/dev_net/LedDeviceWled.cpp
@@ -352,12 +352,12 @@ bool LedDeviceWled::powerOn()
 			}
 			else
 			{
-				QJsonArray propertiesSegments = _originalStateProperties[STATE_SEG].toArray();
+				const QJsonArray propertiesSegments = _originalStateProperties[STATE_SEG].toArray();
 
 				bool isStreamSegmentIdFound { false };
 
 				QJsonArray segments;
-				for (const auto& segmentItem : qAsConst(propertiesSegments))
+				for (const auto& segmentItem : propertiesSegments)
 				{
 					QJsonObject segmentObj = segmentItem.toObject();
 
@@ -505,9 +505,9 @@ bool LedDeviceWled::restoreState()
 
 		if (_isStreamToSegment)
 		{
-			QJsonArray propertiesSegments = _originalStateProperties[STATE_SEG].toArray();
+			const QJsonArray propertiesSegments = _originalStateProperties[STATE_SEG].toArray();
 			QJsonArray segments;
-			for (const auto& segmentItem : qAsConst(propertiesSegments))
+			for (const auto& segmentItem : propertiesSegments)
 			{
 				QJsonObject segmentObj = segmentItem.toObject();
 
diff --git a/libsrc/utils/Logger.cpp b/libsrc/utils/Logger.cpp
index 86b4e903..b34981c9 100644
--- a/libsrc/utils/Logger.cpp
+++ b/libsrc/utils/Logger.cpp
@@ -65,7 +65,7 @@ void Logger::deleteInstance(const QString & name, const QString & subName)
 
 	if (name.isEmpty())
 	{
-		for (auto *logger : qAsConst(LoggerMap)) {
+		for (auto *logger : std::as_const(LoggerMap)) {
 			delete logger;
 		}
 
diff --git a/libsrc/utils/jsonschema/QJsonSchemaChecker.cpp b/libsrc/utils/jsonschema/QJsonSchemaChecker.cpp
index 685ab4c7..8cd0be75 100644
--- a/libsrc/utils/jsonschema/QJsonSchemaChecker.cpp
+++ b/libsrc/utils/jsonschema/QJsonSchemaChecker.cpp
@@ -59,13 +59,13 @@ QPair<bool, bool> QJsonSchemaChecker::validate(const QJsonObject& value, bool ig
 QJsonObject QJsonSchemaChecker::getAutoCorrectedConfig(const QJsonObject& value, bool ignoreRequired)
 {
 	_ignoreRequired = ignoreRequired;
-	QStringList sequence = QStringList() << "remove" << "modify" << "create";
+	const QStringList sequence = QStringList() << "remove" << "modify" << "create";
 	_error = false;
 	_schemaError = false;
 	_messages.clear();
 	_autoCorrected = value;
 
-	for (const QString& correct : qAsConst(sequence))
+	for (const QString& correct : sequence)
 	{
 		_correct = correct;
 		_currentPath.clear();
diff --git a/src/hyperion-aml/CMakeLists.txt b/src/hyperion-aml/CMakeLists.txt
index 37bed4af..cdea66fa 100644
--- a/src/hyperion-aml/CMakeLists.txt
+++ b/src/hyperion-aml/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-aml)
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Widgets REQUIRED)
diff --git a/src/hyperion-dispmanx/CMakeLists.txt b/src/hyperion-dispmanx/CMakeLists.txt
index 17720483..07862bbd 100644
--- a/src/hyperion-dispmanx/CMakeLists.txt
+++ b/src/hyperion-dispmanx/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-dispmanx)
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Widgets REQUIRED)
diff --git a/src/hyperion-framebuffer/CMakeLists.txt b/src/hyperion-framebuffer/CMakeLists.txt
index 5667203a..14ea2ce9 100644
--- a/src/hyperion-framebuffer/CMakeLists.txt
+++ b/src/hyperion-framebuffer/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-framebuffer)
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Widgets REQUIRED)
diff --git a/src/hyperion-osx/CMakeLists.txt b/src/hyperion-osx/CMakeLists.txt
index 12f17a9b..efb15cd1 100644
--- a/src/hyperion-osx/CMakeLists.txt
+++ b/src/hyperion-osx/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-osx)
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Network Widgets REQUIRED)
diff --git a/src/hyperion-qt/CMakeLists.txt b/src/hyperion-qt/CMakeLists.txt
index 6cc4b386..f35b8534 100644
--- a/src/hyperion-qt/CMakeLists.txt
+++ b/src/hyperion-qt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-qt)
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Network Widgets REQUIRED)
diff --git a/src/hyperion-remote/CMakeLists.txt b/src/hyperion-remote/CMakeLists.txt
index a7ce5cfe..a2805cad 100644
--- a/src/hyperion-remote/CMakeLists.txt
+++ b/src/hyperion-remote/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-remote)
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Widgets REQUIRED)
diff --git a/src/hyperion-remote/hyperion-remote.cpp b/src/hyperion-remote/hyperion-remote.cpp
index f47fbb14..e7fdc453 100644
--- a/src/hyperion-remote/hyperion-remote.cpp
+++ b/src/hyperion-remote/hyperion-remote.cpp
@@ -57,9 +57,9 @@ void showHelp(Option & option){
 
 int getInstaneIdbyName(const QJsonObject & reply, const QString & name){
 	if(reply.contains("instance")){
-		QJsonArray list = reply.value("instance").toArray();
+		const QJsonArray list = reply.value("instance").toArray();
 
-		for ( const auto &entry : qAsConst(list) ) {
+		for ( const auto &entry : list ) {
 			const QJsonObject obj = entry.toObject();
 			if(obj["friendly_name"] == name && obj["running"].toBool())
 			{
diff --git a/src/hyperion-v4l2/CMakeLists.txt b/src/hyperion-v4l2/CMakeLists.txt
index 9c8783dd..1404d2ad 100644
--- a/src/hyperion-v4l2/CMakeLists.txt
+++ b/src/hyperion-v4l2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-v4l2)
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Widgets REQUIRED)
diff --git a/src/hyperion-x11/CMakeLists.txt b/src/hyperion-x11/CMakeLists.txt
index a7459ce6..88095ae3 100644
--- a/src/hyperion-x11/CMakeLists.txt
+++ b/src/hyperion-x11/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-x11)
 
 find_package(X11 REQUIRED)
diff --git a/src/hyperion-xcb/CMakeLists.txt b/src/hyperion-xcb/CMakeLists.txt
index cd374d5a..f378aef2 100644
--- a/src/hyperion-xcb/CMakeLists.txt
+++ b/src/hyperion-xcb/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(hyperion-xcb)
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Widgets REQUIRED)
diff --git a/src/hyperiond/console.h b/src/hyperiond/console.h
index 98469960..e61156ae 100644
--- a/src/hyperiond/console.h
+++ b/src/hyperiond/console.h
@@ -15,4 +15,5 @@ void CreateConsole()
     freopen_s(&fDummy, "CONOUT$", "w", stderr);
     freopen_s(&fDummy, "CONIN$", "r", stdin);
 	SetConsoleTitle(TEXT("Hyperion"));
+	SetConsoleOutputCP(CP_UTF8);
 }
diff --git a/src/hyperiond/main.cpp b/src/hyperiond/main.cpp
index 4719cd22..fa9352b9 100644
--- a/src/hyperiond/main.cpp
+++ b/src/hyperiond/main.cpp
@@ -268,9 +268,9 @@ int main(int argc, char** argv)
 		if (directory.exists() && destDir.exists())
 		{
 			std::cout << "Extract to folder: " << destDir.absolutePath().toStdString() << std::endl;
-			QStringList filenames = directory.entryList(QStringList() << "*", QDir::Files, QDir::Name | QDir::IgnoreCase);
+			const QStringList filenames = directory.entryList(QStringList() << "*", QDir::Files, QDir::Name | QDir::IgnoreCase);
 			QString destFileName;
-			for (const QString & filename : qAsConst(filenames))
+			for (const QString & filename : filenames)
 			{
 				destFileName = destDir.dirName()+"/"+filename;
 				if (QFile::exists(destFileName))

From f49e1a2c0be690d45d0e169e2267318d166f80ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 18:03:57 +0200
Subject: [PATCH 4/8] Bump actions/checkout from 3 to 4 (#1646)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/apt.yml          |  6 +++---
 .github/workflows/codeql.yml       |  2 +-
 .github/workflows/nightly.yml      | 10 +++++-----
 .github/workflows/pull-request.yml |  6 +++---
 .github/workflows/push-master.yml  |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml
index 66b90cb0..39f440b2 100644
--- a/.github/workflows/apt.yml
+++ b/.github/workflows/apt.yml
@@ -36,7 +36,7 @@ jobs:
     name: Setup APT build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set APT matrix
         id: apt-ppa
         run: |
@@ -54,7 +54,7 @@ jobs:
       matrix: ${{ fromJson(needs.setup.outputs.apt-matrix) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.head_sha || github.event.client_payload.head_sha }}
           submodules: true
@@ -107,7 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.head_sha || github.event.client_payload.head_sha }}
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 1565d699..d39190cc 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7151ce2f..70d63aab 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -13,7 +13,7 @@ jobs:
     if: github.repository_owner == 'hyperion-project'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -48,7 +48,7 @@ jobs:
     if: github.repository_owner == 'hyperion-project'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check if commit has changed
         id: build-necessary
         run: |
@@ -66,7 +66,7 @@ jobs:
     if: ${{ needs.check.outputs.build-nightly == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set nightly matrix
         id: nightly-ppa
         run: |
@@ -84,7 +84,7 @@ jobs:
       matrix: ${{ fromJson(needs.setup.outputs.nightly-matrix) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -135,7 +135,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@v5.3.0
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 47769bfb..eee7c150 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -76,7 +76,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -125,7 +125,7 @@ jobs:
       QT_VERSION: 5.15.2
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index 8f1b44c3..b0ee7a1d 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -33,7 +33,7 @@ jobs:
             platform: amlogic
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -62,7 +62,7 @@ jobs:
     name: macOS
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -97,7 +97,7 @@ jobs:
       QT_VERSION: 5.15.2
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -162,7 +162,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Generate environment variables
       - name: Generate environment variables from .version and tag

From 41bffecc0b5bc2b651f3d48516536937ad58f331 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 18:04:26 +0200
Subject: [PATCH 5/8] Bump peter-evans/repository-dispatch from 2.1.1 to 2.1.2
 (#1645)

Bumps [peter-evans/repository-dispatch](https://github.com/peter-evans/repository-dispatch) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/peter-evans/repository-dispatch/releases)
- [Commits](https://github.com/peter-evans/repository-dispatch/compare/v2.1.1...v2.1.2)

---
updated-dependencies:
- dependency-name: peter-evans/repository-dispatch
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d4c8461a..104c2c79 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       # Dispatch event to build new HyperBian image
       - name: Dispatch HyperBian build
-        uses: peter-evans/repository-dispatch@v2.1.1
+        uses: peter-evans/repository-dispatch@v2.1.2
         if: ${{ github.repository_owner == 'hyperion-project'}}
         with:
           repository: hyperion-project/HyperBian

From 33722c9a09430f0b0f569d56b0a176ee9e4664ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 18:06:39 +0200
Subject: [PATCH 6/8] Bump crazy-max/ghaction-import-gpg from 5.3.0 to 6.0.0
 (#1644)

Bumps [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) from 5.3.0 to 6.0.0.
- [Release notes](https://github.com/crazy-max/ghaction-import-gpg/releases)
- [Commits](https://github.com/crazy-max/ghaction-import-gpg/compare/v5.3.0...v6.0.0)

---
updated-dependencies:
- dependency-name: crazy-max/ghaction-import-gpg
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/apt.yml     | 2 +-
 .github/workflows/nightly.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml
index 39f440b2..99bce214 100644
--- a/.github/workflows/apt.yml
+++ b/.github/workflows/apt.yml
@@ -112,7 +112,7 @@ jobs:
           ref: ${{ github.event.inputs.head_sha || github.event.client_payload.head_sha }}
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v5.3.0
+        uses: crazy-max/ghaction-import-gpg@v6.0.0
         with:
           gpg_private_key: ${{ secrets.APT_GPG }}
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 70d63aab..2046ba07 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -138,7 +138,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v5.3.0
+        uses: crazy-max/ghaction-import-gpg@v6.0.0
         with:
           gpg_private_key: ${{ secrets.APT_GPG }}
 

From cd22d4454d99ae7bc84cabb89affcd32766c079c Mon Sep 17 00:00:00 2001
From: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
Date: Tue, 3 Oct 2023 20:33:11 +0200
Subject: [PATCH 7/8] Philips Hue APIv2 support (#1637)

* Support Philips Hue APIv2 and refactoring

* Fix MDNSBrower - if timeout during host resolvment occurs

* Hue API v2 - Migrate database

* Fix macOS build

* Handle network timeout before any other error

* Address CodeQL findings

* Clean-up and Fixes

* Only getProperties, if username is available

* Option to layout by entertainment area center

* Fix Wizard

---------

Co-authored-by: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
---
 assets/webconfig/i18n/en.json                 |    7 +-
 assets/webconfig/js/content_leds.js           |   16 +-
 assets/webconfig/js/wizard.js                 |  720 ++++--
 libsrc/hyperion/SettingsManager.cpp           |   55 +
 .../leddevice/dev_net/LedDevicePhilipsHue.cpp | 2018 ++++++++++++-----
 .../leddevice/dev_net/LedDevicePhilipsHue.h   |  203 +-
 libsrc/leddevice/dev_net/ProviderRestApi.cpp  |  203 +-
 libsrc/leddevice/dev_net/ProviderRestApi.h    |   74 +-
 libsrc/leddevice/dev_net/ProviderUdpSSL.cpp   |   10 +
 libsrc/leddevice/dev_net/ProviderUdpSSL.h     |   10 +
 .../leddevice/schemas/schema-philipshue.json  |  108 +-
 libsrc/mdns/MdnsBrowser.cpp                   |    1 +
 resources/ssl/philips_hue_ca.pem              |   14 +
 13 files changed, 2541 insertions(+), 898 deletions(-)
 create mode 100644 resources/ssl/philips_hue_ca.pem

diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index 263c8bd6..d8518fd2 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -86,6 +86,8 @@
     "conf_leds_layout_cl_bottomright": "Bottom Right (Corner)",
     "conf_leds_layout_cl_cornergap": "Corner Gap",
     "conf_leds_layout_cl_edgegap": "Edge Gap",
+    "conf_leds_layout_cl_entertainment": "Entertainment Area",
+    "conf_leds_layout_cl_entertainment_center": "Entertainment Area Center",
     "conf_leds_layout_cl_gaglength": "Gap length",
     "conf_leds_layout_cl_gappos": "gap position",
     "conf_leds_layout_cl_hleddepth": "Horizontal LED depth",
@@ -618,7 +620,7 @@
     "edt_dev_spec_gpioBcm_title": "GPIO Pin",
     "edt_dev_spec_gpioMap_title": "GPIO mapping",
     "edt_dev_spec_gpioNumber_title": "GPIO number",
-    "edt_dev_spec_groupId_title": "Group ID",
+    "edt_dev_spec_groupId_title": "Group",
     "edt_dev_spec_header_title": "Specific Settings",
     "edt_dev_spec_interpolation_title": "Interpolation",
     "edt_dev_spec_intervall_title": "Interval",
@@ -683,6 +685,7 @@
     "edt_dev_spec_transistionTime_title": "Transition time",
     "edt_dev_spec_uid_title": "UID",
     "edt_dev_spec_universe_title": "Universe",
+    "edt_dev_spec_useAPIv2_title": "Use API v2",
     "edt_dev_spec_useEntertainmentAPI_title": "Use Hue Entertainment API",
     "edt_dev_spec_useOrbSmoothing_title": "Use orb smoothing",
     "edt_dev_spec_useRgbwProtocol_title": "Use RGBW protocol",
@@ -1087,7 +1090,7 @@
     "wiz_cololight_noprops": "Not able to get device properties - Define Hardware LED count manually",
     "wiz_cololight_title": "Cololight Wizard",
     "wiz_guideyou": "The $1 will guide you through the settings. Just press the button!",
-    "wiz_hue_blinkblue": "Let ID $1 light up blue",
+    "wiz_hue_blinkblue": "Let it light up",
     "wiz_hue_clientkey": "Clientkey",
     "wiz_hue_create_user": "Create new User",
     "wiz_hue_desc1": "1. Hyperion searches automatically for a Hue-Bridge, in case it cannot find one you need to provide the hostname or IP-address and push the reload button. <br> 2. Provide a user ID, if you do not have one create a new one.",
diff --git a/assets/webconfig/js/content_leds.js b/assets/webconfig/js/content_leds.js
index 1aec94ab..2b0304c5 100755
--- a/assets/webconfig/js/content_leds.js
+++ b/assets/webconfig/js/content_leds.js
@@ -1021,11 +1021,6 @@ $(document).ready(function () {
     var generalOptions = window.serverSchema.properties.device;
 
     var ledType = $(this).val();
-
-    // philipshueentertainment backward fix
-    if (ledType == "philipshueentertainment")
-      ledType = "philipshue";
-
     var specificOptions = window.serverSchema.properties.alldevices[ledType];
 
     conf_editor = createJsonEditor('editor_container_leddevice', {
@@ -1060,13 +1055,10 @@ $(document).ready(function () {
     $('#btn_led_device_wiz').off();
 
     if (ledType == "philipshue") {
-      $('#root_specificOptions_useEntertainmentAPI').on("change", function () {
-        var ledWizardType = (this.checked) ? "philipshueentertainment" : ledType;
-        var data = { type: ledWizardType };
-        var hue_title = (this.checked) ? 'wiz_hue_e_title' : 'wiz_hue_title';
-        changeWizard(data, hue_title, startWizardPhilipsHue);
-      });
-      $("#root_specificOptions_useEntertainmentAPI").trigger("change");
+      var ledWizardType = ledType;
+      var data = { type: ledWizardType };
+      var hue_title = 'wiz_hue_title';
+      changeWizard(data, hue_title, startWizardPhilipsHue);
     }
     else if (ledType == "atmoorb") {
       var ledWizardType = (this.checked) ? "atmoorb" : ledType;
diff --git a/assets/webconfig/js/wizard.js b/assets/webconfig/js/wizard.js
index 3f88f6db..79fc9182 100755
--- a/assets/webconfig/js/wizard.js
+++ b/assets/webconfig/js/wizard.js
@@ -604,7 +604,7 @@ var lightPosTopLeft112 = { hmin: 0, hmax: 0.5, vmin: 0, vmax: 0.15 };
 var lightPosTopLeft121 = { hmin: 0.5, hmax: 1, vmin: 0, vmax: 0.15 };
 var lightPosTopLeftNewMid = { hmin: 0.25, hmax: 0.75, vmin: 0, vmax: 0.15 };
 
-function assignLightPos(id, pos, name) {
+function assignLightPos(pos, name) {
   var i = null;
 
   if (pos === "top")
@@ -695,52 +695,50 @@ devicesProperties = {};
 
 var hueIPs = [];
 var hueIPsinc = 0;
-var hueLights = null;
-var hueGroups = null;
+var hueLights = [];
+var hueEntertainmentConfigs = [];
+var hueEntertainmentServices = [];
 var lightLocation = [];
 var groupLights = [];
+var groupChannels = [];
 var groupLightsLocations = [];
-var hueType = "philipshue";
+var isAPIv2Ready = true;
+var isEntertainmentReady = true;
 
 function startWizardPhilipsHue(e) {
-  if (typeof e.data.type != "undefined") hueType = e.data.type;
-
   //create html
 
   var hue_title = 'wiz_hue_title';
-  var hue_intro1 = 'wiz_hue_intro1';
+  var hue_intro1 = 'wiz_hue_e_intro1';
   var hue_desc1 = 'wiz_hue_desc1';
   var hue_create_user = 'wiz_hue_create_user';
-  if (hueType == 'philipshueentertainment') {
-    hue_title = 'wiz_hue_e_title';
-    hue_intro1 = 'wiz_hue_e_intro1';
-    hue_desc1 = 'wiz_hue_e_desc1';
-    hue_create_user = 'wiz_hue_e_create_user';
-  }
+
   $('#wiz_header').html('<i class="fa fa-magic fa-fw"></i>' + $.i18n(hue_title));
   $('#wizp1_body').html('<h4 style="font-weight:bold;text-transform:uppercase;">' + $.i18n(hue_title) + '</h4><p>' + $.i18n(hue_intro1) + '</p>');
   $('#wizp1_footer').html('<button type="button" class="btn btn-primary" id="btn_wiz_cont"><i class="fa fa-fw fa-check"></i>' + $.i18n('general_btn_continue') + '</button><button type="button" class="btn btn-danger" data-dismiss="modal"><i class="fa fa-fw fa-close"></i>' + $.i18n('general_btn_cancel') + '</button>');
   $('#wizp2_body').html('<div id="wh_topcontainer"></div>');
 
-  var hidePort = "hidden-lg";
-  if (storedAccess === 'expert') {
-    hidePort = "";
-  }
-
-  $('#wh_topcontainer').append('<p class="text-left" style="font-weight:bold">' + $.i18n(hue_desc1) + '</p>' +
+  var topContainer_html = '<p class="text-left" style="font-weight:bold">' + $.i18n(hue_desc1) + '</p>' +
     '<div class="row">' +
     '<div class="col-md-2">' +
     '  <p class="text-left">' + $.i18n('wiz_hue_ip') + '</p></div>' +
     '  <div class="col-md-7"><div class="input-group">' +
     '    <span class="input-group-addon" id="retry_bridge" style="cursor:pointer"><i class="fa fa-refresh"></i></span>' +
-    '    <input type="text" class="input-group form-control" id="host" placeholder="' + $.i18n('wiz_hue_ip') + '"></div></div>' +
-    '  <div class="col-md-3 ' + hidePort + '"><div class="input-group">' +
-    '    <span class="input-group-addon">:</span>' +
-    '    <input type="text" class="input-group form-control" id="port" placeholder="' + $.i18n('edt_conf_general_port_title') + '"></div></div>' +
-    '</div><p><span style="font-weight:bold;color:red" id="wiz_hue_ipstate"></span><span style="font-weight:bold;" id="wiz_hue_discovered"></span></p>'
-  );
-  $('#wh_topcontainer').append();
-  $('#wh_topcontainer').append('<div class="form-group" id="usrcont" style="display:none"></div>');
+    '    <select id="hue_bridge_select" class="hue_bridge_sel_watch form-control">' + '</select>' + '</div></div>' +
+    '  <div class="col-md-7"><div class="input-group">' +
+    '    <span class="input-group-addon"><i class="fa fa-arrow-right"></i></span>' +
+    '    <input type="text" class="input-group form-control" id="host" placeholder="' + $.i18n('wiz_hue_ip') + '"></div></div>';
+
+  if (storedAccess === 'expert') {
+    topContainer_html += '<div class="col-md-3"><div class="input-group">' +
+      '<span class="input-group-addon">:</span>' +
+      '<input type="text" class="input-group form-control" id="port" placeholder="' + $.i18n('edt_conf_general_port_title') + '"></div></div>';
+  }
+
+  topContainer_html += '</div><p><span style="font-weight:bold;color:red" id="wiz_hue_ipstate"></span><span style="font-weight:bold;" id="wiz_hue_discovered"></span></p>';
+  topContainer_html += '<div class="form-group" id="usrcont" style="display:none"></div>';
+
+  $('#wh_topcontainer').append(topContainer_html);
 
   $('#usrcont').append('<div class="row"><div class="col-md-2"><p class="text-left">' + $.i18n('wiz_hue_username') + '</p ></div>' +
     '<div class="col-md-7">' +
@@ -751,23 +749,18 @@ function startWizardPhilipsHue(e) {
     '</div><input type="hidden" id="groupId">'
   );
 
-  if (hueType == 'philipshueentertainment') {
-    $('#usrcont').append('<div class="row"><div class="col-md-2"><p class="text-left">' + $.i18n('wiz_hue_clientkey') +
-      '</p></div><div class="col-md-7"><input class="form-control" id="clientkey" type="text"></div></div><br>');
-  }
+  $('#usrcont').append('<div id="hue_client_key_r" class="row"><div class="col-md-2"><p class="text-left">' + $.i18n('wiz_hue_clientkey') +
+    '</p></div><div class="col-md-7"><input class="form-control" id="clientkey" type="text"></div></div><br>');
 
   $('#usrcont').append('<p><span style="font-weight:bold;color:red" id="wiz_hue_usrstate"></span><\p>' +
     '<button type="button" class="btn btn-primary" style="display:none" id="wiz_hue_create_user"> <i class="fa fa-fw fa-plus"></i>' + $.i18n(hue_create_user) + '</button>');
 
-  if (hueType == 'philipshueentertainment') {
-    $('#wizp2_body').append('<div id="hue_grp_ids_t" style="display:none"><p class="text-left" style="font-weight:bold">' + $.i18n('wiz_hue_e_desc2') + '</p></div>');
-    createTable("gidsh", "gidsb", "hue_grp_ids_t");
-    $('.gidsh').append(createTableRow([$.i18n('edt_dev_spec_groupId_title'), $.i18n('wiz_hue_e_use_group')], true));
-    $('#wizp2_body').append('<div id="hue_ids_t" style="display:none"><p class="text-left" style="font-weight:bold" id="hue_id_headline">' + $.i18n('wiz_hue_e_desc3') + '</p></div>');
-  }
-  else {
-    $('#wizp2_body').append('<div id="hue_ids_t" style="display:none"><p class="text-left" style="font-weight:bold" id="hue_id_headline">' + $.i18n('wiz_hue_desc2') + '</p></div>');
-  }
+  $('#wizp2_body').append('<div id="hue_grp_ids_t" style="display:none"><p class="text-left" style="font-weight:bold">' + $.i18n('wiz_hue_e_desc2') + '</p></div>');
+  createTable("gidsh", "gidsb", "hue_grp_ids_t");
+  $('.gidsh').append(createTableRow([$.i18n('edt_dev_spec_groupId_title'), ""], true));
+
+  $('#wizp2_body').append('<div id="hue_ids_t" style="display:none"><p class="text-left" style="font-weight:bold" id="hue_id_headline">' + $.i18n('wiz_hue_e_desc3') + '</p></div>');
+
   createTable("lidsh", "lidsb", "hue_ids_t");
   $('.lidsh').append(createTableRow([$.i18n('edt_dev_spec_lightid_title'), $.i18n('wiz_pos'), $.i18n('wiz_identify')], true));
   $('#wizp2_footer').html('<button type="button" class="btn btn-primary" id="btn_wiz_save" style="display:none"><i class="fa fa-fw fa-save"></i>' + $.i18n('general_btn_save') + '</button><button type="button" class="btn btn-danger" id="btn_wiz_abort"><i class="fa fa-fw fa-close"></i>' + $.i18n('general_btn_cancel') + '</button>');
@@ -793,13 +786,26 @@ function startWizardPhilipsHue(e) {
 
 function checkHueBridge(cb, hueUser) {
   var usr = (typeof hueUser != "undefined") ? hueUser : 'config';
-  if (usr == 'config') $('#wiz_hue_discovered').html("");
+  if (usr === 'config') {
+    $('#wiz_hue_discovered').html("");
+  }
 
   if (hueIPs[hueIPsinc]) {
     var host = hueIPs[hueIPsinc].host;
     var port = hueIPs[hueIPsinc].port;
 
-    getProperties_hue_bridge(cb, decodeURIComponent(host), port, usr);
+    if (usr != '')
+    {
+      getProperties_hue_bridge(cb, decodeURIComponent(host), port, usr);
+    }
+    else
+    {
+      cb(false, usr);
+    }
+
+    if (isAPIv2Ready) {
+      $('#port').val(443);
+    }
   }
 }
 
@@ -811,37 +817,51 @@ function checkBridgeResult(reply, usr) {
     $('#port').val(hueIPs[hueIPsinc].port)
 
     $('#usrcont').toggle(true);
-    checkHueBridge(checkUserResult, $('#user').val() ? $('#user').val() : "newdeveloper");
+
+    checkHueBridge(checkUserResult, $('#user').val());
   }
   else {
-    //increment and check again
-    if (hueIPs.length - 1 > hueIPsinc) {
-      hueIPsinc++;
-      checkHueBridge(checkBridgeResult);
-    }
-    else {
-      $('#usrcont').toggle(false);
-      $('#wiz_hue_ipstate').html($.i18n('wiz_hue_failure_ip'));
-    }
+    $('#usrcont').toggle(false);
+    $('#wiz_hue_ipstate').html($.i18n('wiz_hue_failure_ip'));
   }
 };
 
-function checkUserResult(reply, usr) {
+function checkUserResult(reply, username) {
   $('#usrcont').toggle(true);
-  if (reply) {
-    $('#user').val(usr);
-    if (hueType == 'philipshueentertainment' && $('#clientkey').val() == "") {
 
+  var hue_create_user = 'wiz_hue_e_create_user';
+  if (!isEntertainmentReady) {
+    hue_create_user = 'wiz_hue_create_user';
+    $('#hue_client_key_r').toggle(false);
+  } else {
+    $('#hue_client_key_r').toggle(true);
+  }
+
+  $('#wiz_hue_create_user').text($.i18n(hue_create_user));
+  $('#wiz_hue_create_user').toggle(true);
+
+  if (reply) {
+    $('#user').val(username);
+
+    if (isEntertainmentReady && $('#clientkey').val() == "") {
       $('#wiz_hue_usrstate').html($.i18n('wiz_hue_e_clientkey_needed'));
       $('#wiz_hue_create_user').toggle(true);
     } else {
       $('#wiz_hue_usrstate').html("");
       $('#wiz_hue_create_user').toggle(false);
-      if (hueType == 'philipshue') {
-        get_hue_lights();
-      }
-      if (hueType == 'philipshueentertainment') {
-        get_hue_groups();
+
+      if (isEntertainmentReady) {
+        $('#hue_id_headline').text($.i18n('wiz_hue_e_desc3'));
+        $('#hue_grp_ids_t').toggle(true);
+
+        get_hue_groups(username);
+
+      } else {
+        $('#hue_id_headline').text($.i18n('wiz_hue_desc2'));
+        $('#hue_grp_ids_t').toggle(false);
+
+        get_hue_lights(username);
+
       }
     }
   }
@@ -852,22 +872,73 @@ function checkUserResult(reply, usr) {
   }
 };
 
-function useGroupId(id) {
-  $('#groupId').val(id);
+function useGroupId(id, username) {
+  $('#groupId').val(hueEntertainmentConfigs[id].id);
+  if (isAPIv2Ready) {
+    var group = hueEntertainmentConfigs[id];
 
-  //Ensure ligthIDs are strings
-  groupLights = hueGroups[id].lights.map(num => {
-    return String(num);
-  });
+    groupLights = [];
+    for (const light of group.light_services) {
+      groupLights.push(light.rid);
+    }
 
-  groupLightsLocations = hueGroups[id].locations;
-  get_hue_lights();
+    groupChannels = [];
+    for (const channel of group.channels) {
+      groupChannels.push(channel);
+    }
+
+    groupLightsLocations = [];
+    for (const location of group.locations.service_locations) {
+      groupLightsLocations.push(location);
+    }
+  } else {
+    //Ensure ligthIDs are strings
+    groupLights = hueEntertainmentConfigs[id].lights.map(num => {
+      return String(num);
+    });
+
+    var lightLocations = hueEntertainmentConfigs[id].locations;
+    for (var locationID in lightLocations) {
+      var lightLocation = {};
+
+      let position = {
+        x: lightLocations[locationID][0],
+        y: lightLocations[locationID][1],
+        z: lightLocations[locationID][2]
+      };
+      lightLocation.position = position;
+
+      groupLightsLocations.push(lightLocation);
+    }
+  }
+
+  get_hue_lights(username);
 }
 
+function updateBridgeDetails(properties) {
+  var ledDeviceProperties = properties.config;
+
+  if (!jQuery.isEmptyObject(ledDeviceProperties)) {
+    isEntertainmentReady = properties.isEntertainmentReady;
+    isAPIv2Ready = properties.isAPIv2Ready;
+
+    if (ledDeviceProperties.name && ledDeviceProperties.bridgeid && ledDeviceProperties.modelid) {
+      $('#wiz_hue_discovered').html(
+        "Bridge: " + ledDeviceProperties.name +
+        ", Modelid: " + ledDeviceProperties.modelid +
+        ", Firmware: " + ledDeviceProperties.swversion + "<br/>" +
+        "API-Version: " + ledDeviceProperties.apiversion +
+        ", Entertainment: " + (isEntertainmentReady ? "&#10003;" : "-") +
+        ", APIv2: " + (isAPIv2Ready ? "&#10003;" : "-")
+      );
+    }
+  }
+}
 
 async function discover_hue_bridges() {
   $('#wiz_hue_ipstate').html($.i18n('edt_dev_spec_devices_discovery_inprogress'));
-  $('#wiz_hue_discovered').html("")
+
+  //  $('#wiz_hue_discovered').html("")
   const res = await requestLedDeviceDiscovery('philipshue');
   if (res && !res.error) {
     const r = res.info;
@@ -903,11 +974,6 @@ async function discover_hue_bridges() {
             port = device.port;
           }
 
-          //Remap https port to http port until Hue-API v2 is supported
-          if (port == 443) {
-            port = 80;
-          }
-
           if (host) {
 
             if (!hueIPs.some(item => item.host === host)) {
@@ -916,22 +982,39 @@ async function discover_hue_bridges() {
           }
         }
       }
+
       $('#wiz_hue_ipstate').html("");
       $('#host').val(hueIPs[hueIPsinc].host)
       $('#port').val(hueIPs[hueIPsinc].port)
 
-      var usr = $('#user').val();
-      if (usr != "") {
-        checkHueBridge(checkUserResult, usr);
-      } else {
-        checkHueBridge(checkBridgeResult);
+      $('#hue_bridge_select').html("");
+
+      for (var key in hueIPs) {
+        $('#hue_bridge_select').append(createSelOpt(key, hueIPs[key].host));
       }
+
+      $('.hue_bridge_sel_watch').on("click", function () {
+        hueIPsinc = $(this).val();
+
+        var name = $("#hue_bridge_select option:selected").text();
+        $('#host').val(name);
+        $('#port').val(hueIPs[hueIPsinc].port)
+
+        var usr = $('#user').val();
+        if (usr != "") {
+          checkHueBridge(checkUserResult, usr);
+        } else {
+          checkHueBridge(checkBridgeResult);
+        }
+      });
+
+      $('.hue_bridge_sel_watch').click();
     }
   }
 }
 
 async function getProperties_hue_bridge(cb, hostAddress, port, username, resourceFilter) {
-  let params = { host: hostAddress, user: username, filter: resourceFilter };
+  let params = { host: hostAddress, username: username, filter: resourceFilter };
   if (port !== 'undefined') {
     params.port = parseInt(port);
   }
@@ -945,23 +1028,27 @@ async function getProperties_hue_bridge(cb, hostAddress, port, username, resourc
   }
 
   // Use device's properties, if properties in chache
-  if (devicesProperties[ledType][key]) {
+  if (devicesProperties[ledType][key] && devicesProperties[ledType][key][username]) {
+    updateBridgeDetails(devicesProperties[ledType][key]);
     cb(true, username);
   } else {
     const res = await requestLedDeviceProperties(ledType, params);
-
-
     if (res && !res.error) {
       var ledDeviceProperties = res.info.properties;
       if (!jQuery.isEmptyObject(ledDeviceProperties)) {
 
+        devicesProperties[ledType][key] = {};
+        devicesProperties[ledType][key][username] = ledDeviceProperties;
+
+        isAPIv2Ready = res.info.isAPIv2Ready;
+        devicesProperties[ledType][key].isAPIv2Ready = isAPIv2Ready;
+        isEntertainmentReady = res.info.isEntertainmentReady;
+        devicesProperties[ledType][key].isEntertainmentReady = isEntertainmentReady;
+
+        updateBridgeDetails(devicesProperties[ledType][key]);
         if (username === "config") {
-          if (ledDeviceProperties.name && ledDeviceProperties.bridgeid && ledDeviceProperties.modelid) {
-            $('#wiz_hue_discovered').html("Bridge: " + ledDeviceProperties.name + ", Modelid: " + ledDeviceProperties.modelid + ", API-Version: " + ledDeviceProperties.apiversion);
-            cb(true);
-          }
+          cb(true);
         } else {
-          devicesProperties[ledType][key] = ledDeviceProperties;
           cb(true, username);
         }
       } else {
@@ -973,12 +1060,12 @@ async function getProperties_hue_bridge(cb, hostAddress, port, username, resourc
   }
 }
 
-async function identify_hue_device(hostAddress, port, username, id) {
+async function identify_hue_device(hostAddress, port, username, name, id, id_v1) {
   var disabled = $('#btn_wiz_save').is(':disabled');
   // Take care that new record cannot be save during background process
   $('#btn_wiz_save').prop('disabled', true);
 
-  let params = { host: decodeURIComponent(hostAddress), user: username, lightId: id };
+  let params = { host: decodeURIComponent(hostAddress), username: username, lightName: decodeURIComponent(name), lightId: id, lightId_v1: id_v1 };
 
   if (port !== 'undefined') {
     params.port = parseInt(port);
@@ -1003,11 +1090,9 @@ function beginWizardHue() {
     $('#user').val(usr);
   }
 
-  if (hueType == 'philipshueentertainment') {
-    var clkey = eV("clientkey");
-    if (clkey != "") {
-      $('#clientkey').val(clkey);
-    }
+  var clkey = eV("clientkey");
+  if (clkey != "") {
+    $('#clientkey').val(clkey);
   }
 
   //check if host is empty/reachable/search for bridge
@@ -1022,13 +1107,13 @@ function beginWizardHue() {
     $('#host').val(host);
 
     var port = eV("port");
-    if (port == 0) {
-      $('#port').val(80);
-    }
-    else {
+    if (port > 0) {
       $('#port').val(port);
     }
-    hueIPs.unshift({ host: host, port: port });
+    else {
+      $('#port').val('');
+    }
+    hueIPs.push({ host: host, port: port });
 
     if (usr != "") {
       checkHueBridge(checkUserResult, usr);
@@ -1038,18 +1123,18 @@ function beginWizardHue() {
   }
 
   $('#retry_bridge').off().on('click', function () {
+    var host = $('#host').val();
+    var port = parseInt($('#port').val());
 
-    if ($('#host').val() != "") {
+    if (host != "") {
 
-      hueIPs = [];
-      hueIPsinc = 0;
-
-      var port = $('#port').val();
-      if (isNaN(port) || port < 1 || port > 65535) {
-        port = 80;
-        $('#port').val(80);
+      var idx = hueIPs.findIndex(item => item.host === host && item.port === port);
+      if (idx === -1) {
+        hueIPs.push({ host: host, port: port });
+        hueIPsinc = hueIPs.length - 1;
+      } else {
+        hueIPsinc = idx;
       }
-      hueIPs.push({ host: $('#host').val(), port: port });
     }
     else {
       discover_hue_bridges();
@@ -1064,29 +1149,177 @@ function beginWizardHue() {
   });
 
   $('#retry_usr').off().on('click', function () {
-    checkHueBridge(checkUserResult, $('#user').val() ? $('#user').val() : "newdeveloper");
+    checkHueBridge(checkUserResult, $('#user').val());
   });
 
   $('#wiz_hue_create_user').off().on('click', function () {
-    if ($('#host').val() != "") {
-      hueIPs.unshift({ host: $('#host').val(), port: $('#port').val() });
-    }
     createHueUser();
   });
 
+  function assignLightEntertainmentPos(isFocusCenter, position, name, id) {
+
+    var x = position.x;
+    var z = position.z;
+
+    if (isFocusCenter) {
+      // Map lights as in centered range -0.5 to 0.5
+      if (x < -0.5) {
+        x = -0.5;
+      } else if (x > 0.5) {
+        x = 0.5;
+      }
+      if (z < -0.5) {
+        z = -0.5;
+      } else if (z > 0.5) {
+        z = 0.5;
+      }
+    } else {
+      // Map lights as in full range -1 to 1
+      x /= 2;
+      z /= 2;
+    }
+
+    var h = x + 0.5;
+    var v = -z + 0.5;
+
+    var hmin = h - 0.05;
+    var hmax = h + 0.05;
+    var vmin = v - 0.05;
+    var vmax = v + 0.05;
+
+    let layoutObject = {
+      hmin: hmin < 0 ? 0 : hmin,
+      hmax: hmax > 1 ? 1 : hmax,
+      vmin: vmin < 0 ? 0 : vmin,
+      vmax: vmax > 1 ? 1 : vmax,
+      name: name
+    };
+
+    if (id) {
+      layoutObject.name += "_" + id;
+    }
+    return layoutObject;
+  }
+
+  function assignSegmentedLightPos(segment, position, name) {
+    var layoutObjects = [];
+
+    var segTotalLength = 0;
+    for (var key in segment) {
+
+      segTotalLength += segment[key].length;
+    }
+
+    var min;
+    var max;
+    var horizontal = true;
+
+    var layoutObject = assignLightPos(position, name);
+    if (position === "left" || position === "right") {
+      // vertical distribution
+      min = layoutObject.vmin;
+      max = layoutObject.vmax;
+      horizontal = false;
+
+    } else {
+      // horizontal distribution
+      min = layoutObject.hmin;
+      max = layoutObject.hmax;
+    }
+
+    var step = (max - min) / segTotalLength;
+    var start = min;
+
+    for (var key in segment) {
+      min = start;
+      max = round(start + segment[key].length * step);
+
+      if (horizontal) {
+        layoutObject.hmin = min;
+        layoutObject.hmax = max;
+      } else {
+        layoutObject.vmin = min;
+        layoutObject.vmax = max;
+      }
+      layoutObject.name = name + "_" + key;
+      layoutObjects.push(JSON.parse(JSON.stringify(layoutObject)));
+
+      start = max;
+    }
+
+    return layoutObjects;
+  }
+
   $('#btn_wiz_save').off().on("click", function () {
     var hueLedConfig = [];
     var finalLightIds = [];
+    var channelNumber = 0;
 
     //create hue led config
-    for (var key in hueLights) {
-      if (hueType == 'philipshueentertainment') {
-        if (groupLights.indexOf(key) == -1) continue;
-      }
-      if ($('#hue_' + key).val() != "disabled") {
-        finalLightIds.push(key);
-        var idx_content = assignLightPos(key, $('#hue_' + key).val(), hueLights[key].name);
-        hueLedConfig.push(JSON.parse(JSON.stringify(idx_content)));
+    for (var key in groupLights) {
+      var lightId = groupLights[key];
+
+      if ($('#hue_' + lightId).val() != "disabled") {
+        finalLightIds.push(lightId);
+
+        var lightName;
+        if (isAPIv2Ready) {
+          var light = hueLights.find(light => light.id === lightId);
+          lightName = light.metadata.name;
+        } else {
+          lightName = hueLights[lightId].name;
+        }
+
+        var position = $('#hue_' + lightId).val();
+        var lightIdx = groupLights.indexOf(lightId);
+        var lightLocation = groupLightsLocations[lightIdx];
+
+        var serviceID;
+        if (isAPIv2Ready) {
+          serviceID = lightLocation.service.rid;
+        }
+
+        if (position.startsWith("entertainment")) {
+
+          // Layout per entertainment area definition at bridge
+          var isFocusCenter = false;
+          if (position === "entertainment_center") {
+            isFocusCenter = true;
+          }
+
+          if (isAPIv2Ready) {
+
+            groupChannels.forEach((channel) => {
+              if (channel.members[0].service.rid === serviceID) {
+                var layoutObject = assignLightEntertainmentPos(isFocusCenter, channel.position, lightName, channel.channel_id);
+                hueLedConfig.push(JSON.parse(JSON.stringify(layoutObject)));
+                ++channelNumber;
+              }
+            });
+          } else {
+            var layoutObject = assignLightEntertainmentPos(isFocusCenter, lightLocation.position, lightName);
+            hueLedConfig.push(JSON.parse(JSON.stringify(layoutObject)));
+          }
+        }
+        else {
+          // Layout per manual settings
+          var maxSegments = 1;
+
+          if (isAPIv2Ready) {
+            var service = hueEntertainmentServices.find(service => service.id === serviceID);
+            maxSegments = service.segments.max_segments;
+          }
+
+          if (maxSegments > 1) {
+            var segment = service.segments.segments;
+            var layoutObjects = assignSegmentedLightPos(segment, position, lightName);
+            hueLedConfig.push(...layoutObjects);
+          } else {
+            var layoutObject = assignLightPos(position, lightName);
+            hueLedConfig.push(JSON.parse(JSON.stringify(layoutObject)));
+          }
+          channelNumber += maxSegments;
+        }
       }
     }
 
@@ -1121,7 +1354,7 @@ function beginWizardHue() {
     d.brightnessFactor = parseFloat(eV("brightnessFactor", 1));
 
     d.clientkey = $('#clientkey').val();
-    d.groupId = parseInt($('#groupId').val());
+    d.groupId = $('#groupId').val();
     d.blackLightsTimeout = parseInt(eV("blackLightsTimeout", 5000));
     d.brightnessMin = parseFloat(eV("brightnessMin", 0));
     d.brightnessMax = parseFloat(eV("brightnessMax", 1));
@@ -1134,8 +1367,16 @@ function beginWizardHue() {
     d.enableAttempts = parseInt(conf_editor.getEditor("root.generalOptions.enableAttempts").getValue());
     d.enableAttemptsInterval = parseInt(conf_editor.getEditor("root.generalOptions.enableAttemptsInterval").getValue());
 
-    if (hueType == 'philipshue') {
-      d.useEntertainmentAPI = false;
+    d.useEntertainmentAPI = isEntertainmentReady;
+    d.useAPIv2 = isAPIv2Ready;
+
+    if (isEntertainmentReady) {
+      d.hardwareLedCount = channelNumber;
+      if (window.serverConfig.device.type !== d.type) {
+        //smoothing on, if new device
+        sc.smoothing = { enable: true };
+      }
+    } else {
       d.hardwareLedCount = finalLightIds.length;
       d.verbose = false;
       if (window.serverConfig.device.type !== d.type) {
@@ -1144,15 +1385,6 @@ function beginWizardHue() {
       }
     }
 
-    if (hueType == 'philipshueentertainment') {
-      d.useEntertainmentAPI = true;
-      d.hardwareLedCount = groupLights.length;
-      if (window.serverConfig.device.type !== d.type) {
-        //smoothing on, if new device
-        sc.smoothing = { enable: true };
-      }
-    }
-
     window.serverConfig.device = d;
 
     requestWriteConfig(sc, true);
@@ -1163,7 +1395,6 @@ function beginWizardHue() {
 }
 
 function createHueUser() {
-
   var host = hueIPs[hueIPsinc].host;
   var port = hueIPs[hueIPsinc].port;
 
@@ -1208,7 +1439,8 @@ function createHueUser() {
               conf_editor.getEditor("root.specificOptions.host").setValue(host);
               conf_editor.getEditor("root.specificOptions.port").setValue(port);
             }
-            if (hueType == 'philipshueentertainment') {
+
+            if (isEntertainmentReady) {
               var clientkey = response.clientkey;
               if (clientkey != 'undefined') {
                 $('#clientkey').val(clientkey);
@@ -1230,37 +1462,52 @@ function createHueUser() {
   }, retryInterval * 1000);
 }
 
-function get_hue_groups() {
-
+function get_hue_groups(username) {
   var host = hueIPs[hueIPsinc].host;
 
-  if (devicesProperties['philipshue'][host]) {
-    var ledProperties = devicesProperties['philipshue'][host];
+  if (devicesProperties['philipshue'][host] && devicesProperties['philipshue'][host][username]) {
+    var ledProperties = devicesProperties['philipshue'][host][username];
 
-    if (!jQuery.isEmptyObject(ledProperties)) {
-      hueGroups = ledProperties.groups;
-      if (Object.keys(hueGroups).length > 0) {
-
-        $('.lidsb').html("");
-        $('#wh_topcontainer').toggle(false);
-        $('#hue_grp_ids_t').toggle(true);
-
-        var gC = 0;
-        for (var groupid in hueGroups) {
-          if (hueGroups[groupid].type == 'Entertainment') {
-            $('.gidsb').append(createTableRow([groupid + ' (' + hueGroups[groupid].name + ')', '<button class="btn btn-sm btn-primary" onClick=useGroupId(' + groupid + ')>' + $.i18n('wiz_hue_e_use_groupid', groupid) + '</button>']));
-            gC++;
-          }
-        }
-        if (gC == 0) {
-          noAPISupport('wiz_hue_e_noegrpids');
+    if (isAPIv2Ready) {
+      if (!jQuery.isEmptyObject(ledProperties.data)) {
+        if (Object.keys(ledProperties.data).length > 0) {
+          hueEntertainmentConfigs = ledProperties.data.filter(config => {
+            return config.type === "entertainment_configuration";
+          });
+          hueEntertainmentServices = ledProperties.data.filter(config => {
+            return (config.type === "entertainment" && config.renderer === true);
+          });
         }
       }
+    } else {
+      if (!jQuery.isEmptyObject(ledProperties.groups)) {
+        hueEntertainmentConfigs = [];
+        var hueGroups = ledProperties.groups;
+        for (var groupid in hueGroups) {
+          if (hueGroups[groupid].type == 'Entertainment') {
+            hueGroups[groupid].id = groupid;
+            hueEntertainmentConfigs.push(hueGroups[groupid]);
+          }
+        }
+      }
+    }
+
+    if (Object.keys(hueEntertainmentConfigs).length > 0) {
+
+      $('.lidsb').html("");
+      $('#wh_topcontainer').toggle(false);
+      $('#hue_grp_ids_t').toggle(true);
+
+      for (var groupid in hueEntertainmentConfigs) {
+        $('.gidsb').append(createTableRow([groupid + ' (' + hueEntertainmentConfigs[groupid].name + ')', '<button class="btn btn-sm btn-primary" onClick=useGroupId("' + groupid + '","' + username + '")>' + $.i18n('wiz_hue_e_use_group') + '</button>']));
+      }
+    } else {
+      noAPISupport('wiz_hue_e_noegrpids', username);
     }
   }
 }
 
-function noAPISupport(txt) {
+function noAPISupport(txt, username) {
   showNotification('danger', $.i18n('wiz_hue_e_title'), $.i18n('wiz_hue_e_noapisupport_hint'));
   conf_editor.getEditor("root.specificOptions.useEntertainmentAPI").setValue(false);
   $("#root_specificOptions_useEntertainmentAPI").trigger("change");
@@ -1269,51 +1516,82 @@ function noAPISupport(txt) {
   var txt = (txt) ? $.i18n(txt) : $.i18n('wiz_hue_e_nogrpids');
   $('<p style="font-weight:bold;color:red;">' + txt + '<br />' + $.i18n('wiz_hue_e_noapisupport') + '</p>').insertBefore('#wizp2_body #hue_ids_t');
   $('#hue_id_headline').html($.i18n('wiz_hue_desc2'));
-  hueType = 'philipshue';
-  get_hue_lights();
+
+  get_hue_lights(username);
 }
 
-function get_hue_lights() {
-
+function get_hue_lights(username) {
   var host = hueIPs[hueIPsinc].host;
 
-  if (devicesProperties['philipshue'][host]) {
-    var ledProperties = devicesProperties['philipshue'][host];
+  if (devicesProperties['philipshue'][host] && devicesProperties['philipshue'][host][username]) {
+    var ledProperties = devicesProperties['philipshue'][host][username];
 
-    if (!jQuery.isEmptyObject(ledProperties.lights)) {
-      hueLights = ledProperties.lights;
-      if (Object.keys(hueLights).length > 0) {
-        if (hueType == 'philipshue') {
-          $('#wh_topcontainer').toggle(false);
+    if (isAPIv2Ready) {
+      if (!jQuery.isEmptyObject(ledProperties.data)) {
+        if (Object.keys(ledProperties.data).length > 0) {
+          hueLights = ledProperties.data.filter(config => {
+            return config.type === "light";
+          });
         }
-        $('#hue_ids_t, #btn_wiz_save').toggle(true);
+      }
+    } else {
+      if (!jQuery.isEmptyObject(ledProperties.lights)) {
+        hueLights = ledProperties.lights;
+      }
+    }
 
-        var lightOptions = [
-          "top", "topleft", "topright",
-          "bottom", "bottomleft", "bottomright",
-          "left", "lefttop", "leftmiddle", "leftbottom",
-          "right", "righttop", "rightmiddle", "rightbottom",
-          "entire",
-          "lightPosTopLeft112", "lightPosTopLeftNewMid", "lightPosTopLeft121",
-          "lightPosBottomLeft14", "lightPosBottomLeft12", "lightPosBottomLeft34", "lightPosBottomLeft11",
-          "lightPosBottomLeft112", "lightPosBottomLeftNewMid", "lightPosBottomLeft121"
-        ];
+    if (Object.keys(hueLights).length > 0) {
+      if (!isEntertainmentReady) {
+        $('#wh_topcontainer').toggle(false);
+      }
+      $('#hue_ids_t, #btn_wiz_save').toggle(true);
 
-        if (hueType == 'philipshue') {
-          lightOptions.unshift("disabled");
+      var lightOptions = [
+        "top", "topleft", "topright",
+        "bottom", "bottomleft", "bottomright",
+        "left", "lefttop", "leftmiddle", "leftbottom",
+        "right", "righttop", "rightmiddle", "rightbottom",
+        "entire",
+        "lightPosTopLeft112", "lightPosTopLeftNewMid", "lightPosTopLeft121",
+        "lightPosBottomLeft14", "lightPosBottomLeft12", "lightPosBottomLeft34", "lightPosBottomLeft11",
+        "lightPosBottomLeft112", "lightPosBottomLeftNewMid", "lightPosBottomLeft121"
+      ];
+
+      if (isEntertainmentReady) {
+        lightOptions.unshift("entertainment_center");
+        lightOptions.unshift("entertainment");
+      } else {
+        lightOptions.unshift("disabled");
+        groupLights = Object.keys(hueLights);
+      }
+
+      $('.lidsb').html("");
+
+      var pos = "";
+      for (var id in groupLights) {
+        var lightId = groupLights[id];
+        var lightId_v1 = "/lights/" + lightId;
+
+        var lightName;
+        if (isAPIv2Ready) {
+          var light = hueLights.find(light => light.id === lightId);
+          lightName = light.metadata.name;
+          lightId_v1 = light.id_v1;
+        } else {
+          lightName = hueLights[lightId].name;
         }
 
-        $('.lidsb').html("");
-        var pos = "";
-        for (var lightid in hueLights) {
-          if (hueType == 'philipshueentertainment') {
-            if (groupLights.indexOf(lightid) == -1) continue;
+        if (isEntertainmentReady) {
+          var lightLocation = {};
+          lightLocation = groupLightsLocations[id];
+          if (lightLocation) {
+            if (isAPIv2Ready) {
+              pos = 0;
+            } else {
+              var x = lightLocation.position.x;
+              var y = lightLocation.position.y;
+              var z = lightLocation.position.z;
 
-            if (groupLightsLocations.hasOwnProperty(lightid)) {
-              lightLocation = groupLightsLocations[lightid];
-              var x = lightLocation[0];
-              var y = lightLocation[1];
-              var z = lightLocation[2];
               var xval = (x < 0) ? "left" : "right";
               if (z != 1 && x >= -0.25 && x <= 0.25) xval = "";
               switch (z) {
@@ -1329,37 +1607,39 @@ function get_hue_lights() {
               }
             }
           }
-          var options = "";
-          for (var opt in lightOptions) {
-            var val = lightOptions[opt];
-            var txt = (val != 'entire' && val != 'disabled') ? 'conf_leds_layout_cl_' : 'wiz_ids_';
-            options += '<option value="' + val + '"';
-            if (pos == val) options += ' selected="selected"';
-            options += '>' + $.i18n(txt + val) + '</option>';
-          }
-          $('.lidsb').append(createTableRow([lightid + ' (' + hueLights[lightid].name + ')', '<select id="hue_' + lightid + '" class="hue_sel_watch form-control">'
-            + options
-            + '</select>', '<button class="btn btn-sm btn-primary" onClick=identify_hue_device("' + encodeURIComponent($("#host").val()) + '","' + $('#port').val() + '","' + $("#user").val() + '",' + lightid + ')>' + $.i18n('wiz_hue_blinkblue', lightid) + '</button>']));
         }
 
-        if (hueType != 'philipshueentertainment') {
-          $('.hue_sel_watch').on("change", function () {
-            var cC = 0;
-            for (var key in hueLights) {
-              if ($('#hue_' + key).val() != "disabled") {
-                cC++;
-              }
+        var options = "";
+        for (var opt in lightOptions) {
+          var val = lightOptions[opt];
+          var txt = (val != 'entire' && val != 'disabled') ? 'conf_leds_layout_cl_' : 'wiz_ids_';
+          options += '<option value="' + val + '"';
+          if (pos == val) options += ' selected="selected"';
+          options += '>' + $.i18n(txt + val) + '</option>';
+        }
+
+        $('.lidsb').append(createTableRow([id + ' (' + lightName + ')', '<select id="hue_' + lightId + '" class="hue_sel_watch form-control">'
+          + options
+          + '</select>', '<button class="btn btn-sm btn-primary" onClick=identify_hue_device("' + encodeURIComponent($("#host").val()) + '","' + $('#port').val() + '","' + $("#user").val() + '","' + encodeURIComponent(lightName) + '","' + lightId + '","' + lightId_v1 + '")>' + $.i18n('wiz_hue_blinkblue', id) + '</button>']));
+      }
+
+      if (!isEntertainmentReady) {
+        $('.hue_sel_watch').on("change", function () {
+          var cC = 0;
+          for (var key in hueLights) {
+            if ($('#hue_' + key).val() != "disabled") {
+              cC++;
             }
+          }
 
-            (cC == 0 || window.readOnlyMode) ? $('#btn_wiz_save').prop("disabled", true) : $('#btn_wiz_save').prop("disabled", false);
-          });
-        }
-        $('.hue_sel_watch').trigger('change');
-      }
-      else {
-        var txt = '<p style="font-weight:bold;color:red;">' + $.i18n('wiz_hue_noids') + '</p>';
-        $('#wizp2_body').append(txt);
+          (cC == 0 || window.readOnlyMode) ? $('#btn_wiz_save').prop("disabled", true) : $('#btn_wiz_save').prop("disabled", false);
+        });
       }
+      $('.hue_sel_watch').trigger('change');
+    }
+    else {
+      var txt = '<p style="font-weight:bold;color:red;">' + $.i18n('wiz_hue_noids') + '</p>';
+      $('#wizp2_body').append(txt);
     }
   }
 }
@@ -1437,7 +1717,7 @@ function beginWizardYeelight() {
 
         finalLights.push(lights[key]);
 
-        var idx_content = assignLightPos(key, $('#yee_' + key).val(), name);
+        var idx_content = assignLightPos($('#yee_' + key).val(), name);
         yeelightLedConfig.push(JSON.parse(JSON.stringify(idx_content)));
       }
     }
@@ -1733,7 +2013,7 @@ function beginWizardAtmoOrb() {
         if (lights[key].host !== "")
           name += ':' + lights[key].host;
 
-        var idx_content = assignLightPos(key, $('#orb_' + key).val(), name);
+        var idx_content = assignLightPos($('#orb_' + key).val(), name);
         atmoorbLedConfig.push(JSON.parse(JSON.stringify(idx_content)));
       }
     }
diff --git a/libsrc/hyperion/SettingsManager.cpp b/libsrc/hyperion/SettingsManager.cpp
index e9fa5805..ac19461d 100644
--- a/libsrc/hyperion/SettingsManager.cpp
+++ b/libsrc/hyperion/SettingsManager.cpp
@@ -723,6 +723,7 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 			}
 
 			//Migration steps for versions <= 2.0.13
+			_previousVersion = targetVersion;
 			targetVersion.setVersion("2.0.13");
 			if (_previousVersion <= targetVersion)
 			{
@@ -774,6 +775,60 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 					}
 				}
 			}
+
+			//Migration steps for versions <= 2.0.16
+			_previousVersion = targetVersion;
+			targetVersion.setVersion("2.0.16");
+			if (_previousVersion <= targetVersion)
+			{
+				Info(_log, "Instance [%u]: Migrate from version [%s] to version [%s] or later", _instance, _previousVersion.getVersion().c_str(), targetVersion.getVersion().c_str());
+
+				// Have Hostname/IP-address separate from port for LED-Devices
+				if (config.contains("device"))
+				{
+					QJsonObject newDeviceConfig = config["device"].toObject();
+
+					if (newDeviceConfig.contains("type"))
+					{
+						QString type = newDeviceConfig["type"].toString();
+						if ( type == "philipshue")
+						{
+							if (newDeviceConfig.contains("groupId"))
+							{
+								if (newDeviceConfig["groupId"].isDouble())
+								{
+									int groupID = newDeviceConfig["groupId"].toInt();
+									newDeviceConfig["groupId"] = QString::number(groupID);
+									migrated = true;
+								}
+							}
+
+							if (newDeviceConfig.contains("lightIds"))
+							{
+								QJsonArray lightIds = newDeviceConfig.value( "lightIds").toArray();
+								// Iterate through the JSON array and update integer values to strings
+								for (int i = 0; i < lightIds.size(); ++i) {
+									QJsonValue value = lightIds.at(i);
+									if (value.isDouble())
+									{
+										int lightId = value.toInt();
+										lightIds.replace(i, QString::number(lightId));
+										migrated = true;
+									}
+								}
+								newDeviceConfig["lightIds"] = lightIds;
+
+							}
+						}
+					}
+
+					if (migrated)
+					{
+						config["device"] = newDeviceConfig;
+						Debug(_log, "LED-Device records migrated");
+					}
+				}
+			}
 		}
 	}
 	return migrated;
diff --git a/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp b/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
index ba008ab0..d4d75e9f 100644
--- a/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
+++ b/libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
@@ -3,8 +3,10 @@
 
 #include <chrono>
 
-#include <ssdp/SSDPDiscover.h>
 #include <utils/QStringUtils.h>
+#include "qendian.h"
+
+#include <ssdp/SSDPDiscover.h>
 
 // mDNS discover
 #ifdef ENABLE_MDNS
@@ -17,6 +19,7 @@
 namespace {
 
 bool verbose = false;
+bool verbose3 = false;
 
 // Configuration settings
 const char CONFIG_HOST[] = "host";
@@ -28,59 +31,106 @@ const char CONFIG_TRANSITIONTIME[] = "transitiontime";
 const char CONFIG_BLACK_LIGHTS_TIMEOUT[] = "blackLightsTimeout";
 const char CONFIG_ON_OFF_BLACK[] = "switchOffOnBlack";
 const char CONFIG_RESTORE_STATE[] = "restoreOriginalState";
-const char CONFIG_LIGHTIDS[] = "lightIds";
+const char CONFIG_lightIdS[] = "lightIds";
+const char CONFIG_USE_HUE_API_V2[] = "useAPIv2";
 const char CONFIG_USE_HUE_ENTERTAINMENT_API[] = "useEntertainmentAPI";
-const char CONFIG_GROUPID[] = "groupId";
+const char CONFIG_groupId[] = "groupId";
 
 const char CONFIG_VERBOSE[] = "verbose";
 
-// Device Data elements
-const char DEV_DATA_BRIDGEID[] = "bridgeid";
-const char DEV_DATA_MODEL[] = "modelid";
-const char DEV_DATA_NAME[] = "name";
-const char DEV_DATA_FIRMWAREVERSION[] = "swversion";
-const char DEV_DATA_APIVERSION[] = "apiversion";
-
 // Philips Hue OpenAPI URLs
 const int API_DEFAULT_PORT = -1; //Use default port per communication scheme
-const char API_BASE_PATH[] = "/api/%1";
-const char API_ROOT[] = "";
-const char API_STATE[] = "state";
-const char API_CONFIG[] = "config";
-const char API_LIGHTS[] = "lights";
-const char API_GROUPS[] = "groups";
+const char API_ROOT[] = "/";
+const char API_BASE_PATH_V1[] = "api";
+const char API_BASE_PATH_V2[] = "/clip/v2/resource";
+const char API_AUTH_PATH_V1[] = "auth/v1";
+const char API_RESOURCE_CONFIG[] = "config";
+const char API_RESOURCE_LIGHTS[] = "lights";
+const char API_RESOURCE_GROUPS[] = "groups";
+//V2
+const char API_RESOURCE_DEVICE[] = "device";
+const char API_RESOURCE_LIGHT[] = "light";
+const char API_RESOURCE_ENTERTAINMENT[] = "entertainment";
+const char API_RESOURCE_ENTERTAINMENT_CONFIGURATION[] = "entertainment_configuration";
+
+// Device Data elements
+const char DEV_DATA_BRIDGEID[] = "bridgeid";
+const char DEV_DATA_SOFTWAREVERSION[] = "swversion";
+const char DEV_DATA_APIVERSION[] = "apiversion";
+
+const char DEV_DATA_METADATA[] = "metadata";
+const char DEV_DATA_NAME[] = "name";
+const char DEV_DATA_ARCHETYPE[] = "archetype";
+
+const char DEV_DATA_PRODUCTDATA[] = "product_data";
+const char DEV_DATA_PRODUCT[] = "product_name";
+const char DEV_DATA_MODEL[] = "model_id";
+
+const char DEV_DATA_PRODUCT_V1[] = "productname";
+const char DEV_DATA_MODEL_V1[] = "modelid";
 
 // List of Group / Stream Information
 const char API_GROUP_NAME[] = "name";
 const char API_GROUP_TYPE[] = "type";
-const char API_GROUP_TYPE_ENTERTAINMENT[] = "Entertainment";
+const char API_GROUP_TYPE_ENTERTAINMENT_V1[] = "Entertainment";
+const char API_GROUP_TYPE_ENTERTAINMENT_CONFIGURATION[] = "entertainment_configuration";
+
+const char API_OWNER[] = "owner";
 const char API_STREAM[] = "stream";
 const char API_STREAM_ACTIVE[] = "active";
 const char API_STREAM_ACTIVE_VALUE_TRUE[] = "true";
 const char API_STREAM_ACTIVE_VALUE_FALSE[] = "false";
-const char API_STREAM_OWNER[] = "owner";
 const char API_STREAM_RESPONSE_FORMAT[] = "/%1/%2/%3/%4";
+const char API_STREAM_STATUS[] = "status";
+const char API_STREAM_ACTIVE_V2[] = "active_streamer";
 
-// List of resources
+const char API_LIGHT_SERVICES[] = "light_services";
+const char API_CHANNELS[] = "channels";
+const char API_RID[] = "rid";
+
+// List of light resources
+const char API_LIGTH_ID[] = "lightId";
+const char API_LIGTH_ID_v1[] = "lightId_v1";
+const char API_COLOR[] = "color";
+const char API_GRADIENT[] = "gradient";
 const char API_XY_COORDINATES[] = "xy";
+const char API_X_COORDINATE[] = "x";
+const char API_Y_COORDINATE[] = "y";
 const char API_BRIGHTNESS[] = "bri";
 const char API_TRANSITIONTIME[] = "transitiontime";
-const char API_MODEID[] = "modelid";
+
+const char API_DYNAMICS[] = "dynamics";
+const char API_DURATION[] = "duration";
+const char API_DIMMING[] = "dimming";
 
 // List of State Information
+const char API_STATE[] = "state";
 const char API_STATE_ON[] = "on";
-const char API_STATE_VALUE_TRUE[] = "true";
-const char API_STATE_VALUE_FALSE[] = "false";
 
-// List of Error Information
+// List of Action Information
+const char API_ACTION[] = "action";
+const char API_ACTION_START[] = "start";
+const char API_ACTION_STOP[] = "stop";
+const char API_ACTION_BREATHE[] = "breathe";
+
+const char API_ALERT[] = "alert";
+const char API_SELECT[] = "select";
+
+// List of Data/Error Information
+const char API_DATA[] = "data";
 const char API_ERROR[] = "error";
 const char API_ERROR_ADDRESS[] = "address";
 const char API_ERROR_DESCRIPTION[] = "description";
 const char API_ERROR_TYPE[] = "type";
 
+const char API_ERRORS[] = "errors";
+
 // List of Success Information
 const char API_SUCCESS[] = "success";
 
+// List of custom HTTP Headers
+const char HTTP_HEADER_APPLICATION_KEY[] = "hue-application-key";
+
 // Phlips Hue ssdp services
 const char SSDP_ID[] = "upnp:rootdevice";
 const char SSDP_FILTER[] = "(.*)IpBridge(.*)";
@@ -90,13 +140,55 @@ const char SSDP_FILTER_HEADER[] = "SERVER";
 const char API_SSL_SERVER_NAME[] = "Hue";
 const char API_SSL_SEED_CUSTOM[] = "dtls_client";
 const int API_SSL_SERVER_PORT = 2100;
+const char API_SSL_CA_CERTIFICATE_RESSOURCE[] = ":/philips_hue_ca.pem";
+
 const int STREAM_CONNECTION_RETRYS = 20;
 const int STREAM_SSL_HANDSHAKE_ATTEMPTS = 5;
 const int SSL_CIPHERSUITES[2] = { MBEDTLS_TLS_PSK_WITH_AES_128_GCM_SHA256, 0 };
 
+const int DEV_FIRMWAREVERSION_APIV2 = 1948086000;
+
 //Enable rewrites that Hue-Bridge does not close the connection ("After 10 seconds of no activity the connection is closed automatically, and status is set back to inactive.")
 constexpr std::chrono::milliseconds STREAM_REWRITE_TIME{5000};
 
+//Streaming message header and payload definition
+const uint8_t HEADER[] =
+{
+	'H', 'u', 'e', 'S', 't', 'r', 'e', 'a', 'm', //protocol
+	0x01, 0x00, //version 1.0
+	0x01, //sequence number 1
+	0x00, 0x00, //Reserved write 0’s
+	0x00, // 0x00 = RGB; 0x01 = XY Brightness
+	0x00, // Reserved, write 0’s
+};
+
+const uint8_t PAYLOAD_PER_LIGHT[] =
+{
+	0x01, 0x00, 0x06, //light ID
+	//color: 16 bpc
+	0xff, 0xff, //Red
+	0xff, 0xff, //Green
+	0xff, 0xff, //Blue
+};
+
+//API v2 - Streaming message header and payload definition
+const uint8_t HEADER_V2[] =
+{
+	'H', 'u', 'e', 'S', 't', 'r', 'e', 'a', 'm', //protocol
+	0x02, 0x00, //version 2.0
+	0x01, //sequence number 1
+	0x00, 0x00, //Reserved write 0’s
+	0x00, // 0x00 = RGB; 0x01 = XY Brightness
+	0x00, // Reserved
+};
+
+const char* ENTERTAINMENT_ID[36];
+const uint8_t PAYLOAD_PER_CHANNEL_V2[] =
+{
+	0xff, //channel id
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff //color
+};
+
 } //End of constants
 
 bool operator ==(const CiColor& p1, const CiColor& p2)
@@ -246,17 +338,19 @@ double CiColor::getDistanceBetweenTwoPoints(CiColor p1, XYColor p2)
 
 LedDevicePhilipsHueBridge::LedDevicePhilipsHueBridge(const QJsonObject &deviceConfig)
 	: ProviderUdpSSL(deviceConfig)
-	  , _restApi(nullptr)
-	  , _apiPort(API_DEFAULT_PORT)
-	  , _useHueEntertainmentAPI(false)
-	  , _api_major(0)
-	  , _api_minor(0)
-	  , _api_patch(0)
-	  , _isHueEntertainmentReady(false)
+	, _restApi(nullptr)
+	, _apiPort(API_DEFAULT_PORT)
+	, _useEntertainmentAPI(false)
+	, _isAPIv2Ready(false)
+	, _isDiyHue(false)
+	, _api_major(0)
+	, _api_minor(0)
+	, _api_patch(0)
+	, _isHueEntertainmentReady(false)
 {
 #ifdef ENABLE_MDNS
 	QMetaObject::invokeMethod(&MdnsBrowser::getInstance(), "browseForServiceType",
-		Qt::QueuedConnection, Q_ARG(QByteArray, MdnsServiceRegister::getServiceType(_activeDeviceType)));
+							  Qt::QueuedConnection, Q_ARG(QByteArray, MdnsServiceRegister::getServiceType(_activeDeviceType)));
 #endif
 }
 
@@ -268,7 +362,7 @@ LedDevicePhilipsHueBridge::~LedDevicePhilipsHueBridge()
 
 bool LedDevicePhilipsHueBridge::init(const QJsonObject &deviceConfig)
 {
-	DebugIf( verbose, _log, "deviceConfig: [%s]", QString(QJsonDocument(_devConfig).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	DebugIf( verbose, _log, "deviceConfig: [%s]", QJsonDocument(_devConfig).toJson(QJsonDocument::Compact).constData() );
 
 	bool isInitOK = false;
 
@@ -279,19 +373,32 @@ bool LedDevicePhilipsHueBridge::init(const QJsonObject &deviceConfig)
 
 	Debug(_log, "Hostname/IP: %s", QSTRING_CSTR(_hostName) );
 
-	if( _useHueEntertainmentAPI )
+	_useApiV2 = deviceConfig[CONFIG_USE_HUE_API_V2].toBool(false);
+	Debug(_log, "Use Hue API v2: %s", _useApiV2 ? "Yes" : "No" );
+
+	if( _useEntertainmentAPI )
 	{
 		setLatchTime( 0);
 		_devConfig["sslport"]        = API_SSL_SERVER_PORT;
 		_devConfig["servername"]     = API_SSL_SERVER_NAME;
 		_devConfig["psk"]            = _devConfig[ CONFIG_CLIENTKEY ].toString();
-		_devConfig["psk_identity"]   = _devConfig[ CONFIG_USERNAME ].toString();
+		if (_useApiV2)
+		{
+			// psk_identity is to be set later when application-id was resolved
+			_devConfig["psk_identity"] = "";
+		}
+		else
+		{
+			_devConfig["psk_identity"]   = _authToken;
+		}
 		_devConfig["seed_custom"]    = API_SSL_SEED_CUSTOM;
 		_devConfig["retry_left"]     = STREAM_CONNECTION_RETRYS;
 		_devConfig["hs_attempts"]    = STREAM_SSL_HANDSHAKE_ATTEMPTS;
 		_devConfig["hs_timeout_min"] = 600;
 		_devConfig["hs_timeout_max"] = 1000;
 
+		_port      = API_SSL_SERVER_PORT;
+
 		isInitOK = ProviderUdpSSL::init(_devConfig);
 	}
 	else
@@ -310,9 +417,6 @@ bool LedDevicePhilipsHueBridge::openRestAPI()
 	{
 		_restApi = new ProviderRestApi(_address.toString(), _apiPort);
 		_restApi->setLogger(_log);
-
-		//Base-path is api-path + authentication token (here username)
-		_restApi->setBasePath(QString(API_BASE_PATH).arg(_authToken));
 	}
 	else
 	{
@@ -320,12 +424,13 @@ bool LedDevicePhilipsHueBridge::openRestAPI()
 		_restApi->setPort(_apiPort);
 	}
 
-	//Workaround until API v2 with https is supported
-	if (_apiPort == 0 || _apiPort == 443)
+	if (_apiPort == 0 || _apiPort == 80 || _apiPort == 443)
 	{
 		_apiPort = API_DEFAULT_PORT;
 		_restApi->setPort(_apiPort);
 	}
+
+	_restApi->setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 	return isInitOK;
 }
 
@@ -334,39 +439,66 @@ bool LedDevicePhilipsHueBridge::checkApiError(const QJsonDocument &response, boo
 	bool apiError = false;
 	QString errorReason;
 
-	QString strJson(response.toJson(QJsonDocument::Compact));
-	DebugIf(verbose, _log, "Reply: [%s]", strJson.toUtf8().constData());
+	DebugIf(verbose, _log, "Reply: [%s]", response.toJson(QJsonDocument::Compact).constData());
 
-	QVariantList rspList = response.toVariant().toList();
-	if ( !rspList.isEmpty() )
+	if (_useApiV2)
 	{
-		QVariantMap map = rspList.first().toMap();
-		if ( map.contains( API_ERROR ) )
+		QJsonObject obj = response.object();
+		if (obj.contains(API_ERRORS))
 		{
-			// API call failed to execute an error message was returned
-			QString errorAddress = map.value(API_ERROR).toMap().value(API_ERROR_ADDRESS).toString();
-			QString errorDesc    = map.value(API_ERROR).toMap().value(API_ERROR_DESCRIPTION).toString();
-			QString errorType    = map.value(API_ERROR).toMap().value(API_ERROR_TYPE).toString();
-
-			log("Error Type", "%s", QSTRING_CSTR(errorType));
-			log("Error Address", "%s", QSTRING_CSTR(errorAddress));
-			log("Error Address Description", "%s", QSTRING_CSTR(errorDesc));
-
-			if( errorType != "901" )
+			QJsonArray errorList = obj.value(API_ERRORS).toArray();
+			if (!errorList.isEmpty())
 			{
-				errorReason = QString ("(%1) %2, Resource:%3").arg(errorType, errorDesc, errorAddress);
-				if (!supressError)
+				QStringList errors;
+				for (const QJsonValue &error : qAsConst(errorList))
 				{
-					this->setInError(errorReason);
+					QString errorString = error.toObject()[API_ERROR_DESCRIPTION].toString();
+					if (!errorString.contains("may not have effect"))
+					{
+						errors << errorString;
+					}
 				}
-				else
+				if (!errors.isEmpty())
 				{
-					Warning(_log, "Suppresing error: %s", QSTRING_CSTR(errorReason));
+					errorReason = errors.join(",");
+					apiError = true;
 				}
-				apiError = true;
 			}
 		}
 	}
+	else
+	{
+		QJsonArray responseList = response.array();
+		if (!responseList.isEmpty())
+		{
+			QJsonObject respose = responseList.first().toObject();
+			if (respose.contains(API_ERROR))
+			{
+				QJsonObject error = respose.value(API_ERROR).toObject();
+				int errorType = error.value(API_ERROR_TYPE).toInt();
+				QString errorDesc = error.value(API_ERROR_DESCRIPTION).toString();
+				QString errorAddress = error.value(API_ERROR_ADDRESS).toString();
+
+				if( errorType != 901 )
+				{
+					errorReason = QString ("(%1) %2, Resource:%3").arg(errorType).arg(errorDesc, errorAddress);
+					apiError = true;
+				}
+			}
+		}
+	}
+
+	if (apiError)
+	{
+		if (!supressError)
+		{
+			this->setInError(errorReason);
+		}
+		else
+		{
+			Warning(_log, "Suppresing error: %s", QSTRING_CSTR(errorReason));
+		}
+	}
 	return apiError;
 }
 
@@ -375,27 +507,59 @@ int LedDevicePhilipsHueBridge::open()
 	int retval = -1;
 	_isDeviceReady = false;
 
-	if (NetUtils::resolveHostToAddress(_log, _hostName, _address, _apiPort))
+	if (NetUtils::resolveHostToAddress(_log, _hostName, _address))
 	{
 		if ( openRestAPI() )
 		{
-			if (initMaps())
+			QJsonDocument bridgeDetails = retrieveBridgeDetails();
+			if ( !bridgeDetails.isEmpty() )
 			{
-				if ( _useHueEntertainmentAPI )
+				setBridgeDetails(bridgeDetails, true);
+
+
+				if (_useApiV2)
 				{
-					// Open bridge for streaming
-					if ( ProviderUdpSSL::open() == 0 )
+					if ( configureSsl() )
 					{
-						// Everything is OK, device is ready
-						_isDeviceReady = true;
-						retval = 0;
+						if (retrieveApplicationId())
+						{
+							setPSKidentity(_applicationID);
+						}
 					}
 				}
 				else
 				{
-					// Everything is OK, device is ready
-					_isDeviceReady = true;
-					retval = 0;
+					if (_isAPIv2Ready)
+					{
+						Warning(_log,"Your Hue Bridge supports a newer API. Reconfigure your device in Hyperion to benefit from new features.");
+					}
+				}
+
+				if (!isInError() )
+				{
+					setBaseApiEnvironment(_useApiV2);
+					if (initLightsMap() && initDevicesMap() && initEntertainmentSrvsMap())
+					{
+						if ( _useEntertainmentAPI )
+						{
+							if (initGroupsMap())
+							{
+								// Open bridge for streaming
+								if ( ProviderUdpSSL::open() == 0 )
+								{
+									// Everything is OK, device is ready
+									_isDeviceReady = true;
+									retval = 0;
+								}
+							}
+						}
+						else
+						{
+							// Everything is OK, device is ready
+							_isDeviceReady = true;
+							retval = 0;
+						}
+					}
 				}
 			}
 		}
@@ -409,7 +573,7 @@ int LedDevicePhilipsHueBridge::close()
 	_isDeviceReady = false;
 	int retval = 0;
 
-	if( _useHueEntertainmentAPI )
+	if( _useEntertainmentAPI )
 	{
 		retval = ProviderUdpSSL::close();
 	}
@@ -417,6 +581,24 @@ int LedDevicePhilipsHueBridge::close()
 	return retval;
 }
 
+bool LedDevicePhilipsHueBridge::configureSsl()
+{
+	_restApi->setAlternateServerIdentity(_deviceBridgeId);
+
+	if (_isDiyHue)
+	{
+		_restApi->acceptSelfSignedCertificates(true);
+	}
+
+	bool success = _restApi->setCaCertificate(API_SSL_CA_CERTIFICATE_RESSOURCE);
+	if (!success)
+	{
+		this->setInError ( "Failed to configure Hue Bridge for SSL", false );
+	}
+
+	return success;
+}
+
 const int *LedDevicePhilipsHueBridge::getCiphersuites() const
 {
 	return SSL_CIPHERSUITES;
@@ -439,56 +621,118 @@ void LedDevicePhilipsHueBridge::log(const char* msg, const char* type, ...) cons
 	Debug( _log, "%s: %s", s.c_str(), val );
 }
 
-QJsonDocument LedDevicePhilipsHueBridge::getAllBridgeInfos()
+QJsonDocument LedDevicePhilipsHueBridge::retrieveBridgeDetails()
 {
-	return get(API_ROOT);
+	QJsonDocument bridgeDetails;
+	if ( openRestAPI() )
+	{
+		setBaseApiEnvironment(false, API_BASE_PATH_V1);
+		bridgeDetails = get( API_RESOURCE_CONFIG );
+	}
+	return bridgeDetails;
 }
 
-bool LedDevicePhilipsHueBridge::initMaps()
+bool LedDevicePhilipsHueBridge::retrieveApplicationId()
 {
-	bool isInitOK = true;
+	bool rc {false};
 
-	QJsonDocument doc = getAllBridgeInfos();
+	setBaseApiEnvironment(true, API_ROOT);
+	_restApi->setPath(API_AUTH_PATH_V1);
 
-	DebugIf( verbose, _log, "doc: [%s]", QString(QJsonDocument(doc).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	httpResponse response = _restApi->get();
 
-	if (doc.isEmpty())
+	if ( !response.error() )
 	{
-		setInError("Could not read the Hue Bridge details");
-	}
-
-	if ( this->isInError() )
-	{
-		isInitOK = false;
+		_applicationID = response.getHeader("hue-application-id");
+		rc = true;
 	}
 	else
 	{
-		setBridgeConfig( doc );
-		if( _useHueEntertainmentAPI )
-		{
-			setGroupMap( doc );
-		}
-		setLightsMap( doc );
+		QString errorReason = QString("Failed to get application-id from Hue Bridge, error: '%1'").arg(response.getErrorReason());
+		this->setInError ( errorReason, false );
 	}
-
-	return isInitOK;
+	return rc;
 }
 
-void LedDevicePhilipsHueBridge::setBridgeConfig(const QJsonDocument &doc)
+QJsonDocument LedDevicePhilipsHueBridge::retrieveDeviceDetails(const QString& deviceId )
 {
-	QJsonObject jsonConfigInfo = doc.object()[ API_CONFIG ].toObject();
-	if ( verbose )
+	QStringList resourcePath;
+	if (_useApiV2)
 	{
-		std::cout <<  "jsonConfigInfo: [" << QString(QJsonDocument(jsonConfigInfo).toJson(QJsonDocument::Compact)).toUtf8().constData() << "]" << std::endl;
+		resourcePath << API_RESOURCE_DEVICE;
+		if (!deviceId.isEmpty())
+		{
+			resourcePath << deviceId;
+		}
 	}
+	return get( resourcePath );
+}
 
-	QString deviceName = jsonConfigInfo[DEV_DATA_NAME].toString();
-	_deviceModel = jsonConfigInfo[DEV_DATA_MODEL].toString();
-	QString deviceBridgeID = jsonConfigInfo[DEV_DATA_BRIDGEID].toString();
-	_deviceFirmwareVersion = jsonConfigInfo[DEV_DATA_FIRMWAREVERSION].toString();
-	_deviceAPIVersion = jsonConfigInfo[DEV_DATA_APIVERSION].toString();
 
-	QStringList apiVersionParts = QStringUtils::split(_deviceAPIVersion,".", QStringUtils::SplitBehavior::SkipEmptyParts);
+QJsonDocument LedDevicePhilipsHueBridge::retrieveLightDetails(const QString& lightId )
+{
+	QStringList resourcePath;
+	if (_useApiV2)
+	{
+		resourcePath << API_RESOURCE_LIGHT;
+		if (!lightId.isEmpty())
+		{
+			resourcePath << lightId;
+		}
+	}
+	else
+	{
+		resourcePath << API_RESOURCE_LIGHTS;
+		if (!lightId.isEmpty())
+		{
+			resourcePath << lightId << API_STATE;
+		}
+	}
+	return get( resourcePath );
+}
+
+QJsonDocument LedDevicePhilipsHueBridge::retrieveGroupDetails(const QString& groupId )
+{
+	QStringList resourcePath;
+	if (_useApiV2)
+	{
+		resourcePath << API_RESOURCE_ENTERTAINMENT_CONFIGURATION;
+		if (!groupId.isEmpty())
+		{
+			resourcePath << groupId;
+		}
+	}
+	else
+	{
+		resourcePath << API_RESOURCE_GROUPS;
+		if (!groupId.isEmpty())
+		{
+			resourcePath << groupId;
+		}
+	}
+	return get( resourcePath );
+}
+
+QJsonDocument LedDevicePhilipsHueBridge::retrieveEntertainmentSrvDetails(const QString& entertainmentID )
+{
+	QStringList resourcePath;
+	if (_useApiV2)
+	{
+		resourcePath << API_RESOURCE_ENTERTAINMENT;
+		if (!entertainmentID.isEmpty())
+		{
+			resourcePath << entertainmentID;
+		}
+	}
+	return get( resourcePath );
+}
+
+
+bool LedDevicePhilipsHueBridge::isApiEntertainmentReady(const QString& apiVersion)
+{
+	bool ready {false};
+
+	QStringList apiVersionParts = QStringUtils::split(apiVersion,".", QStringUtils::SplitBehavior::SkipEmptyParts);
 	if ( !apiVersionParts.isEmpty() )
 	{
 		_api_major = apiVersionParts[0].toUInt();
@@ -497,187 +741,543 @@ void LedDevicePhilipsHueBridge::setBridgeConfig(const QJsonDocument &doc)
 
 		if ( _api_major > 1 || (_api_major == 1 && _api_minor >= 22) )
 		{
-			_isHueEntertainmentReady = true;
+			ready = true;
 		}
 	}
+	Debug(_log,"API version [%s] %s Entertainment API ready", QSTRING_CSTR(apiVersion), ready ? "is" : "is not" );
+	return ready;
+}
 
-	if( _useHueEntertainmentAPI )
+bool LedDevicePhilipsHueBridge::isAPIv2Ready(int swVersion)
+{
+	bool ready {true};
+	if (swVersion < DEV_FIRMWAREVERSION_APIV2)
 	{
-		DebugIf( !_isHueEntertainmentReady, _log, "Bridge is not Entertainment API Ready - Entertainment API usage was disabled!" );
-		_useHueEntertainmentAPI = _isHueEntertainmentReady;
+		ready = false;
+	}
+	Debug(_log,"Firmware version [%d] %s API v2 ready", swVersion, ready ? "is" : "is not" );
+	return ready;
+}
+
+void LedDevicePhilipsHueBridge::setBaseApiEnvironment(bool apiV2, const QString& path)
+{
+	if ( _restApi != nullptr )
+	{
+		QStringList basePath;
+		if (apiV2)
+		{
+			_restApi->setScheme("https");
+
+			if (!path.isEmpty())
+			{
+				basePath << path;
+			}
+			else
+			{
+				basePath << API_BASE_PATH_V2;
+			}
+			_restApi->setHeader(HTTP_HEADER_APPLICATION_KEY, _authToken.toUtf8());
+		}
+		else
+		{
+			_restApi->setScheme("http");
+
+			if (!path.isEmpty())
+			{
+				basePath << path;
+			}
+			else
+			{
+				//Base-path is api-path + authentication token (here username)
+				basePath << API_BASE_PATH_V1 << _authToken;
+			}
+		}
+		_restApi->setBasePath(basePath);
+
+		DebugIf(verbose, _log,"New BasePath: %s", QSTRING_CSTR(_restApi->getBasePath()));
+	}
+}
+
+bool LedDevicePhilipsHueBridge::initDevicesMap()
+{
+	bool isInitOK = false;
+
+	if ( !this->isInError() )
+	{
+		QJsonDocument deviceDetails = retrieveDeviceDetails();
+		if ( !deviceDetails.isEmpty() )
+		{
+			setDevicesMap( deviceDetails );
+			isInitOK = true;
+		}
+	}
+	return isInitOK;
+}
+
+bool LedDevicePhilipsHueBridge::initLightsMap()
+{
+	bool isInitOK = false;
+
+	if ( !this->isInError() )
+	{
+		QJsonDocument lightDetails = retrieveLightDetails();
+		if ( !lightDetails.isEmpty() )
+		{
+			setLightsMap( lightDetails );
+			isInitOK = true;
+		}
+	}
+	return isInitOK;
+}
+
+bool LedDevicePhilipsHueBridge::initGroupsMap()
+{
+	bool isInitOK = false;
+
+	if ( !this->isInError() )
+	{
+		QJsonDocument groupDetails = retrieveGroupDetails();
+		if ( !groupDetails.isEmpty() )
+		{
+			setGroupMap( groupDetails );
+			isInitOK = true;
+		}
+	}
+	return isInitOK;
+}
+
+bool LedDevicePhilipsHueBridge::initEntertainmentSrvsMap()
+{
+	bool isInitOK = false;
+
+	if ( !this->isInError() )
+	{
+		QJsonDocument entertainmentSrvDetails = retrieveEntertainmentSrvDetails();
+		if ( !entertainmentSrvDetails.isEmpty() )
+		{
+			setEntertainmentSrvMap( entertainmentSrvDetails );
+			isInitOK = true;
+		}
+	}
+	return isInitOK;
+}
+
+void LedDevicePhilipsHueBridge::setBridgeDetails(const QJsonDocument &doc, bool isLogging)
+{
+	QJsonObject jsonConfigInfo = doc.object();
+	if ( verbose )
+	{
+		std::cout <<  "jsonConfigInfo: [" << QJsonDocument(jsonConfigInfo).toJson(QJsonDocument::Compact).constData() << "]" << std::endl;
 	}
 
-	log( "Bridge Name", "%s", QSTRING_CSTR( deviceName ));
-	log( "Model", "%s", QSTRING_CSTR( _deviceModel ));
-	log( "Bridge-ID", "%s", QSTRING_CSTR( deviceBridgeID ));
-	log( "SoftwareVersion", "%s", QSTRING_CSTR( _deviceFirmwareVersion ));
-	log( "API-Version", "%u.%u.%u", _api_major, _api_minor, _api_patch );
-	log( "EntertainmentReady", "%d", static_cast<int>(_isHueEntertainmentReady) );
+	_deviceName = jsonConfigInfo[DEV_DATA_NAME].toString();
+	if (_deviceName.startsWith("DiyHue", Qt::CaseInsensitive))
+	{
+		_isDiyHue = true;
+	}
+
+	_deviceModel = jsonConfigInfo[DEV_DATA_MODEL_V1].toString();
+	_deviceBridgeId = jsonConfigInfo[DEV_DATA_BRIDGEID].toString();
+	_deviceFirmwareVersion = jsonConfigInfo[DEV_DATA_SOFTWAREVERSION].toString().toInt();
+	_deviceAPIVersion = jsonConfigInfo[DEV_DATA_APIVERSION].toString();
+
+	_isHueEntertainmentReady = isApiEntertainmentReady(_deviceAPIVersion);
+	_isAPIv2Ready = isAPIv2Ready(_deviceFirmwareVersion);
+
+	if( _useEntertainmentAPI )
+	{
+		DebugIf( !_isHueEntertainmentReady, _log, "Bridge is not Entertainment API Ready - Entertainment API usage was disabled!" );
+		_useEntertainmentAPI = _isHueEntertainmentReady;
+	}
+
+	if (isLogging)
+	{
+		log( "Bridge Name", "%s", QSTRING_CSTR( _deviceName ));
+		log( "Bridge-ID", "%s", QSTRING_CSTR( _deviceBridgeId ));
+		log( "Model", "%s", QSTRING_CSTR( _deviceModel ));
+		log( "Firmware version", "%d", _deviceFirmwareVersion );
+		log( "API-Version", "%u.%u.%u", _api_major, _api_minor, _api_patch );
+		log( "API v2 ready", "%s", _isAPIv2Ready ? "Yes" : "No" );
+		log( "Entertainment ready", "%s", _isHueEntertainmentReady ? "Yes" : "No" );
+		log( "DIYHue", "%s", _isDiyHue ? "Yes" : "No" );
+	}
+}
+
+void LedDevicePhilipsHueBridge::setDevicesMap(const QJsonDocument &doc)
+{
+	_devicesMap.clear();
+
+	if (_useApiV2)
+	{
+		QJsonArray devices = doc.array();
+
+		for (const QJsonValue &device : qAsConst(devices))
+		{
+			QString deviceId = device.toObject().value("id").toString();
+			_devicesMap.insert(deviceId, device.toObject());
+		}
+	}
 }
 
 void LedDevicePhilipsHueBridge::setLightsMap(const QJsonDocument &doc)
 {
-	QJsonObject jsonLightsInfo = doc.object()[ API_LIGHTS ].toObject();
-
-	DebugIf(verbose, _log, "jsonLightsInfo: [%s]", QString(QJsonDocument(jsonLightsInfo).toJson(QJsonDocument::Compact)).toUtf8().constData() );
-
-	// Get all available light ids and their values
-	QStringList keys = jsonLightsInfo.keys();
-
-	_ledCount = static_cast<uint>(keys.size());
 	_lightsMap.clear();
 
-	for ( int i = 0; i < static_cast<int>(_ledCount); ++i )
+	if (_useApiV2)
 	{
-		_lightsMap.insert(keys.at(i).toUShort(), jsonLightsInfo.take(keys.at(i)).toObject());
+		QJsonArray lights = doc.array();
+
+		for (const QJsonValue &light : qAsConst(lights))
+		{
+			QString lightId = light.toObject().value("id").toString();
+			_lightsMap.insert(lightId, light.toObject());
+		}
+	}
+	else
+	{
+		QJsonObject jsonLightsInfo = doc.object();
+		DebugIf(verbose, _log, "jsonLightsInfo: [%s]", QJsonDocument(jsonLightsInfo).toJson(QJsonDocument::Compact).constData() );
+
+		// Get all available light ids and their values
+		QStringList keys = jsonLightsInfo.keys();
+
+		for ( int i = 0; i < keys.count(); ++i )
+		{
+			QString key = keys.at(i);
+			_lightsMap.insert(key, jsonLightsInfo[key].toObject());
+		}
 	}
 
-	if ( getLedCount() == 0 )
+	_lightsCount = _lightsMap.count();
+
+	if ( _lightsCount == 0 )
 	{
 		this->setInError( "No light-IDs found at the Philips Hue Bridge" );
 	}
 	else
 	{
-		log( "Lights in Bridge found", "%d", getLedCount() );
+		log( "Lights at Bridge found", "%d", _lightsCount );
 	}
 }
 
 void LedDevicePhilipsHueBridge::setGroupMap(const QJsonDocument &doc)
 {
-	QJsonObject jsonGroupsInfo = doc.object()[ API_GROUPS ].toObject();
-
-	DebugIf(verbose, _log, "jsonGroupsInfo: [%s]", QString(QJsonDocument(jsonGroupsInfo).toJson(QJsonDocument::Compact)).toUtf8().constData() );
-
-	// Get all available group ids and their values
-	QStringList keys = jsonGroupsInfo.keys();
-
-	int _groupsCount = keys.size();
 	_groupsMap.clear();
-
-	for ( int i = 0; i < _groupsCount; ++i )
+	if (_useApiV2)
 	{
-		_groupsMap.insert( keys.at(i).toUShort(), jsonGroupsInfo.take(keys.at(i)).toObject() );
+		QJsonArray groups = doc.array();
+
+		for (const QJsonValue &group : qAsConst(groups))
+		{
+			QString groupId = group.toObject().value("id").toString();
+			_groupsMap.insert(groupId, group.toObject());
+		}
+	}
+	else
+	{
+		QJsonObject jsonGroupsInfo = doc.object();
+		DebugIf(verbose, _log, "jsonGroupsInfo: [%s]", QJsonDocument(jsonGroupsInfo).toJson(QJsonDocument::Compact).constData() );
+
+		// Get all available group ids and their values
+		QStringList keys = jsonGroupsInfo.keys();
+
+		int _groupsCount = keys.size();
+		for ( int i = 0; i < _groupsCount; ++i )
+		{
+			_groupsMap.insert( keys.at(i), jsonGroupsInfo.take(keys.at(i)).toObject() );
+		}
 	}
 }
 
-QMap<int,QJsonObject> LedDevicePhilipsHueBridge::getLightMap() const
+void LedDevicePhilipsHueBridge::setEntertainmentSrvMap(const QJsonDocument &doc)
+{
+	_entertainmentMap.clear();
+
+	if (_useApiV2)
+	{
+		QJsonArray entertainmentSrvs = doc.array();
+
+		for (const QJsonValue &entertainmentSrv : qAsConst(entertainmentSrvs))
+		{
+			QString entertainmentSrvId = entertainmentSrv.toObject().value("id").toString();
+			_entertainmentMap.insert(entertainmentSrvId, entertainmentSrv.toObject());
+		}
+	}
+}
+
+QMap<QString,QJsonObject> LedDevicePhilipsHueBridge::getDevicesMap() const
+{
+	return _devicesMap;
+}
+
+QMap<QString,QJsonObject> LedDevicePhilipsHueBridge::getLightMap() const
 {
 	return _lightsMap;
 }
 
-QMap<int,QJsonObject> LedDevicePhilipsHueBridge::getGroupMap() const
+QMap<QString,QJsonObject> LedDevicePhilipsHueBridge::getGroupMap() const
 {
 	return _groupsMap;
 }
 
-QString LedDevicePhilipsHueBridge::getGroupName(int groupId) const
+QMap<QString,QJsonObject> LedDevicePhilipsHueBridge::getEntertainmentMap() const
+{
+	return _entertainmentMap;
+}
+
+QJsonObject LedDevicePhilipsHueBridge::getDeviceDetails(const QString& deviceId)
+{
+	DebugIf( verbose, _log, "[%s]", QSTRING_CSTR(deviceId) );
+	return _devicesMap.value(deviceId);
+}
+
+QJsonObject LedDevicePhilipsHueBridge::getLightDetails(const QString& lightId)
+{
+	DebugIf( verbose, _log, "[%s]", QSTRING_CSTR(lightId) );
+	return _lightsMap.value(lightId);
+}
+
+QJsonDocument LedDevicePhilipsHueBridge::setLightState(const QString& lightId, const QJsonObject& state)
+{
+	DebugIf( verbose, _log, "[%s] ", QSTRING_CSTR(lightId) );
+	QStringList resourcePath;
+	QJsonObject cmd;
+
+	if (_useApiV2)
+	{
+		resourcePath << API_RESOURCE_LIGHT << lightId;
+		cmd = state;
+	}
+	else
+	{
+		resourcePath << API_RESOURCE_LIGHTS << lightId << API_STATE;
+		cmd = state;
+	}
+	return put(resourcePath, cmd);
+}
+
+QJsonDocument LedDevicePhilipsHueBridge::getGroupDetails(const QString& groupId)
+{
+	DebugIf( verbose, _log, "[%s]", QSTRING_CSTR(groupId) );
+	return retrieveGroupDetails(groupId);
+}
+
+QString LedDevicePhilipsHueBridge::getGroupName(const QString& groupId ) const
 {
 	QString groupName;
 	if( _groupsMap.contains( groupId ) )
 	{
 		QJsonObject group = _groupsMap.value( groupId );
 		groupName = group.value( API_GROUP_NAME ).toString().trimmed().replace("\"", "");
+		DebugIf( verbose, _log, "GroupId [%s]: GroupName: %s", QSTRING_CSTR(groupId), QSTRING_CSTR(groupName) );
 	}
 	else
 	{
-		Error(_log, "Group ID %u doesn't exists on this bridge", groupId );
+		Error(_log, "Group ID %s does not exist on this bridge", QSTRING_CSTR(groupId) );
 	}
 	return groupName;
 }
 
-QJsonArray LedDevicePhilipsHueBridge::getGroupLights(int groupId) const
+QStringList LedDevicePhilipsHueBridge::getGroupLights(const QString& groupId) const
 {
-	QJsonArray groupLights;
-	// search user groupid inside _groupsMap and create light if found
+	QStringList groupLights;
+	// search user groupId inside _groupsMap and create light if found
 	if( _groupsMap.contains( groupId ) )
 	{
 		QJsonObject group = _groupsMap.value( groupId );
 
-		if( group.value( API_GROUP_TYPE ) == API_GROUP_TYPE_ENTERTAINMENT )
-		{
-			QString groupName = getGroupName( groupId );
-			groupLights = group.value( API_LIGHTS ).toArray();
+		QString groupName = getGroupName( groupId );
 
-			log( "Entertainment Group found", "[%d] %s", groupId, QSTRING_CSTR(groupName) );
-			log( "Lights in Group", "%d", groupLights.size() );
-			Info(_log, "Entertainment Group [%d] \"%s\" with %d Lights found", groupId, QSTRING_CSTR(groupName), groupLights.size() );
+		QString type = group.value( API_GROUP_TYPE ).toString();
+		if( type == API_GROUP_TYPE_ENTERTAINMENT_V1 || type ==  API_GROUP_TYPE_ENTERTAINMENT_CONFIGURATION)
+		{
+			if (_useApiV2)
+			{
+				QJsonArray lightServices = group.value( API_LIGHT_SERVICES ).toArray();
+				for (const QJsonValue &light : qAsConst(lightServices))
+				{
+					groupLights.append( light.toObject().value(API_RID).toString());
+				}
+			}
+			else
+			{
+				groupLights = group.value( API_RESOURCE_LIGHTS ).toVariant().toStringList();
+			}
+			Info(_log, "Entertainment Group \"%s\" [%s] with %d lights found", QSTRING_CSTR(groupName), QSTRING_CSTR(groupId), groupLights.size() );
 		}
 		else
 		{
-			Error(_log, "Group ID %d is not an entertainment group", groupId );
+			Error(_log, "Group ID (%s)[%s] is not an entertainment group", QSTRING_CSTR(groupName), QSTRING_CSTR(groupId));
 		}
 	}
 	else
 	{
-		Error(_log, "Group ID %d doesn't exists on this bridge", groupId );
+		Error(_log, "Group ID [%s] does not exist on this bridge", QSTRING_CSTR(groupId) );
 	}
-
 	return groupLights;
 }
 
-QJsonDocument LedDevicePhilipsHueBridge::getLightState(int lightId)
+QJsonDocument LedDevicePhilipsHueBridge::setGroupState(const QString&  groupId, bool state)
 {
-	DebugIf( verbose, _log, "GetLightState [%d]", lightId );
-	return get( QString("%1/%2").arg( API_LIGHTS ).arg( lightId ) );
+	QStringList resourcePath;
+	QJsonObject cmd;
+
+	if (_useApiV2)
+	{
+		resourcePath << API_RESOURCE_ENTERTAINMENT_CONFIGURATION << groupId;
+		cmd.insert(API_ACTION, state ? API_ACTION_START : API_ACTION_STOP);
+	}
+	else
+	{
+		resourcePath << API_RESOURCE_GROUPS << groupId;
+		cmd.insert(API_STREAM, QJsonObject {{API_STREAM_ACTIVE, state }});
+	}
+	return put(resourcePath, cmd);
 }
 
-void LedDevicePhilipsHueBridge::setLightState(int lightId, const QString &state)
+QJsonObject LedDevicePhilipsHueBridge::getEntertainmentSrvDetails(const QString& deviceId)
 {
-	DebugIf( verbose, _log, "SetLightState [%d]: %s", lightId, QSTRING_CSTR(state) );
-	put( QString("%1/%2/%3").arg( API_LIGHTS ).arg( lightId ).arg( API_STATE ), state );
+	DebugIf( verbose, _log, "getEntertainmentSrvDetails [%s]", QSTRING_CSTR(deviceId) );
+
+	QJsonObject details;
+	for (const QJsonObject& entertainmentSrv : qAsConst(_entertainmentMap))
+	{
+		QJsonObject owner = entertainmentSrv[API_OWNER].toObject();
+
+		if (owner[API_RID] == deviceId)
+		{
+			details = entertainmentSrv;
+			break;
+		}
+	}
+	return details;
 }
 
-QJsonDocument LedDevicePhilipsHueBridge::getGroupState(int groupId)
+int LedDevicePhilipsHueBridge::getGroupChannelsCount(const QString& groupId) const
 {
-	DebugIf( verbose, _log, "GetGroupState [%d]", groupId );
-	return get( QString("%1/%2").arg( API_GROUPS ).arg( groupId ) );
-}
-
-QJsonDocument LedDevicePhilipsHueBridge::setGroupState(int groupId, bool state)
-{
-	QString active = state ? API_STREAM_ACTIVE_VALUE_TRUE : API_STREAM_ACTIVE_VALUE_FALSE;
-	return put(QString("%1/%2").arg(API_GROUPS).arg(groupId), QString("{\"%1\":{\"%2\":%3}}").arg(API_STREAM, API_STREAM_ACTIVE, active), true);
+	int channelsCount {0};
+	// search user groupId inside _groupsMap and create light if found
+	if( _groupsMap.contains( groupId ) )
+	{
+		QJsonObject group = _groupsMap.value( groupId );
+		QString groupName = getGroupName( groupId );
+		QString type = group.value( API_GROUP_TYPE ).toString();
+		if(type ==  API_GROUP_TYPE_ENTERTAINMENT_CONFIGURATION)
+		{
+			if (_useApiV2)
+			{
+				QJsonArray channels = group.value( API_CHANNELS ).toArray();
+				channelsCount = channels.size();
+			}
+			Info(_log, "Entertainment Group \"%s\" [%s] with %d channels found", QSTRING_CSTR(groupName), QSTRING_CSTR(groupId), channelsCount );
+		}
+		else
+		{
+			Error(_log, "Group ID (%s)[%s] is not an entertainment group", QSTRING_CSTR(groupName), QSTRING_CSTR(groupId));
+		}
+	}
+	else
+	{
+		Error(_log, "Group ID [%s] does not exist on this bridge", QSTRING_CSTR(groupId) );
+	}
+	return channelsCount;
 }
 
 QJsonDocument LedDevicePhilipsHueBridge::get(const QString& route)
 {
-	_restApi->setPath(route);
+	return get(QStringList{route});
+}
 
+QJsonDocument LedDevicePhilipsHueBridge::get(const QStringList& routeElements)
+{
+	_restApi->setPath(routeElements);
 	httpResponse response = _restApi->get();
-
-	if (route.isEmpty() && response.error() &&
-		(  response.getNetworkReplyError() == QNetworkReply::UnknownNetworkError ||
-		   response.getNetworkReplyError() == QNetworkReply::ConnectionRefusedError ||
-		   response.getNetworkReplyError() == QNetworkReply::RemoteHostClosedError ||
-		   response.getNetworkReplyError() == QNetworkReply::OperationCanceledError ))
+	if (response.error())
 	{
-		Warning(_log, "The Hue Bridge is not ready.");
+		if (routeElements.isEmpty() &&
+			(  response.getNetworkReplyError() == QNetworkReply::UnknownNetworkError ||
+			   response.getNetworkReplyError() == QNetworkReply::ConnectionRefusedError ||
+			   response.getNetworkReplyError() == QNetworkReply::RemoteHostClosedError ||
+			   response.getNetworkReplyError() == QNetworkReply::OperationCanceledError ))
+		{
+			Warning(_log, "API request (Get): The Hue Bridge is not ready.");
+		}
+		else
+		{
+			QString errorReason = QString("API request (Get) failed with error: '%1'").arg(response.getErrorReason());
+			this->setInError ( errorReason );
+		}
 	}
-
-	checkApiError(response.getBody());
+	else
+	{
+		if (!checkApiError(response.getBody()))
+		{
+			if (_useApiV2)
+			{
+				QJsonObject obj = response.getBody().object();
+				if (obj.contains(API_DATA))
+				{
+					return QJsonDocument {obj.value(API_DATA).toArray()};
+				}
+			}
+		}
+	}
+	_restApi->clearPath();
 	return response.getBody();
 }
 
-QJsonDocument LedDevicePhilipsHueBridge::put(const QString& route, const QString& content, bool supressError)
+QJsonDocument LedDevicePhilipsHueBridge::put(const QStringList& routeElements, const QJsonObject& content, bool supressError)
 {
-	_restApi->setPath(route);
-
+	_restApi->setPath(routeElements);
 	httpResponse response = _restApi->put(content);
-	checkApiError(response.getBody(), supressError);
+	if (response.error())
+	{
+		QString errorReason = QString("API request (Put) failed with error: '%1'").arg(response.getErrorReason());
+		this->setInError ( errorReason );
+	}
+	else
+	{
+		if (!checkApiError(response.getBody(), supressError))
+		{
+			if (_useApiV2)
+			{
+				QJsonObject obj = response.getBody().object();
+				if (obj.contains(API_DATA))
+				{
+					return QJsonDocument {obj.value(API_DATA).toArray()};
+				}
+			}
+		}
+	}
+	_restApi->clearPath();
 	return response.getBody();
 }
 
 bool LedDevicePhilipsHueBridge::isStreamOwner(const QString &streamOwner) const
 {
-	return ( streamOwner != "" && streamOwner == _authToken );
+	bool isOwner {false};
+
+	if (_useApiV2)
+	{
+		if ( streamOwner != "" && streamOwner == _applicationID)
+		{
+			isOwner = true;
+		}
+	}
+	else
+	{
+		if ( streamOwner != "" && streamOwner == _authToken )
+		{
+			isOwner = true;
+		}
+	}
+	return isOwner;
 }
 
-QJsonArray LedDevicePhilipsHueBridge::discover()
+QJsonArray LedDevicePhilipsHueBridge::discoverSsdp()
 {
 	QJsonArray deviceList;
-
 	SSDPDiscover discover;
-
 	discover.skipDuplicateKeys(true);
 	discover.setSearchFilter(SSDP_FILTER, SSDP_FILTER_HEADER);
 	QString searchTarget = SSDP_ID;
@@ -686,7 +1286,6 @@ QJsonArray LedDevicePhilipsHueBridge::discover()
 	{
 		deviceList = discover.getServicesDiscoveredJson();
 	}
-
 	return deviceList;
 }
 
@@ -700,10 +1299,10 @@ QJsonObject LedDevicePhilipsHueBridge::discover(const QJsonObject& /*params*/)
 #ifdef ENABLE_MDNS
 	QString discoveryMethod("mDNS");
 	deviceList = MdnsBrowser::getInstance().getServicesDiscoveredJson(
-		MdnsServiceRegister::getServiceType(_activeDeviceType),
-		MdnsServiceRegister::getServiceNameFilter(_activeDeviceType),
-		DEFAULT_DISCOVER_TIMEOUT
-		);
+					 MdnsServiceRegister::getServiceType(_activeDeviceType),
+					 MdnsServiceRegister::getServiceNameFilter(_activeDeviceType),
+					 DEFAULT_DISCOVER_TIMEOUT
+					 );
 #else
 	QString discoveryMethod("ssdp");
 	deviceList = discover();
@@ -712,48 +1311,73 @@ QJsonObject LedDevicePhilipsHueBridge::discover(const QJsonObject& /*params*/)
 	devicesDiscovered.insert("discoveryMethod", discoveryMethod);
 	devicesDiscovered.insert("devices", deviceList);
 
-	Debug(_log, "devicesDiscovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	Debug(_log, "devicesDiscovered: [%s]", QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact).constData() );
 
 	return devicesDiscovered;
 }
 
 QJsonObject LedDevicePhilipsHueBridge::getProperties(const QJsonObject& params)
 {
-	DebugIf(verbose, _log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
+	DebugIf(verbose, _log, "params: [%s]", QJsonDocument(params).toJson(QJsonDocument::Compact).constData());
 	QJsonObject properties;
 
 	_hostName = params[CONFIG_HOST].toString("");
 	_apiPort =  params[CONFIG_PORT].toInt();
-	_authToken = params["user"].toString("");
+	_authToken = params[CONFIG_USERNAME].toString("");
 
 	Info(_log, "Get properties for %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(_hostName) );
 
-	if (NetUtils::resolveHostToAddress(_log, _hostName, _address, _apiPort))
+	if (NetUtils::resolveHostToAddress(_log, _hostName, _address))
 	{
-		if ( openRestAPI() )
+		QJsonDocument bridgeDetails = retrieveBridgeDetails();
+		if ( !bridgeDetails.isEmpty() )
 		{
-			QString filter = params["filter"].toString("");
-			_restApi->setPath(filter);
+			setBridgeDetails(bridgeDetails);
 
-			// Perform request
-			httpResponse response = _restApi->get();
-			if (response.error())
+			if ( openRestAPI() )
 			{
-				Warning(_log, "%s get properties failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+				_useApiV2 = _isAPIv2Ready;
+				if (_authToken == API_RESOURCE_CONFIG)
+				{
+					properties.insert("properties", bridgeDetails.object());
+					properties.insert("isEntertainmentReady",_isHueEntertainmentReady);
+					properties.insert("isAPIv2Ready",_isAPIv2Ready);
+				}
+				else
+				{
+					if (_useApiV2)
+					{
+						configureSsl();
+					}
+
+					if (!isInError() )
+					{
+						setBaseApiEnvironment(_useApiV2);
+
+						QString filter = params["filter"].toString("");
+						_restApi->setPath(filter);
+
+						// Perform request
+						httpResponse response = _restApi->get();
+						if (response.error())
+						{
+							Warning(_log, "%s get properties failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+						}
+						properties.insert("properties", response.getBody().object());
+						properties.insert("isEntertainmentReady",_isHueEntertainmentReady);
+						properties.insert("isAPIv2Ready",_isAPIv2Ready);
+					}
+				}
 			}
-
-			// Perform request
-			properties.insert("properties", response.getBody().object());
 		}
-
-		DebugIf(verbose, _log, "properties: [%s]", QString(QJsonDocument(properties).toJson(QJsonDocument::Compact)).toUtf8().constData());
+		DebugIf(verbose, _log, "properties: [%s]", QJsonDocument(properties).toJson(QJsonDocument::Compact).constData());
 	}
 	return properties;
 }
 
 QJsonObject LedDevicePhilipsHueBridge::addAuthorization(const QJsonObject& params)
 {
-	Debug(_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
+	Debug(_log, "params: [%s]", QJsonDocument(params).toJson(QJsonDocument::Compact).constData());
 	QJsonObject responseBody;
 
 	// New Phillips-Bridge device client/application key
@@ -762,23 +1386,39 @@ QJsonObject LedDevicePhilipsHueBridge::addAuthorization(const QJsonObject& param
 
 	Info(_log, "Add authorized user for %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(_hostName) );
 
-	if (NetUtils::resolveHostToAddress(_log, _hostName, _address, _apiPort))
+	if (NetUtils::resolveHostToAddress(_log, _hostName, _address))
 	{
-		if ( openRestAPI() )
+		QJsonDocument bridgeDetails = retrieveBridgeDetails();
+		if ( !bridgeDetails.isEmpty() )
 		{
-			QJsonObject clientKeyCmd{ {"devicetype", "hyperion#" + QHostInfo::localHostName()}, {"generateclientkey", true } };
-			_restApi->setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-
-			httpResponse response = _restApi->post(clientKeyCmd);
-			if (response.error())
+			setBridgeDetails(bridgeDetails);
+			if ( openRestAPI() )
 			{
-				Warning(_log, "%s generation of authorization/client key failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
-			}
-			else
-			{
-				if (!checkApiError(response.getBody(),false))
+				_useApiV2 = _isAPIv2Ready;
+				if (_useApiV2)
 				{
-					responseBody = response.getBody().array().first().toObject().value("success").toObject();
+					configureSsl();
+				}
+
+				if (!isInError() )
+				{
+					setBaseApiEnvironment(_useApiV2, API_BASE_PATH_V1);
+
+					QJsonObject clientKeyCmd{ {"devicetype", "hyperion#" + QHostInfo::localHostName()}, {"generateclientkey", true } };
+					_restApi->setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+					httpResponse response = _restApi->post(clientKeyCmd);
+					if (response.error())
+					{
+						Warning(_log, "%s generation of authorization/client key failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+					}
+					else
+					{
+						if (!checkApiError(response.getBody(),false))
+						{
+							responseBody = response.getBody().array().first().toObject().value("success").toObject();
+						}
+					}
 				}
 			}
 		}
@@ -787,23 +1427,22 @@ QJsonObject LedDevicePhilipsHueBridge::addAuthorization(const QJsonObject& param
 }
 
 const std::set<QString> PhilipsHueLight::GAMUT_A_MODEL_IDS =
-	{ "LLC001", "LLC005", "LLC006", "LLC007", "LLC010", "LLC011", "LLC012", "LLC013", "LLC014", "LST001" };
+{ "LLC001", "LLC005", "LLC006", "LLC007", "LLC010", "LLC011", "LLC012", "LLC013", "LLC014", "LST001" };
 const std::set<QString> PhilipsHueLight::GAMUT_B_MODEL_IDS =
-	{ "LCT001", "LCT002", "LCT003", "LCT007", "LLM001" };
+{ "LCT001", "LCT002", "LCT003", "LCT007", "LLM001" };
 const std::set<QString> PhilipsHueLight::GAMUT_C_MODEL_IDS =
-	{ "LCA001", "LCA002", "LCA003", "LCG002", "LCP001", "LCP002", "LCT010", "LCT011", "LCT012", "LCT014", "LCT015", "LCT016", "LCT024", "LCX001", "LCX002", "LLC020", "LST002" };
+{ "LCA001", "LCA002", "LCA003", "LCG002", "LCP001", "LCP002", "LCT010", "LCT011", "LCT012", "LCT014", "LCT015", "LCT016", "LCT024", "LCX001", "LCX002", "LLC020", "LST002" };
 
-PhilipsHueLight::PhilipsHueLight(Logger* log, int id, QJsonObject values, int ledidx, int onBlackTimeToPowerOff,
-	int onBlackTimeToPowerOn)
+PhilipsHueLight::PhilipsHueLight(Logger* log, bool useApiV2, const QString& id, const QJsonObject& lightAttributes, int onBlackTimeToPowerOff,
+								 int onBlackTimeToPowerOn)
 	: _log(log)
+	, _useApiV2(useApiV2)
 	, _id(id)
-	, _ledidx(ledidx)
 	, _on(false)
 	, _transitionTime(0)
 	, _color({ 0.0, 0.0, 0.0 })
 	, _hasColor(false)
 	, _colorBlack({ 0.0, 0.0, 0.0 })
-	, _modelId(values[API_MODEID].toString().trimmed().replace("\"", ""))
 	, _lastSendColorTime(0)
 	, _lastBlackTime(-1)
 	, _lastWhiteTime(-1)
@@ -811,26 +1450,59 @@ PhilipsHueLight::PhilipsHueLight(Logger* log, int id, QJsonObject values, int le
 	, _onBlackTimeToPowerOff(onBlackTimeToPowerOff)
 	, _onBlackTimeToPowerOn(onBlackTimeToPowerOn)
 {
-	// Find id in the sets and set the appropriate color space.
-	if (GAMUT_A_MODEL_IDS.find(_modelId) != GAMUT_A_MODEL_IDS.end())
+	if ( _useApiV2 )
+	{
+		QJsonObject lightOwner = lightAttributes[API_OWNER].toObject();
+		_deviceId = lightOwner[API_RID].toString();
+		_gamutType = lightAttributes[API_COLOR].toObject()["gamut_type"].toString();
+	}
+	else
+	{
+		_name = lightAttributes[DEV_DATA_NAME].toString().trimmed().replace("\"", "");
+		_model = lightAttributes[DEV_DATA_MODEL_V1].toString();
+		_product = lightAttributes[DEV_DATA_PRODUCT_V1].toString();
+
+		// Find id in the sets and set the appropriate color space.
+		if (GAMUT_A_MODEL_IDS.find(_model) != GAMUT_A_MODEL_IDS.end())
+		{
+			_gamutType = "A";
+		}
+		else if (GAMUT_B_MODEL_IDS.find(_model) != GAMUT_B_MODEL_IDS.end())
+		{
+			_gamutType = "B";
+		}
+		else if (GAMUT_C_MODEL_IDS.find(_model) != GAMUT_C_MODEL_IDS.end())
+		{
+			_gamutType = "C";
+		}
+		else
+		{
+			_gamutType = "";
+		}
+	}
+
+	if (_gamutType.isEmpty())
+	{
+		Warning(_log, "Light \"%s\" [%s], did not recognize model [%s]", QSTRING_CSTR(_name), QSTRING_CSTR(id), QSTRING_CSTR(_model));
+	}
+
+	// Set the appropriate color space.
+	if (_gamutType == "A")
 	{
-		Debug(_log, "Recognized model id %s of light ID %d as gamut A", QSTRING_CSTR(_modelId), id );
 		_colorSpace.red		= {0.704, 0.296};
 		_colorSpace.green	= {0.2151, 0.7106};
 		_colorSpace.blue	= {0.138, 0.08};
 		_colorBlack 		= {0.138, 0.08, 0.0};
 	}
-	else if (GAMUT_B_MODEL_IDS.find(_modelId) != GAMUT_B_MODEL_IDS.end())
+	else if (_gamutType == "B")
 	{
-		Debug(_log, "Recognized model id %s of light ID %d as gamut B", QSTRING_CSTR(_modelId), id );
 		_colorSpace.red 	= {0.675, 0.322};
 		_colorSpace.green	= {0.409, 0.518};
 		_colorSpace.blue 	= {0.167, 0.04};
 		_colorBlack 		= {0.167, 0.04, 0.0};
 	}
-	else if (GAMUT_C_MODEL_IDS.find(_modelId) != GAMUT_C_MODEL_IDS.end())
+	else if (_gamutType == "C")
 	{
-		Debug(_log, "Recognized model id %s of light ID %d as gamut C", QSTRING_CSTR(_modelId), id );
 		_colorSpace.red		= {0.6915, 0.3083};
 		_colorSpace.green	= {0.17, 0.7};
 		_colorSpace.blue 	= {0.1532, 0.0475};
@@ -838,15 +1510,38 @@ PhilipsHueLight::PhilipsHueLight(Logger* log, int id, QJsonObject values, int le
 	}
 	else
 	{
-		Warning(_log, "Did not recognize model id %s of light ID %d", QSTRING_CSTR(_modelId), id );
 		_colorSpace.red 	= {1.0, 0.0};
 		_colorSpace.green 	= {0.0, 1.0};
 		_colorSpace.blue 	= {0.0, 0.0};
 		_colorBlack 		= {0.0, 0.0, 0.0};
 	}
+}
 
-	_lightname = values["name"].toString().trimmed().replace("\"", "");
-	Info(_log, "Light ID %d (\"%s\", LED index \"%d\", onBlackTimeToPowerOff: %d, _onBlackTimeToPowerOn: %d) created", id, QSTRING_CSTR(_lightname), ledidx, _onBlackTimeToPowerOff, _onBlackTimeToPowerOn);
+void PhilipsHueLight::setDeviceDetails(const QJsonObject& details)
+{
+	if (!details.isEmpty())
+	{
+		QJsonObject metaData = details[DEV_DATA_METADATA].toObject();
+		_name = metaData[DEV_DATA_NAME].toString();
+		_archeType = metaData[DEV_DATA_ARCHETYPE].toString();
+
+		QJsonObject productData = details[DEV_DATA_PRODUCTDATA].toObject();
+		_product = productData[DEV_DATA_PRODUCT].toString();
+		_model = productData[DEV_DATA_MODEL].toString();
+	}
+}
+
+void PhilipsHueLight::setEntertainmentSrvDetails(const QJsonObject& details)
+{
+	if (!details.isEmpty())
+	{
+		QJsonObject segmentData = details["segments"].toObject();
+		_maxSegments = segmentData["max_segments"].toInt(1);
+	}
+	else
+	{
+		_maxSegments = 1;
+	}
 }
 
 void PhilipsHueLight::blackScreenTriggered()
@@ -864,12 +1559,12 @@ bool PhilipsHueLight::isBusy()
 		_lastSendColorTime = _currentTime;
 		temp = false;
 	}
-
 	return temp;
 }
 
 void PhilipsHueLight::setBlack()
 {
+	Debug(_log,"");
 	CiColor black;
 	black.bri = 0;
 	black.x = 0;
@@ -913,59 +1608,103 @@ bool PhilipsHueLight::isWhite(bool isWhite)
 	return _currentTime - _lastWhiteTime >= _onBlackTimeToPowerOn;
 }
 
-int PhilipsHueLight::getId() const
+QString PhilipsHueLight::getId() const
 {
 	return _id;
 }
 
-QString PhilipsHueLight::getOriginalState() const
+QString PhilipsHueLight::getdeviceId() const
+{
+	return _deviceId;
+}
+
+QString PhilipsHueLight::getProduct() const
+{
+	return _product;
+}
+
+QString PhilipsHueLight::getModel() const
+{
+	return _model;
+}
+
+QString PhilipsHueLight::getName() const
+{
+	return _name;
+}
+
+QString PhilipsHueLight::getArcheType() const
+{
+	return _archeType;
+}
+
+int PhilipsHueLight::getMaxSegments() const
+{
+	return _maxSegments;
+}
+
+QJsonObject PhilipsHueLight::getOriginalState() const
 {
 	return _originalState;
 }
 
 void PhilipsHueLight::saveOriginalState(const QJsonObject& values)
 {
-	if (_blackScreenTriggered)
+	Debug(_log,"Light: %s, id: %s", QSTRING_CSTR(_name), QSTRING_CSTR(_id));
+	if ( _useApiV2 )
 	{
-		_blackScreenTriggered = false;
-		return;
-	}
-	// Get state object values which are subject to change.
-	if (!values[API_STATE].toObject().contains("on"))
-	{
-		Error(_log, "Got invalid state object from light ID %d", _id );
-	}
-	QJsonObject lState = values[API_STATE].toObject();
-	_originalStateJSON = lState;
+		_originalState[API_STATE_ON] = values[API_STATE_ON];
 
-	QJsonObject state;
-	state["on"] = lState["on"];
-	_originalColor = CiColor();
-	_originalColor.bri = 0;
-	_originalColor.x = 0;
-	_originalColor.y = 0;
-	QString c;
-	if (state[API_STATE_ON].toBool())
-	{
-		state[API_XY_COORDINATES] = lState[API_XY_COORDINATES];
-		state[API_BRIGHTNESS] = lState[API_BRIGHTNESS];
-		_on = true;
-		_color = {
-			state[API_XY_COORDINATES].toArray()[0].toDouble(),
-			state[API_XY_COORDINATES].toArray()[1].toDouble(),
-			state[API_BRIGHTNESS].toDouble() / 254.0
-		};
-		_originalColor = _color;
-		c = QString("{ \"%1\": [%2, %3], \"%4\": %5 }").arg(API_XY_COORDINATES).arg(_originalColor.x, 0, 'd', 4).arg(_originalColor.y, 0, 'd', 4).arg(API_BRIGHTNESS).arg((_originalColor.bri * 254.0), 0, 'd', 4);
-		Debug(_log, "Philips original state stored: %s", QSTRING_CSTR(c));
-		_transitionTime = values[API_STATE].toObject()[API_TRANSITIONTIME].toInt();
+		QJsonValue color = values[API_COLOR];
+		_originalState.insert(API_COLOR, QJsonObject {{API_XY_COORDINATES, color[API_XY_COORDINATES] }});
+
+		_originalState[API_GRADIENT] = values[API_GRADIENT];
+	}
+	else
+	{
+		if (_blackScreenTriggered)
+		{
+			_blackScreenTriggered = false;
+			return;
+		}
+		// Get state object values which are subject to change.
+		if (!values[API_STATE].toObject().contains("on"))
+		{
+			Error(_log, "Got invalid state object from light ID %s", QSTRING_CSTR(_id) );
+		}
+		QJsonObject lState = values[API_STATE].toObject();
+		_originalStateJSON = lState;
+
+		QJsonObject state;
+		state["on"] = lState["on"];
+		_originalColor = CiColor();
+		_originalColor.bri = 0;
+		_originalColor.x = 0;
+		_originalColor.y = 0;
+		QString c;
+		if (state[API_STATE_ON].toBool())
+		{
+			state[API_XY_COORDINATES] = lState[API_XY_COORDINATES];
+			state[API_BRIGHTNESS] = lState[API_BRIGHTNESS];
+			_on = true;
+			_color = {
+				state[API_XY_COORDINATES].toArray()[0].toDouble(),
+				state[API_XY_COORDINATES].toArray()[1].toDouble(),
+				state[API_BRIGHTNESS].toDouble() / 254.0
+			};
+			_originalColor = _color;
+			c = QString("{ \"%1\": [%2, %3], \"%4\": %5 }").arg(API_XY_COORDINATES).arg(_originalColor.x, 0, 'd', 4).arg(_originalColor.y, 0, 'd', 4).arg(API_BRIGHTNESS).arg((_originalColor.bri * 254.0), 0, 'd', 4);
+			Debug(_log, "Philips original state stored: %s", QSTRING_CSTR(c));
+			_transitionTime = values[API_STATE].toObject()[API_TRANSITIONTIME].toInt();
+		}
+		//Determine the original state.
+		_originalState = state;
 	}
-	//Determine the original state.
-	_originalState = QJsonDocument(state).toJson(QJsonDocument::JsonFormat::Compact).trimmed();
 }
 
 void PhilipsHueLight::setOnOffState(bool on)
 {
+	Debug(_log,"Light: %s, id: %s -> %s", QSTRING_CSTR(_name), QSTRING_CSTR(_id), on  ? "On" : "Off");
 	this->_on = on;
 }
 
@@ -1011,17 +1750,11 @@ LedDevicePhilipsHue::LedDevicePhilipsHue(const QJsonObject& deviceConfig)
 	, _transitionTime(1)
 	, _isInitLeds(false)
 	, _lightsCount(0)
-	, _groupId(0)
 	, _blackLightsTimeout(15000)
 	, _blackLevel(0.0)
 	, _onBlackTimeToPowerOff(100)
 	, _onBlackTimeToPowerOn(100)
 	, _candyGamma(true)
-	, _handshake_timeout_min(600)
-	, _handshake_timeout_max(2000)
-	, _stopConnection(false)
-	, _lastConfirm(0)
-	, _lastId(-1)
 	, _groupStreamState(false)
 {
 }
@@ -1045,12 +1778,12 @@ bool LedDevicePhilipsHue::init(const QJsonObject &deviceConfig)
 	}
 
 	// Initialise LedDevice configuration and execution environment
-	_useHueEntertainmentAPI = deviceConfig[CONFIG_USE_HUE_ENTERTAINMENT_API].toBool(false);
+	_useEntertainmentAPI = deviceConfig[CONFIG_USE_HUE_ENTERTAINMENT_API].toBool(false);
 
 	// Overwrite non supported/required features
 	if ( deviceConfig["rewriteTime"].toInt(0) > 0 )
 	{
-		InfoIf ( ( !_useHueEntertainmentAPI ), _log, "Device Philips Hue does not require rewrites. Refresh time is ignored." );
+		InfoIf ( ( !_useEntertainmentAPI ), _log, "Device Philips Hue does not require rewrites. Refresh time is ignored." );
 		_devConfig["rewriteTime"] = 0;
 	}
 
@@ -1059,7 +1792,7 @@ bool LedDevicePhilipsHue::init(const QJsonObject &deviceConfig)
 	_brightnessFactor       = _devConfig[CONFIG_BRIGHTNESSFACTOR].toDouble(1.0);
 	_transitionTime         = _devConfig[CONFIG_TRANSITIONTIME].toInt(1);
 	_isRestoreOrigState     = _devConfig[CONFIG_RESTORE_STATE].toBool(true);
-	_groupId                = _devConfig[CONFIG_GROUPID].toInt(0);
+	_groupId                = _devConfig[CONFIG_groupId].toString();
 	_blackLevel             = _devConfig["blackLevel"].toDouble(0.0);
 	_onBlackTimeToPowerOff  = _devConfig["onBlackTimeToPowerOff"].toInt(100);
 	_onBlackTimeToPowerOn   = _devConfig["onBlackTimeToPowerOn"].toInt(100);
@@ -1070,24 +1803,24 @@ bool LedDevicePhilipsHue::init(const QJsonObject &deviceConfig)
 
 	if (LedDevicePhilipsHueBridge::init(_devConfig))
 	{
-		log( "Off on Black", "%d", static_cast<int>( _switchOffOnBlack ) );
+		log( "Off on Black", "%s", _switchOffOnBlack ? "Yes" : "No" );
 		log( "Brightness Factor", "%f", _brightnessFactor );
 		log( "Transition Time", "%d", _transitionTime );
-		log( "Restore Original State", "%d", static_cast<int>( _isRestoreOrigState ) );
-		log( "Use Hue Entertainment API", "%d", static_cast<int>( _useHueEntertainmentAPI) );
+		log( "Restore Original State", "%s", _isRestoreOrigState ? "Yes" : "No" );
+		log( "Use Hue Entertainment API", "%s", _useEntertainmentAPI ? "Yes" : "No" );
 		log("Brightness Threshold", "%f", _blackLevel);
-		log("CandyGamma", "%d", static_cast<int>(_candyGamma));
-		log("Time powering off when black", "%d", _onBlackTimeToPowerOff);
-		log("Time powering on when signalled", "%d", _onBlackTimeToPowerOn);
+		log("CandyGamma", "%s", _candyGamma ? "Yes" : "No" );
+		log("Time powering off when black", "%s", _onBlackTimeToPowerOff ? "Yes" : "No" );
+		log("Time powering on when signalled", "%s", _onBlackTimeToPowerOn ? "Yes" : "No" );
 
-		if( _useHueEntertainmentAPI )
+		if( _useEntertainmentAPI )
 		{
-			log( "Entertainment API Group-ID", "%d", _groupId );
+			log( "Entertainment API Group-ID", "%s", QSTRING_CSTR(_groupId) );
 
-			if( _groupId == 0 )
+			if( _groupId.isEmpty() )
 			{
-				Error(_log, "Disabling usage of HueEntertainmentAPI: Group-ID [%d] is invalid", _groupId);
-				_useHueEntertainmentAPI = false;
+				Error(_log, "Disabling usage of Entertainment API - Group-ID is invalid [%s]", QSTRING_CSTR(_groupId) );
+				_useEntertainmentAPI = false;
 			}
 		}
 
@@ -1105,49 +1838,25 @@ bool LedDevicePhilipsHue::setLights()
 
 	_lightIds.clear();
 
-	QJsonArray lArray;
+	QStringList lights;
 
-	if( _useHueEntertainmentAPI && _groupId > 0 )
+	if( _useEntertainmentAPI && !_groupId.isEmpty() )
 	{
-		lArray = getGroupLights( _groupId );
+		lights = getGroupLights( _groupId );
 	}
 
-	if( lArray.empty() )
+	if( lights.empty() )
 	{
-		if( _useHueEntertainmentAPI )
+		if( _useEntertainmentAPI )
 		{
-			_useHueEntertainmentAPI = false;
-			Error(_log, "Group-ID [%u] is not usable - Entertainment API usage was disabled!", _groupId );
+			_useEntertainmentAPI = false;
+			Error(_log, "Group-ID [%s] is not usable - Entertainment API usage was disabled!", QSTRING_CSTR(_groupId)  );
 		}
-		lArray = _devConfig[ CONFIG_LIGHTIDS ].toArray();
+		lights = _devConfig[ CONFIG_lightIdS ].toVariant().toStringList();
 	}
 
-	QString lightIDStr;
-
-	if( !lArray.empty() )
-	{
-		for (const QJsonValue &id : std::as_const(lArray))
-		{
-			int lightId = id.toString().toInt();
-			if( lightId > 0 )
-			{
-				if(std::find(_lightIds.begin(), _lightIds.end(), lightId) == _lightIds.end())
-				{
-					_lightIds.emplace_back(lightId);
-					if(!lightIDStr.isEmpty())
-					{
-						lightIDStr.append(", ");
-					}
-					lightIDStr.append(QString::number(lightId));
-				}
-			}
-		}
-		std::sort( _lightIds.begin(), _lightIds.end() );
-	}
-
-	int configuredLightsCount = static_cast<int>(_lightIds.size());
-
-	log( "Light-IDs configured", "%d", configuredLightsCount );
+	_lightIds = lights;
+	int configuredLightsCount = _lightIds.size();
 
 	if ( configuredLightsCount == 0 )
 	{
@@ -1156,10 +1865,33 @@ bool LedDevicePhilipsHue::setLights()
 	}
 	else
 	{
-		log( "Light-IDs", "%s", QSTRING_CSTR( lightIDStr ) );
-		isInitOK = updateLights( getLightMap() );
-	}
+		Debug(_log, "Lights configured: %d", configuredLightsCount );
+		if (updateLights( getLightMap()))
+		{
+			if (_useApiV2)
+			{
+				_channelsCount = getGroupChannelsCount (_groupId);
 
+				Debug(_log, "Channels configured: %d", _channelsCount );
+				int ledsCount = getLedCount();
+				if ( ledsCount == _channelsCount)
+				{
+					isInitOK = true;
+				}
+				else
+				{
+					QString errorText = QString("Number of hardware LEDs configured [%1] do not match the Entertainment lights' channel number [%2]."\
+												" Please update your configuration.").arg(ledsCount).arg(_channelsCount );
+					setInError(errorText, false);
+					isInitOK = false;
+				}
+			}
+		}
+		else
+		{
+			isInitOK = false;
+		}
+	}
 	return isInitOK;
 }
 
@@ -1171,14 +1903,14 @@ bool LedDevicePhilipsHue::initLeds()
 	{
 		if( setLights() )
 		{
-			if( _useHueEntertainmentAPI )
+			if( _useEntertainmentAPI )
 			{
 				_groupName = getGroupName( _groupId );
 			}
 			else
 			{
 				// adapt latchTime to count of user lightIds (bridge 10Hz max overall)
-				setLatchTime( static_cast<int>( 100 * getLightsCount() ) );
+				setLatchTime( 100 * getLightsCount() );
 				isInitOK = true;
 			}
 			_isInitLeds = true;
@@ -1188,36 +1920,33 @@ bool LedDevicePhilipsHue::initLeds()
 			isInitOK = false;
 		}
 	}
-
 	return isInitOK;
 }
 
-bool LedDevicePhilipsHue::updateLights(const QMap<int, QJsonObject> &map)
+bool LedDevicePhilipsHue::updateLights(const QMap<QString, QJsonObject> &map)
 {
 	bool isInitOK = true;
 
-	// search user lightid inside map and create light if found
+	// search user lightId inside map and create light if found
 	_lights.clear();
 
 	if(!_lightIds.empty())
 	{
-		int ledidx = 0;
-		_lights.reserve(_lightIds.size());
-		for(const auto id : _lightIds)
+		_lights.reserve(static_cast<size_t>(_lightIds.size()));
+		for(const auto &id : qAsConst(_lightIds))
 		{
 			if (map.contains(id))
 			{
-				_lights.emplace_back(_log, id, map.value(id), ledidx, _onBlackTimeToPowerOff, _onBlackTimeToPowerOn);
+				_lights.emplace_back(_log, _useApiV2, id, map.value(id), _onBlackTimeToPowerOff, _onBlackTimeToPowerOn);
 			}
 			else
 			{
-				Warning(_log, "Configured light-ID %d is not available at this bridge", id );
+				Warning(_log, "Configured light-ID %s is not available at this bridge", QSTRING_CSTR(id) );
 			}
-			ledidx++;
 		}
 	}
 
-	unsigned int lightsCount = static_cast<unsigned int>(_lights.size());
+	int lightsCount = static_cast<int>(_lights.size());
 
 	setLightsCount( lightsCount );
 
@@ -1226,7 +1955,26 @@ bool LedDevicePhilipsHue::updateLights(const QMap<int, QJsonObject> &map)
 		Error(_log, "No usable lights found!" );
 		isInitOK = false;
 	}
+	else
+	{
+		//Populate additional light details
+		int i {1};
+		for (PhilipsHueLight& light : _lights)
+		{
+			light.setDeviceDetails(getDeviceDetails(light.getdeviceId()));
+			light.setEntertainmentSrvDetails(getEntertainmentSrvDetails(light.getdeviceId()));
 
+			Info(_log,"Light[%d]: \"%s\" [%s], Product: %s, Model: %s, Segments [%d]",
+				 i,
+				 QSTRING_CSTR(light.getName()),
+				 QSTRING_CSTR(light.getId()),
+				 QSTRING_CSTR(light.getProduct()),
+				 QSTRING_CSTR(light.getModel()),
+				 light.getMaxSegments()
+				 );
+			++i;
+		}
+	}
 	return isInitOK;
 }
 
@@ -1243,7 +1991,7 @@ bool LedDevicePhilipsHue::openStream()
 			// if same owner stop stream
 			if(isStreamOwner(_streamOwner))
 			{
-				Debug(_log, "Group: \"%s\" [%u] is in use, try to stop stream", QSTRING_CSTR(_groupName), _groupId );
+				Debug(_log, "Group: \"%s\" [%s] is in use, try to stop stream", QSTRING_CSTR(_groupName), QSTRING_CSTR(_groupId) );
 
 				if( stopStream() )
 				{
@@ -1254,12 +2002,12 @@ bool LedDevicePhilipsHue::openStream()
 				}
 				else
 				{
-					Error(_log, "Group: \"%s\" [%u] couldn't stop by user: \"%s\" - Entertainment API not usable", QSTRING_CSTR( _groupName ), _groupId, QSTRING_CSTR( _streamOwner ) );
+					Error(_log, "Group: \"%s\" [%s] couldn't stop by user: \"%s\" - Entertainment API not usable", QSTRING_CSTR( _groupName ), QSTRING_CSTR(_groupId), QSTRING_CSTR( _streamOwner ) );
 				}
 			}
 			else
 			{
-				Error(_log, "Group: \"%s\" [%u] is in use and owned by other user: \"%s\" - Entertainment API not usable", QSTRING_CSTR(_groupName), _groupId, QSTRING_CSTR(_streamOwner));
+				Error(_log, "Group: \"%s\" [%s] is in use and owned by other user: \"%s\" - Entertainment API not usable", QSTRING_CSTR(_groupName), QSTRING_CSTR(_groupId), QSTRING_CSTR(_streamOwner));
 			}
 		}
 		else
@@ -1286,7 +2034,6 @@ bool LedDevicePhilipsHue::openStream()
 	{
 		Error(_log, "Philips Hue Entertainment API could not be initialized!");
 	}
-
 	return isInitOK;
 }
 
@@ -1296,7 +2043,7 @@ bool LedDevicePhilipsHue::startStream()
 	while (!setStreamGroupState(true) && --retries > 0)
 	{
 		Debug(_log, "Start Entertainment stream. Retrying...");
-			QThread::msleep(500);
+		QThread::msleep(500);
 	}
 
 	bool rc = (retries > 0);
@@ -1331,107 +2078,104 @@ bool LedDevicePhilipsHue::stopStream()
 	{
 		this->setInError("The Entertainment stream did NOT stop. Give up.");
 	}
-
 	return rc;
 }
 
 bool LedDevicePhilipsHue::getStreamGroupState()
 {
-	QJsonDocument doc = getGroupState( _groupId );
+	bool streamState {false};
+	QJsonDocument doc = getGroupDetails( _groupId );
+	DebugIf(verbose, _log, "GroupDetails: [%s]", QJsonDocument(doc).toJson(QJsonDocument::Compact).constData());
 
 	if ( !this->isInError() )
 	{
-		QJsonObject obj = doc.object()[ API_STREAM ].toObject();
-
-		if( obj.isEmpty() )
+		if (_useApiV2)
 		{
-			this->setInError( "No Entertainment/Streaming details in Group found" );
+			QJsonArray groups = doc.array();
+			if (groups.isEmpty())
+			{
+				this->setInError( "No Entertainment/Streaming details in Group found" );
+			}
+			else
+			{
+				QJsonObject group = groups[0].toObject();
+				QString streamStaus = group.value(API_STREAM_STATUS).toString();
+				if ( streamStaus == API_STREAM_ACTIVE)
+				{
+					streamState = true;
+				}
+				QJsonObject streamer = group.value(API_STREAM_ACTIVE_V2).toObject();
+				_streamOwner = streamer[API_RID].toString();
+			}
 		}
 		else
 		{
-			_streamOwner = obj.value( API_STREAM_OWNER ).toString();
-			bool streamState = obj.value( API_STREAM_ACTIVE ).toBool();
-			return streamState;
+			QJsonObject obj = doc.object()[ API_STREAM ].toObject();
+
+			if( obj.isEmpty() )
+			{
+				this->setInError( "No Entertainment/Streaming details in Group found" );
+			}
+			else
+			{
+				streamState = obj.value( API_STREAM_ACTIVE ).toBool();
+				_streamOwner = obj.value( API_OWNER ).toString();
+			}
 		}
 	}
-
-	return false;
+	return streamState;
 }
 
 bool LedDevicePhilipsHue::setStreamGroupState(bool state)
 {
-	QString active = state ? API_STREAM_ACTIVE_VALUE_TRUE : API_STREAM_ACTIVE_VALUE_FALSE;
-
 	QJsonDocument doc = setGroupState( _groupId, state );
+	DebugIf(verbose, _log, "StreamGroupState: [%s]", QJsonDocument(doc).toJson(QJsonDocument::Compact).constData());
 
-	QVariant rsp = doc.toVariant();
-
-	QVariantList list = rsp.toList();
-	if ( !list.isEmpty() )
+	if (_useApiV2)
 	{
-		QVariantMap map = list.first().toMap();
-
-		if ( !map.contains( API_SUCCESS ) )
+		if (doc.isEmpty())
 		{
-			Warning(_log, "%s", QSTRING_CSTR(QString("Set stream to %1: Neither error nor success contained in Bridge response...").arg(active)));
+			_groupStreamState = false;
 		}
 		else
 		{
-			//Check original Hue response {"success":{"/groups/groupID/stream/active":activeYesNo}}
-			QString valueName = QString( API_STREAM_RESPONSE_FORMAT ).arg( API_GROUPS ).arg( _groupId ).arg( API_STREAM, API_STREAM_ACTIVE );
-			if(!map.value( API_SUCCESS ).toMap().value( valueName ).isValid())
+			_groupStreamState = state;
+		}
+		return (_groupStreamState == state);
+	}
+	else
+	{
+		QJsonArray response = doc.array();
+		if (!response.isEmpty())
+		{
+			QJsonObject msg = response.first().toObject();
+			if ( !msg.contains( API_SUCCESS ) )
 			{
-				//Workaround
-				//Check diyHue response   {"success":{"/groups/groupID/stream":{"active":activeYesNo}}}
-				QString diyHueValueName = QString( "/%1/%2/%3" ).arg( API_GROUPS ).arg( _groupId ).arg( API_STREAM);
-				QJsonObject diyHueActiveState = map.value( API_SUCCESS ).toMap().value( diyHueValueName ).toJsonObject();
-
-				if( diyHueActiveState.isEmpty() )
-				{
-					this->setInError( QString("set stream to %1: Bridge response is not Valid").arg( active ) );
-				}
-				else
-				{
-					_groupStreamState = diyHueActiveState[API_STREAM_ACTIVE].toBool();
-					return (_groupStreamState == state);
-				}
+				QString active = state ? API_STREAM_ACTIVE_VALUE_TRUE : API_STREAM_ACTIVE_VALUE_FALSE;
+				Warning(_log, "%s", QSTRING_CSTR(QString("Set stream to %1: Neither error nor success contained in Bridge response...").arg(active)));
 			}
 			else
 			{
-				_groupStreamState = map.value(API_SUCCESS).toMap().value(valueName).toBool();
+				//Check original Hue response {"success":{"/groups/groupId/stream/active":activeYesNo}}
+				QJsonObject success = msg.value(API_SUCCESS).toObject();
+				QString valueName = QString( API_STREAM_RESPONSE_FORMAT ).arg( API_RESOURCE_GROUPS, _groupId, API_STREAM, API_STREAM_ACTIVE );
+				QJsonValue result = success.value(valueName);
+				if (result.isUndefined())
+				{
+					//Workaround
+					//Check diyHue response   {"success":{"/groups/groupId/stream":{"active":activeYesNo}}}
+					QString diyHueValueName = QString( "/%1/%2/%3" ).arg( API_RESOURCE_GROUPS, _groupId, API_STREAM);
+					result = success.value(diyHueValueName).toObject().value(API_STREAM_ACTIVE);
+				}
+
+				_groupStreamState = result.toBool();
 				return (_groupStreamState == state);
 			}
 		}
 	}
-
 	return false;
 }
 
-QByteArray LedDevicePhilipsHue::prepareStreamData() const
-{
-	QByteArray msg;
-	msg.reserve(static_cast<int>(sizeof(HEADER) + sizeof(PAYLOAD_PER_LIGHT) * _lights.size()));
-	msg.append(reinterpret_cast<const char*>(HEADER), sizeof(HEADER));
-
-	for (const PhilipsHueLight& light : _lights)
-	{
-		CiColor lightC = light.getColor();
-		quint64 R = lightC.x * 0xffff;
-		quint64 G = lightC.y * 0xffff;
-		quint64 B = (lightC.x || lightC.y) ? lightC.bri * 0xffff : 0;
-		unsigned int id = light.getId();
-		const uint8_t payload[] = {
-			0x00, 0x00, static_cast<uint8_t>(id),
-			static_cast<uint8_t>((R >> 8) & 0xff), static_cast<uint8_t>(R & 0xff),
-			static_cast<uint8_t>((G >> 8) & 0xff), static_cast<uint8_t>(G & 0xff),
-			static_cast<uint8_t>((B >> 8) & 0xff), static_cast<uint8_t>(B & 0xff)
-		};
-		msg.append(reinterpret_cast<const char *>(payload), sizeof(payload));
-	}
-
-	return msg;
-}
-
 void LedDevicePhilipsHue::stop()
 {
 	LedDevicePhilipsHueBridge::stop();
@@ -1459,22 +2203,26 @@ int LedDevicePhilipsHue::write(const std::vector<ColorRgb> & ledValues)
 	}
 
 	// more lights than LEDs, stop always
-	if( ledValues.size() < getLightsCount() )
+	if( static_cast<int>(ledValues.size()) < getLightsCount() )
 	{
 		Error(_log, "More light-IDs configured than LEDs, each light-ID requires one LED!" );
 		return -1;
 	}
 
+	int rc {0};
 	if (_isOn)
 	{
-		writeSingleLights( ledValues );
-
-		if (_useHueEntertainmentAPI && _isInitLeds)
+		if (!_useApiV2)
 		{
-			writeStream();
+			rc = writeSingleLights( ledValues );
+		}
+
+		if (_useEntertainmentAPI && _isInitLeds)
+		{
+			rc= writeStreamData(ledValues);
 		}
 	}
-	return 0;
+	return rc;
 }
 
 int LedDevicePhilipsHue::writeSingleLights(const std::vector<ColorRgb>& ledValues)
@@ -1494,7 +2242,7 @@ int LedDevicePhilipsHue::writeSingleLights(const std::vector<ColorRgb>& ledValue
 			xy.x = 0;
 			xy.y = 0;
 
-			if( _useHueEntertainmentAPI )
+			if( _useEntertainmentAPI )
 			{
 				if (light.getOnOffState())
 				{
@@ -1521,7 +2269,7 @@ int LedDevicePhilipsHue::writeSingleLights(const std::vector<ColorRgb>& ledValue
 					xy.bri = xy.bri / 2;
 				}
 
-				if (_useHueEntertainmentAPI)
+				if (_useEntertainmentAPI)
 				{
 					this->setOnOffState(light, true);
 					this->setColor(light, xy);
@@ -1534,7 +2282,7 @@ int LedDevicePhilipsHue::writeSingleLights(const std::vector<ColorRgb>& ledValue
 			else if (!_switchOffOnBlack)
 			{
 				// Write color if color has been changed.
-				if (_useHueEntertainmentAPI)
+				if (_useEntertainmentAPI)
 				{
 					this->setOnOffState(light, true);
 					this->setColor(light, xy);
@@ -1556,23 +2304,138 @@ int LedDevicePhilipsHue::writeSingleLights(const std::vector<ColorRgb>& ledValue
 
 		++idx;
 	}
-
 	return 0;
 }
 
-void LedDevicePhilipsHue::writeStream(bool flush)
+int LedDevicePhilipsHue::writeStreamData(const std::vector<ColorRgb>& ledValues, bool flush)
 {
-	QByteArray streamData = prepareStreamData();
-	writeBytes(static_cast<uint>(streamData.size()), reinterpret_cast<unsigned char*>(streamData.data()), flush);
+	QByteArray msg;
+
+	if (_useApiV2)
+	{
+		int ledsCount = static_cast<int>(ledValues.size());
+		if ( ledsCount != _channelsCount )
+		{
+			QString errorText = QString("Number of LEDs configured via the layout [%1] do not match the Entertainment lights' channel number [%2]."\
+										" Please update your configuration.").arg(ledsCount).arg(_channelsCount);
+			this->setInError(errorText, false);
+			return -1;
+		}
+
+		//		"HueStream", //protocol
+		//		0x02, 0x00, //version 2.0
+		//		0x07, //sequence number 7
+		//		0x00, 0x00, //reserved
+		//		0x00, //color mode RGB
+		//		0x00, //reserved
+		//		"1a8d99cc-967b-44f2-9202-43f976c0fa6b", //entertainment configuration id
+		//		0x00, //channel id 0
+		//		0xff, 0xff, 0x00, 0x00, 0x00, 0x00, //red
+		//		0x01, //channel id 1
+		//		0x00, 0x00, 0xff, 0xff, 0x00, 0x00 //green
+		//		0x02, //channel id 2
+		//		0x00, 0x00, 0x00, 0x00, 0xff, 0xff //blue
+		//		0x03, //channel id 3
+		//		0xff, 0xff, 0xff, 0xff, 0xff, 0xff //white
+		//		//etc for channel ids 4-7
+
+		msg.reserve(static_cast<int>(sizeof(HEADER_V2) + sizeof(ENTERTAINMENT_ID) + sizeof(PAYLOAD_PER_CHANNEL_V2) * _lights.size()));
+		msg.append(reinterpret_cast<const char*>(HEADER_V2), sizeof(HEADER_V2));
+		msg.append(_groupId.toLocal8Bit());
+
+		uint8_t maxChannels = static_cast<uint8_t>(ledValues.size());
+
+		ColorRgb color;
+
+		for (uint8_t channel = 0; channel < maxChannels; ++channel)
+		{
+			if (channel < 20) // v2 max 20 channels
+			{
+				color = static_cast<ColorRgb>(ledValues.at(channel));
+
+				quint16 R = static_cast<quint16>(color.red << 8);
+				quint16 G = static_cast<quint16>(color.green << 8);
+				quint16 B = static_cast<quint16>(color.blue<< 8);
+
+				msg.append(static_cast<char>(channel));
+				const uint16_t payload[] = { qToBigEndian<quint16>(R), qToBigEndian<quint16>(G), qToBigEndian<quint16>(B) };
+				msg.append(reinterpret_cast<const char *>(payload), sizeof(payload));
+			}
+		}
+	}
+	else
+	{
+		//		"HueStream", //protocol
+		//		0x01, 0x00, //version 1.0
+		//		0x07, //sequence number 7
+		//		0x00, 0x00, //reserved
+		//		0x00, //color mode RGB
+		//		0x00, //reserved
+		//		0x00, 0x00, 0x01, //light ID 1
+		//		0xff, 0xff, 0x00, 0x00, 0x00, 0x00, //red
+		//		0x00, 0x00, 0x04, //light ID 4
+		//		0x00, 0x00, 0x00, 0x00, 0xff, 0xff //blue
+
+		msg.reserve(static_cast<int>(sizeof(HEADER) + sizeof(PAYLOAD_PER_LIGHT) * _lights.size()));
+		msg.append(reinterpret_cast<const char*>(HEADER), sizeof(HEADER));
+
+		ColorRgb color;
+
+		uint8_t i = 0;
+		for (const PhilipsHueLight& light : _lights)
+		{
+			if (i < 10) // max 10 lights
+			{
+				uint8_t id = static_cast<uint8_t>(light.getId().toInt());
+
+				color = static_cast<ColorRgb>(ledValues.at(i));
+				quint16 R = static_cast<quint16>(color.red << 8);
+				quint16 G = static_cast<quint16>(color.green << 8);
+				quint16 B = static_cast<quint16>(color.blue<< 8);
+
+				msg.append(2, 0x00);
+				msg.append(static_cast<char>(id));
+				const uint16_t payload[] = {
+					qToBigEndian<quint16>(R), qToBigEndian<quint16>(G),	qToBigEndian<quint16>(B)
+				};
+				msg.append(reinterpret_cast<const char *>(payload), sizeof(payload));
+			}
+			++i;
+		}
+	}
+
+	if (verbose3) {
+		qDebug() << "Msg Hex:" << msg.toHex(':');
+	}
+
+	writeBytes(msg, flush);
+	return 0;
 }
 
 void LedDevicePhilipsHue::setOnOffState(PhilipsHueLight& light, bool on, bool force)
 {
 	if (light.getOnOffState() != on || force)
 	{
-		light.setOnOffState( on );
-		QString state = on ? API_STATE_VALUE_TRUE : API_STATE_VALUE_FALSE;
-		setLightState( light.getId(), QString("{\"%1\": %2 }").arg( API_STATE_ON, state ) );
+		Debug(_log,"id: %s, on: %d", QSTRING_CSTR(light.getId()), on);
+		QStringList resourcePath;
+		QJsonObject cmd;
+
+		if (_useApiV2)
+		{
+			resourcePath << API_RESOURCE_LIGHT << light.getId();
+			cmd.insert(API_STATE_ON, QJsonObject {{API_STATE_ON, on }});
+		}
+		else
+		{
+			resourcePath << API_RESOURCE_LIGHTS << light.getId() << API_STATE;
+			cmd.insert(API_STATE_ON, on);
+		}
+		put(resourcePath, cmd);
+
+		if (!isInError())
+		{
+			light.setOnOffState( on );
+		}
 	}
 }
 
@@ -1580,8 +2443,25 @@ void LedDevicePhilipsHue::setTransitionTime(PhilipsHueLight& light)
 {
 	if (light.getTransitionTime() != _transitionTime)
 	{
-		light.setTransitionTime( _transitionTime );
-		setLightState( light.getId(), QString("{\"%1\": %2 }").arg( API_TRANSITIONTIME ).arg( _transitionTime ) );
+		QStringList resourcePath;
+		QJsonObject cmd;
+
+		if (_useApiV2)
+		{
+			resourcePath << API_RESOURCE_LIGHT << light.getId();
+			cmd.insert(API_DYNAMICS, QJsonObject {{API_DURATION, _transitionTime }});
+		}
+		else
+		{
+			resourcePath << API_RESOURCE_LIGHTS << light.getId() << API_STATE;
+			cmd.insert(API_TRANSITIONTIME, _transitionTime);
+		}
+		put(resourcePath, cmd);
+
+		if (!isInError())
+		{
+			light.setTransitionTime( _transitionTime );
+		}
 	}
 }
 
@@ -1589,81 +2469,135 @@ void LedDevicePhilipsHue::setColor(PhilipsHueLight& light, CiColor& color)
 {
 	if (!light.hasColor() || light.getColor() != color)
 	{
-		if( !_useHueEntertainmentAPI )
+		if( !_useEntertainmentAPI )
 		{
-			const int bri = qRound(qMin(254.0, _brightnessFactor * qMax(1.0, color.bri * 254.0)));
-			QString stateCmd = QString("{\"%1\":[%2,%3],\"%4\":%5}").arg( API_XY_COORDINATES ).arg( color.x, 0, 'd', 4 ).arg( color.y, 0, 'd', 4 ).arg( API_BRIGHTNESS ).arg( bri );
-			setLightState( light.getId(), stateCmd );
+			QStringList resourcePath;
+			QJsonObject cmd;
+
+			if (!light.hasColor() || light.getColor() != color)
+			{
+				if (_useApiV2)
+				{
+					resourcePath << API_RESOURCE_LIGHT << light.getId();
+
+					// Brightness is 0-100 %, Brightness percentage. value cannot be 0, writing 0 changes it to lowest possible brightness
+					const double bri = qMin(_brightnessFactor *  color.bri * 100, 100.0);
+
+					QJsonObject colorXY;
+					colorXY[API_X_COORDINATE] = color.x;
+					colorXY[API_Y_COORDINATE] = color.y;
+					cmd.insert(API_COLOR, QJsonObject {{API_DURATION, colorXY }});
+					cmd.insert(API_DIMMING, QJsonObject {{API_BRIGHTNESS, bri }});
+				}
+				else
+				{
+					resourcePath << API_RESOURCE_LIGHTS << light.getId() << API_STATE;
+
+					const int bri = qRound(qMin(254.0, _brightnessFactor * qMax(1.0, color.bri * 254.0)));
+					QJsonArray colorXY;
+					colorXY.append(color.x);
+					colorXY.append(color.y);
+					cmd.insert(API_XY_COORDINATES, colorXY);
+					cmd.insert(API_BRIGHTNESS, bri);
+				}
+			}
+			put(resourcePath, cmd);
 		}
 		else
 		{
-			color.bri = (qMin((double)1.0, _brightnessFactor * qMax((double)0, color.bri)));
+			color.bri = (qMin(1.0, _brightnessFactor * qMax(0.0, color.bri)));
+		}
+
+		if (!isInError())
+		{
+			light.setColor( color );
 		}
-		light.setColor( color );
 	}
 }
 
 void LedDevicePhilipsHue::setState(PhilipsHueLight& light, bool on, const CiColor& color)
 {
-	QString stateCmd;
-	QString powerCmd;
-	bool priority = false;
+	QStringList resourcePath;
+	QJsonObject cmd;
+	bool forceCmd {false};
 
-	if ( light.getOnOffState() != on )
+	if (light.getOnOffState() != on)
 	{
-		light.setOnOffState( on );
-		QString state = on ? API_STATE_VALUE_TRUE : API_STATE_VALUE_FALSE;
-		powerCmd = QString("\"%1\":%2").arg(API_STATE_ON, state);
-		priority = true;
-	}
-
-	if ( light.getTransitionTime() != _transitionTime )
-	{
-		light.setTransitionTime( _transitionTime );
-		stateCmd += QString("\"%1\":%2,").arg( API_TRANSITIONTIME ).arg( _transitionTime );
-	}
-
-	const int bri = qRound( qMin( 254.0, _brightnessFactor * qMax( 1.0, color.bri * 254.0 ) ) );
-	if (!light.hasColor() || light.getColor() != color)
-	{
-		if (!light.isBusy() || priority)
+		forceCmd = true;
+		if (_useApiV2)
 		{
+			cmd.insert(API_STATE_ON, QJsonObject {{API_STATE_ON, on }});
+		}
+		else
+		{
+			cmd.insert(API_STATE_ON, on);
+		}
+	}
+
+	if (!_useEntertainmentAPI && light.getOnOffState())
+	{
+		if (light.getTransitionTime() != _transitionTime)
+		{
+			if (_useApiV2)
+			{
+				cmd.insert(API_DYNAMICS, QJsonObject {{API_DURATION, _transitionTime }});
+			}
+			else
+			{
+				cmd.insert(API_TRANSITIONTIME, _transitionTime);
+			}
+		}
+
+		if (!light.hasColor() || light.getColor() != color)
+		{
+			if (!light.isBusy() || forceCmd)
+			{
+				if (_useApiV2)
+				{
+					// Brightness is 0-100 %, Brightness percentage. value cannot be 0, writing 0 changes it to lowest possible brightness
+					const double bri = qMin(_brightnessFactor *  color.bri * 100, 100.0);
+
+					QJsonObject colorXY;
+					colorXY[API_X_COORDINATE] = color.x;
+					colorXY[API_Y_COORDINATE] = color.y;
+					cmd.insert(API_COLOR, QJsonObject {{API_DURATION, colorXY }});
+					cmd.insert(API_DIMMING, QJsonObject {{API_BRIGHTNESS, bri }});
+				}
+				else
+				{
+					const int bri = qRound(qMin(254.0, _brightnessFactor * qMax(1.0, color.bri * 254.0)));
+					QJsonArray colorXY;
+					colorXY.append(color.x);
+					colorXY.append(color.y);
+					cmd.insert(API_XY_COORDINATES, colorXY);
+					cmd.insert(API_BRIGHTNESS, bri);
+				}
+			}
+		}
+	}
+
+	if (!cmd.isEmpty())
+	{
+		if (_useApiV2)
+		{
+			resourcePath << API_RESOURCE_LIGHT << light.getId();
+		}
+		else
+		{
+			resourcePath << API_RESOURCE_LIGHTS << light.getId() << API_STATE;
+		}
+		put(resourcePath, cmd);
+
+		if (!isInError())
+		{
+			light.setTransitionTime( _transitionTime );
 			light.setColor( color );
-			stateCmd += QString("\"%1\":[%2,%3],\"%4\":%5,").arg(API_XY_COORDINATES).arg(color.x, 0, 'd', 4).arg(color.y, 0, 'd', 4).arg(API_BRIGHTNESS).arg(bri);
-		}
-
-	}
-
-	if (!stateCmd.isEmpty() || !powerCmd.isEmpty())
-	{
-		if ( !stateCmd.isEmpty() )
-		{
-			stateCmd = QString("\"%1\":%2").arg(API_STATE_ON, "true") + "," + stateCmd;
-			stateCmd = stateCmd.left(stateCmd.length() - 1);
-		}
-
-		qint64 _currentTime = QDateTime::currentMSecsSinceEpoch();
-
-		if ((_currentTime - _lastConfirm > 1500 && ((int)light.getId()) != _lastId) ||
-			 (_currentTime - _lastConfirm > 3000))
-		{
-			_lastId = light.getId();
-			_lastConfirm = _currentTime;
-		}
-
-		if (!stateCmd.isEmpty())
-		{
-			setLightState( light.getId(), "{" + stateCmd + "}" );
-		}
-		if (!powerCmd.isEmpty() && !on)
-		{
-			QThread::msleep(50);
-			setLightState(light.getId(), "{" + powerCmd + "}");
+			light.setOnOffState( on );
 		}
 	}
 }
 
-void LedDevicePhilipsHue::setLightsCount( unsigned int lightsCount )
+void LedDevicePhilipsHue::setLightsCount(int lightsCount)
 {
 	_lightsCount = lightsCount;
 }
@@ -1685,19 +2619,25 @@ bool LedDevicePhilipsHue::switchOn()
 			Info(_log, "Switching device %s ON", QSTRING_CSTR(_activeDeviceType));
 			if ( storeState() )
 			{
-				if (_useHueEntertainmentAPI)
+				if (_useEntertainmentAPI)
 				{
 					if (openStream())
 					{
 						if (startConnection())
 						{
-							if ( powerOn() )
+							if ( (!_useApiV2 || _isDiyHue) ) //DiyHue does not auto switch on, if stream starts
 							{
-								_isOn = true;
-								setRewriteTime(STREAM_REWRITE_TIME.count());
+								powerOn();
 							}
+
+							_isOn = true;
+							setRewriteTime(STREAM_REWRITE_TIME.count());
 						}
 					}
+					else
+					{
+						// TODO: Failed to OpenStream - should retry
+					}
 				}
 				else
 				{
@@ -1737,27 +2677,27 @@ bool LedDevicePhilipsHue::switchOff()
 		{
 			if ( _isDeviceReady )
 			{
-				if (_useHueEntertainmentAPI && _groupStreamState)
+				if (_useEntertainmentAPI && _groupStreamState)
 				{
 					Info(_log, "Switching device %s OFF", QSTRING_CSTR(_activeDeviceType));
-					_isOn = false;
+
 					setRewriteTime(0);
 
 					if ( _isRestoreOrigState )
 					{
+						_isOn = false;
 						stopStream();
 						rc = restoreState();
 					}
 					else
 					{
-						for (PhilipsHueLight& light : _lights)
-						{
-							light.setBlack();
-						}
-						writeStream(true);
+						_isOn = false;
+						rc = stopStream();
 
-						stopStream();
-						rc = powerOff();
+						if ( (!_useApiV2 || _isDiyHue) ) //DiyHue does not auto switch off, if stream stopps
+						{
+							rc = powerOff();
+						}
 					}
 
 					if (rc)
@@ -1773,6 +2713,7 @@ bool LedDevicePhilipsHue::switchOff()
 				}
 				else
 				{
+					Debug(_log,"LedDevicePhilipsHueBridge::switchOff()");
 					rc = LedDevicePhilipsHueBridge::switchOff();
 				}
 			}
@@ -1820,7 +2761,7 @@ bool LedDevicePhilipsHue::storeState()
 		{
 			for ( PhilipsHueLight& light : _lights )
 			{
-				QJsonObject values = getLightState(light.getId()).object();
+				QJsonObject values = getLightDetails(light.getId());
 				light.saveOriginalState(values);
 			}
 		}
@@ -1847,35 +2788,68 @@ bool LedDevicePhilipsHue::restoreState()
 
 void LedDevicePhilipsHue::identify(const QJsonObject& params)
 {
-	DebugIf(verbose, _log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
+	DebugIf(verbose, _log, "params: [%s]", QJsonDocument(params).toJson(QJsonDocument::Compact).constData());
 	QJsonObject properties;
 
 	_hostName = params[CONFIG_HOST].toString("");
 	_apiPort =  params[CONFIG_PORT].toInt();
-	_authToken = params["user"].toString("");
+	_authToken = params[CONFIG_USERNAME].toString("");
 
-	Info(_log, "Identify %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(_hostName) );
+	QString lighName = params["lightName"].toString();
 
-	if (NetUtils::resolveHostToAddress(_log, _hostName, _address, _apiPort))
+	Info(_log, "Identify %s, Light: \"%s\" @hostname (%s)", QSTRING_CSTR(_activeDeviceType),  QSTRING_CSTR(lighName), QSTRING_CSTR(_hostName) );
+
+	if (NetUtils::resolveHostToAddress(_log, _hostName, _address))
 	{
-		if ( openRestAPI() )
+		QJsonDocument bridgeDetails = retrieveBridgeDetails();
+		if ( !bridgeDetails.isEmpty() )
 		{
-				int lightId = params["lightId"].toInt(0);
+			setBridgeDetails(bridgeDetails);
+			if ( openRestAPI() )
+			{
+				_useApiV2 = _isAPIv2Ready;
 
-				QString resource = QString("%1/%2/%3").arg(API_LIGHTS).arg(lightId).arg(API_STATE);
-				_restApi->setPath(resource);
-
-				QString stateCmd;
-				stateCmd += QString("\"%1\":%2,").arg(API_STATE_ON, API_STATE_VALUE_TRUE);
-				stateCmd += QString("\"%1\":\"%2\"").arg("alert", "select");
-				stateCmd = "{" + stateCmd + "}";
-
-				// Perform request
-				httpResponse response = _restApi->put(stateCmd);
-				if (response.error())
+				// DIYHue does not provide v2 Breathe effects, yet -> fall back to v1
+				if (_isDiyHue)
 				{
-					Warning(_log, "%s identification failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+					_useApiV2 = false;
 				}
+
+				if (_useApiV2)
+				{
+					configureSsl();
+				}
+
+				if (!isInError() )
+				{
+					setBaseApiEnvironment(_useApiV2);
+
+					QStringList resourcepath;
+					QJsonObject cmd;
+					if (_useApiV2)
+					{
+						QString lightId = params[API_LIGTH_ID].toString();
+						resourcepath << API_RESOURCE_LIGHT << lightId;
+						cmd.insert(API_ALERT, QJsonObject {{API_ACTION, API_ACTION_BREATHE}});
+					}
+					else
+					{
+						bool on {true};
+						QString lightId = params[API_LIGTH_ID_v1].toString();
+						resourcepath << lightId << API_STATE;
+						cmd.insert(API_STATE_ON, on);
+						cmd.insert(API_ALERT, API_SELECT);
+					}
+					_restApi->setPath(resourcepath);
+
+					// Perform request
+					httpResponse response = _restApi->put(cmd);
+					if (response.error())
+					{
+						Warning(_log, "%s identification failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+					}
+				}
+			}
 		}
 	}
 }
diff --git a/libsrc/leddevice/dev_net/LedDevicePhilipsHue.h b/libsrc/leddevice/dev_net/LedDevicePhilipsHue.h
index 633ecc3e..4d2293d7 100644
--- a/libsrc/leddevice/dev_net/LedDevicePhilipsHue.h
+++ b/libsrc/leddevice/dev_net/LedDevicePhilipsHue.h
@@ -16,31 +16,6 @@
 #include "ProviderRestApi.h"
 #include "ProviderUdpSSL.h"
 
-//Streaming message header and payload definition
-const uint8_t HEADER[] =
-	{
-		'H', 'u', 'e', 'S', 't', 'r', 'e', 'a', 'm', //protocol
-		0x01, 0x00, //version 1.0
-		0x01, //sequence number 1
-		0x00, 0x00, //Reserved write 0’s
-		0x01, //xy Brightness
-		0x00, // Reserved, write 0’s
-};
-
-const uint8_t PAYLOAD_PER_LIGHT[] =
-	{
-		0x01, 0x00, 0x06, //light ID
-		//color: 16 bpc
-		0xff, 0xff,
-		0xff, 0xff,
-		0xff, 0xff,
-		/*
-	(message.R >> 8) & 0xff, message.R & 0xff,
-	(message.G >> 8) & 0xff, message.G & 0xff,
-	(message.B >> 8) & 0xff, message.B & 0xff
-	*/
-};
-
 /**
  * A XY color point in the color space of the hue system without brightness.
  */
@@ -145,12 +120,18 @@ public:
 	/// Constructs the light.
 	///
 	/// @param log the logger
-	/// @param bridge the bridge
+	/// @param useApiV2 make use of Hue API version 2
 	/// @param id the light id
+	/// @param lightAttributes the light's attributes as provied by the Hue Bridge
+	/// @param onBlackTimeToPowerOff Timeframe of Black output that triggers powering off the light
+	/// @param onBlackTimeToPowerOn Timeframe of non Black output that triggers powering on the light
 	///
-	PhilipsHueLight(Logger* log, int id, QJsonObject values, int ledidx,
-		int onBlackTimeToPowerOff,
-		int onBlackTimeToPowerOn);
+	PhilipsHueLight(Logger* log, bool useApiV2, const QString& id, const QJsonObject& lightAttributes,
+					int onBlackTimeToPowerOff,
+					int onBlackTimeToPowerOn);
+
+	void setDeviceDetails(const QJsonObject& details);
+	void setEntertainmentSrvDetails(const QJsonObject& details);
 
 	///
 	/// @param on
@@ -167,7 +148,14 @@ public:
 	///
 	void setColor(const CiColor& color);
 
-	int getId() const;
+	QString getId() const;
+	QString getdeviceId() const;
+	QString getProduct() const;
+	QString getModel() const;
+	QString getName() const;
+	QString getArcheType() const;
+
+	int getMaxSegments() const;
 
 	bool getOnOffState() const;
 	int getTransitionTime() const;
@@ -179,7 +167,7 @@ public:
 	CiColorTriangle getColorSpace() const;
 
 	void saveOriginalState(const QJsonObject& values);
-	QString getOriginalState() const;
+	QJsonObject getOriginalState() const;
 
 	bool isBusy();
 	bool isBlack(bool isBlack);
@@ -189,24 +177,30 @@ public:
 private:
 
 	Logger* _log;
-	/// light id
-	int _id;
-	int _ledidx;
+	bool _useApiV2;
+
+	QString _id;
+	QString _deviceId;
+	QString _product;
+	QString _model;
+	QString _name;
+	QString _archeType;
+	QString _gamutType;
+
+	int _maxSegments;
+
 	bool _on;
 	int _transitionTime;
 	CiColor _color;
 	bool    _hasColor;
 	/// darkes blue color in hue lamp GAMUT = black
 	CiColor _colorBlack;
-	/// The model id of the hue lamp which is used to determine the color space.
-	QString _modelId;
-	QString _lightname;
 	CiColorTriangle _colorSpace;
 
 	/// The json string of the original state.
 	QJsonObject _originalStateJSON;
 
-	QString _originalState;
+	QJsonObject _originalState;
 	CiColor _originalColor;
 	qint64 _lastSendColorTime;
 	qint64 _lastBlackTime;
@@ -242,23 +236,40 @@ public:
 	QJsonDocument get(const QString& route);
 
 	///
-	/// @brief Perform a REST-API POST
+	/// @brief Perform a REST-API GET
 	///
-	/// @param route the route of the POST request.
-	/// @param content the content of the POST request.
+	/// @param routeElements the route's elements of the GET request.
 	///
-	QJsonDocument put(const QString& route, const QString& content, bool supressError = false);
+	/// @return the content of the GET request.
+	///
+	QJsonDocument get(const QStringList& routeElements);
 
-	QJsonDocument getLightState( int lightId);
-	void setLightState( int lightId = 0, const QString &state = "");
+	///
+	/// @brief Perform a REST-API PUT
+	///
+	/// @param routeElements the route's elements of the PUT request.
+	/// @param content the content of the PUT request.
+	/// @param supressError Treat an error as a warning
+	///
+	/// @return the content of the PUT request.
+	///
+	QJsonDocument put(const QStringList& routeElements, const QJsonObject& content, bool supressError = false);
 
-	QMap<int,QJsonObject> getLightMap() const;
+	QJsonDocument retrieveBridgeDetails();
+	QJsonObject getDeviceDetails(const QString& deviceId);
+	QJsonObject getEntertainmentSrvDetails(const QString& deviceId);
 
-	QMap<int,QJsonObject> getGroupMap() const;
+	QJsonObject getLightDetails(const QString& lightId);
+	QJsonDocument setLightState(const QString& lightId, const QJsonObject& state);
 
-	QString getGroupName(int groupId = 0) const;
+	QMap<QString,QJsonObject> getDevicesMap() const;
+	QMap<QString,QJsonObject> getLightMap() const;
+	QMap<QString,QJsonObject> getGroupMap() const;
+	QMap<QString,QJsonObject> getEntertainmentMap() const;
 
-	QJsonArray getGroupLights(int groupId = 0) const;
+	QString getGroupName(const QString& groupId) const;
+	QStringList getGroupLights(const QString& groupId) const;
+	int getGroupChannelsCount(const QString& groupId) const;
 
 protected:
 
@@ -289,7 +300,7 @@ protected:
 	///
 	/// @param[in] response from Hue-Bridge in JSON-format
 	/// @param[in] suppressError Treat an error as a warning
-	/// 
+	///
 	/// return True, Hue Bridge reports error
 	///
 	bool checkApiError(const QJsonDocument& response, bool supressError = false);
@@ -338,23 +349,41 @@ protected:
 	///
 	QJsonObject addAuthorization(const QJsonObject& params) override;
 
+	bool isApiEntertainmentReady(const QString& apiVersion);
+	bool isAPIv2Ready (int swVersion);
+
+	int getFirmwareVerion() { return _deviceFirmwareVersion; }
+	void setBridgeDetails( const QJsonDocument &doc, bool isLogging = false );
+
+	void setBaseApiEnvironment(bool apiV2 = true, const QString& path = "");
+
+	QJsonDocument getGroupDetails( const QString& groupId );
+	QJsonDocument setGroupState( const QString& groupId, bool state);
+
+	bool isStreamOwner(const QString &streamOwner) const;
+
+	bool initDevicesMap();
+	bool initLightsMap();
+	bool initGroupsMap();
+	bool initEntertainmentSrvsMap();
+
+	void log(const char* msg, const char* type, ...) const;
+
+	bool configureSsl();
+	const int * getCiphersuites() const override;
+
 	///REST-API wrapper
 	ProviderRestApi* _restApi;
 	int _apiPort;
 	/// User name for the API ("newdeveloper")
 	QString _authToken;
+	QString _applicationID;
 
-	bool _useHueEntertainmentAPI;
+	bool _useEntertainmentAPI;
+	bool _useApiV2;
+	bool _isAPIv2Ready;
 
-	QJsonDocument getGroupState( int groupId );
-	QJsonDocument setGroupState( int groupId, bool state);
-
-	bool isStreamOwner(const QString &streamOwner) const;
-	bool initMaps();
-
-	void log(const char* msg, const char* type, ...) const;
-
-	const int * getCiphersuites() const override;
+	bool _isDiyHue;
 
 private:
 
@@ -364,16 +393,25 @@ private:
 	///
 	/// @return A JSON structure holding a list of devices found
 	///
-	QJsonArray discover();
+	QJsonArray discoverSsdp();
 
-	QJsonDocument getAllBridgeInfos();
-	void setBridgeConfig( const QJsonDocument &doc );
+	QJsonDocument retrieveDeviceDetails(const QString& deviceId = "");
+	QJsonDocument retrieveLightDetails(const QString& lightId = "");
+	QJsonDocument retrieveGroupDetails(const QString& groupId = "");
+	QJsonDocument retrieveEntertainmentSrvDetails(const QString& deviceId = "");
+
+	bool retrieveApplicationId();
+
+	void setDevicesMap( const QJsonDocument &doc );
 	void setLightsMap( const QJsonDocument &doc );
 	void setGroupMap( const QJsonDocument &doc );
+	void setEntertainmentSrvMap( const QJsonDocument &doc );
 
 	//Philips Hue Bridge details
+	QString _deviceName;
+	QString _deviceBridgeId;
 	QString _deviceModel;
-	QString _deviceFirmwareVersion;
+	int _deviceFirmwareVersion;
 	QString _deviceAPIVersion;
 
 	uint _api_major;
@@ -382,8 +420,12 @@ private:
 
 	bool _isHueEntertainmentReady;
 
-	QMap<int,QJsonObject> _lightsMap;
-	QMap<int,QJsonObject> _groupsMap;
+	QMap<QString,QJsonObject> _devicesMap;
+	QMap<QString,QJsonObject> _lightsMap;
+	QMap<QString,QJsonObject> _groupsMap;
+	QMap<QString,QJsonObject> _entertainmentMap;
+
+	int _lightsCount;
 };
 
 /**
@@ -440,7 +482,7 @@ public:
 	///
 	/// @return Number of device's LEDs
 	///
-	unsigned int getLightsCount() const { return _lightsCount; }
+	int getLightsCount() const { return _lightsCount; }
 
 	void setOnOffState(PhilipsHueLight& light, bool on, bool force = false);
 	void setTransitionTime(PhilipsHueLight& light);
@@ -547,18 +589,18 @@ private:
 
 	bool setLights();
 
-	/// creates new PhilipsHueLight(s) based on user lightid with bridge feedback
+	/// creates new PhilipsHueLight(s) based on user lightId with bridge feedback
 	///
-	/// @param map Map of lightid/value pairs of bridge
+	/// @param map Map of lightId/value pairs of bridge
 	///
-	bool updateLights(const QMap<int, QJsonObject> &map);
+	bool updateLights(const QMap<QString, QJsonObject> &map);
 
 	///
 	/// @brief Set the number of LEDs supported by the device.
 	///
 	/// @rparam[in] Number of device's LEDs
 	//
-	void setLightsCount( unsigned int lightsCount);
+	void setLightsCount(int lightsCount);
 
 	bool openStream();
 	bool getStreamGroupState();
@@ -566,10 +608,8 @@ private:
 	bool startStream();
 	bool stopStream();
 
-	void writeStream(bool flush = false);
 	int writeSingleLights(const std::vector<ColorRgb>& ledValues);
-
-	QByteArray prepareStreamData() const;
+	int writeStreamData(const std::vector<ColorRgb>& ledValues, bool flush = false);
 
 	///
 	bool _switchOffOnBlack;
@@ -582,12 +622,15 @@ private:
 	bool _isInitLeds;
 
 	/// Array of the light ids.
-	std::vector<int> _lightIds;
+	QStringList _lightIds;
 	/// Array to save the lamps.
 	std::vector<PhilipsHueLight> _lights;
 
 	int _lightsCount;
-	int _groupId;
+	int _channelsCount;
+	QString _groupId;
+	QString _groupName;
+	QString _streamOwner;
 
 	int _blackLightsTimeout;
 	double _blackLevel;
@@ -595,15 +638,5 @@ private:
 	int	_onBlackTimeToPowerOn;
 	bool _candyGamma;
 
-	// TODO: Check what is the correct class
-	uint32_t _handshake_timeout_min;
-	uint32_t _handshake_timeout_max;
-	bool _stopConnection;
-
-	QString _groupName;
-	QString _streamOwner;
-
-	qint64 _lastConfirm;
-	int	_lastId;
 	bool _groupStreamState;
 };
diff --git a/libsrc/leddevice/dev_net/ProviderRestApi.cpp b/libsrc/leddevice/dev_net/ProviderRestApi.cpp
index d2732f8e..359a4ea5 100644
--- a/libsrc/leddevice/dev_net/ProviderRestApi.cpp
+++ b/libsrc/leddevice/dev_net/ProviderRestApi.cpp
@@ -2,11 +2,18 @@
 #include "ProviderRestApi.h"
 
 // Qt includes
+#include <QObject>
 #include <QEventLoop>
 #include <QNetworkReply>
 #include <QByteArray>
 #include <QJsonObject>
 
+#include <QList>
+#include <QHash>
+#include <QFile>
+
+#include <QSslSocket>
+
 //std includes
 #include <iostream>
 #include <chrono>
@@ -30,12 +37,12 @@ ProviderRestApi::ProviderRestApi(const QString& scheme, const QString& host, int
 	: _log(Logger::getInstance("LEDDEVICE"))
 	, _networkManager(nullptr)
 	, _requestTimeout(DEFAULT_REST_TIMEOUT)
+	,_isSeflSignedCertificateAccpeted(false)
 {
 	_networkManager = new QNetworkAccessManager();
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
 	_networkManager->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
 #endif
-
 	_apiUrl.setScheme(scheme);
 	_apiUrl.setHost(host);
 	_apiUrl.setPort(port);
@@ -46,7 +53,7 @@ ProviderRestApi::ProviderRestApi(const QString& scheme, const QString& host, int
 	: ProviderRestApi(scheme, host, port, "") {}
 
 ProviderRestApi::ProviderRestApi(const QString& host, int port, const QString& basePath)
-: ProviderRestApi("http", host, port, basePath) {}
+	: ProviderRestApi((port == 443) ? "https" : "http", host, port, basePath) {}
 
 ProviderRestApi::ProviderRestApi(const QString& host, int port)
 	: ProviderRestApi(host, port, "") {}
@@ -59,18 +66,33 @@ ProviderRestApi::~ProviderRestApi()
 	delete _networkManager;
 }
 
+void ProviderRestApi::setScheme(const QString& scheme)
+{
+	_apiUrl.setScheme(scheme);
+}
+
 void ProviderRestApi::setUrl(const QUrl& url)
 {
 	_apiUrl = url;
 	_basePath = url.path();
 }
 
+void ProviderRestApi::setBasePath(const QStringList& pathElements)
+{
+	setBasePath(pathElements.join(ONE_SLASH));
+}
+
 void ProviderRestApi::setBasePath(const QString& basePath)
 {
 	_basePath.clear();
 	appendPath(_basePath, basePath);
 }
 
+void ProviderRestApi::clearBasePath()
+{
+	_basePath.clear();
+}
+
 void ProviderRestApi::setPath(const QStringList& pathElements)
 {
 	_path.clear();
@@ -83,6 +105,11 @@ void ProviderRestApi::setPath(const QString& path)
 	appendPath(_path, path);
 }
 
+void ProviderRestApi::clearPath()
+{
+	_path.clear();
+}
+
 void ProviderRestApi::appendPath(const QString& path)
 {
 	appendPath(_path, path);
@@ -204,6 +231,7 @@ httpResponse ProviderRestApi::executeOperation(QNetworkAccessManager::Operation
 	QDateTime start = QDateTime::currentDateTime();
 	QString opCode;
 	QNetworkReply* reply;
+
 	switch (operation) {
 	case QNetworkAccessManager::GetOperation:
 		opCode = "GET";
@@ -255,11 +283,11 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply)
 	HttpStatusCode httpStatusCode = static_cast<HttpStatusCode>(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
 	response.setHttpStatusCode(httpStatusCode);
 	response.setNetworkReplyError(reply->error());
+	response.setHeaders(reply->rawHeaderPairs());
 
 	if (reply->error() == QNetworkReply::NoError)
 	{
 		QByteArray replyData = reply->readAll();
-
 		if (!replyData.isEmpty())
 		{
 			QJsonParseError error;
@@ -284,40 +312,41 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply)
 	else
 	{
 		QString errorReason;
-		if (httpStatusCode > 0) {
-			QString httpReason = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
-			QString advise;
-			switch ( httpStatusCode ) {
-			case HttpStatusCode::BadRequest:
-				advise = "Check Request Body";
-				break;
-			case HttpStatusCode::UnAuthorized:
-				advise = "Check Authentication Token (API Key)";
-				break;
-			case HttpStatusCode::Forbidden:
-				advise = "No permission to access the given resource";
-				break;
-			case HttpStatusCode::NotFound:
-				advise = "Check Resource given";
-				break;
-			default:
-				advise = httpReason;
-				break;
-			}
-			errorReason = QString ("[%3 %4] - %5").arg(httpStatusCode).arg(httpReason, advise);
+		if (reply->error() == QNetworkReply::OperationCanceledError)
+		{
+			errorReason = "Network request timeout error";
 		}
 		else
 		{
-			if (reply->error() == QNetworkReply::OperationCanceledError)
-			{
-				errorReason = "Network request timeout error";
+			qDebug() << "httpStatusCode: "<< httpStatusCode;
+			if (httpStatusCode > 0) {
+				QString httpReason = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
+				QString advise;
+				switch ( httpStatusCode ) {
+				case HttpStatusCode::BadRequest:
+					advise = "Check Request Body";
+					break;
+				case HttpStatusCode::UnAuthorized:
+					advise = "Check Authentication Token (API Key)";
+					break;
+				case HttpStatusCode::Forbidden:
+					advise = "No permission to access the given resource";
+					break;
+				case HttpStatusCode::NotFound:
+					advise = "Check Resource given";
+					break;
+				default:
+					advise = httpReason;
+					break;
+				}
+				errorReason = QString ("[%3 %4] - %5").arg(httpStatusCode).arg(httpReason, advise);
 			}
 			else
 			{
 				errorReason = reply->errorString();
 			}
-
 		}
+
 		response.setError(true);
 		response.setErrorReason(errorReason);
 	}
@@ -344,3 +373,121 @@ void ProviderRestApi::setHeader(const QByteArray &headerName, const QByteArray &
 {
 	_networkRequestHeaders.setRawHeader(headerName, headerValue);
 }
+
+void httpResponse::setHeaders(const QList<QNetworkReply::RawHeaderPair>& pairs)
+{
+	_responseHeaders.clear();
+	for (const auto &item: pairs)
+	{
+		_responseHeaders[item.first] = item.second;
+	}
+}
+
+QByteArray httpResponse::getHeader(const QByteArray header) const
+{
+	return _responseHeaders.value(header);
+}
+
+bool ProviderRestApi::setCaCertificate(const QString& caFileName)
+{
+	bool rc {false};
+	/// Add our own CA to the default SSL configuration
+	QSslConfiguration configuration = QSslConfiguration::defaultConfiguration();
+
+	QFile caFile (caFileName);
+	if (!caFile.open(QIODevice::ReadOnly))
+	{
+		Error(_log,"Unable to open CA-Certificate file: %s", QSTRING_CSTR(caFileName));
+		return false;
+	}
+
+	QSslCertificate cert (&caFile);
+	caFile.close();
+
+	QList<QSslCertificate> allowedCAs;
+	allowedCAs << cert;
+	configuration.setCaCertificates(allowedCAs);
+
+	QSslConfiguration::setDefaultConfiguration(configuration);
+
+#ifndef QT_NO_SSL
+	if (QSslSocket::supportsSsl())
+	{
+		QObject::connect( _networkManager, &QNetworkAccessManager::sslErrors, this, &ProviderRestApi::onSslErrors, Qt::UniqueConnection );
+		_networkManager->connectToHostEncrypted(_apiUrl.host(), _apiUrl.port(), configuration);
+		rc = true;
+	}
+#endif
+
+	return rc;
+}
+
+void ProviderRestApi::acceptSelfSignedCertificates(bool isAccepted)
+{
+	_isSeflSignedCertificateAccpeted = isAccepted;
+}
+
+void ProviderRestApi::setAlternateServerIdentity(const QString& serverIdentity)
+{
+	_serverIdentity = serverIdentity;
+}
+
+QString ProviderRestApi::getAlternateServerIdentity() const
+{
+	return _serverIdentity;
+}
+
+bool ProviderRestApi::checkServerIdentity(const QSslConfiguration& sslConfig) const
+{
+	bool isServerIdentified {false};
+
+	// Perform common name validation
+	QSslCertificate serverCertificate = sslConfig.peerCertificate();
+	QStringList commonName = serverCertificate.subjectInfo(QSslCertificate::CommonName);
+	if ( commonName.contains(getAlternateServerIdentity(), Qt::CaseInsensitive) )
+	{
+		isServerIdentified = true;
+	}
+
+	return isServerIdentified;
+}
+
+void ProviderRestApi::onSslErrors(QNetworkReply* reply, const QList<QSslError>& errors)
+{
+	int ignoredErrorCount {0};
+	for (const QSslError &error : errors)
+	{
+		bool ignoreSslError{false};
+
+		switch (error.error()) {
+		case QSslError::HostNameMismatch :
+			if (checkServerIdentity(reply->sslConfiguration()) )
+			{
+				ignoreSslError = true;
+			}
+			break;
+		case QSslError::SelfSignedCertificate :
+			if (_isSeflSignedCertificateAccpeted)
+			{
+				ignoreSslError = true;
+			}
+			break;
+		default:
+			break;
+		}
+
+		if (ignoreSslError)
+		{
+			++ignoredErrorCount;
+		}
+		else
+		{
+			Debug (_log,"SSL Error occured: [%d] %s ",error.error(), QSTRING_CSTR(error.errorString()));
+		}
+	}
+
+	if (ignoredErrorCount == errors.size())
+	{
+		reply->ignoreSslErrors();
+	}
+}
diff --git a/libsrc/leddevice/dev_net/ProviderRestApi.h b/libsrc/leddevice/dev_net/ProviderRestApi.h
index 8d8e0a83..b93d13ea 100644
--- a/libsrc/leddevice/dev_net/ProviderRestApi.h
+++ b/libsrc/leddevice/dev_net/ProviderRestApi.h
@@ -10,12 +10,13 @@
 #include <QUrlQuery>
 #include <QJsonDocument>
 
+#include <QFile>
 #include <QBasicTimer>
 #include <QTimerEvent>
 
 #include <chrono>
 
-constexpr std::chrono::milliseconds DEFAULT_REST_TIMEOUT{ 1000 };
+constexpr std::chrono::milliseconds DEFAULT_REST_TIMEOUT{ 2000 };
 
 //Set QNetworkReply timeout without external timer
 //https://stackoverflow.com/questions/37444539/how-to-set-qnetworkreply-timeout-without-external-timer
@@ -28,7 +29,7 @@ public:
 	enum HandleMethod { Abort, Close };
 
 	ReplyTimeout(QNetworkReply* reply, const int timeout, HandleMethod method = Abort) :
-		  QObject(reply), m_method(method), m_timedout(false)
+		QObject(reply), m_method(method), m_timedout(false)
 	{
 		Q_ASSERT(reply);
 		if (reply && reply->isRunning()) {
@@ -87,6 +88,10 @@ public:
 	QJsonDocument getBody() const { return _responseBody; }
 	void setBody(const QJsonDocument& body) { _responseBody = body; }
 
+
+	QByteArray getHeader(const QByteArray header) const;
+	void setHeaders(const QList<QNetworkReply::RawHeaderPair>& pairs);
+
 	QString getErrorReason() const { return _errorReason; }
 	void setErrorReason(const QString& errorReason) { _errorReason = errorReason; }
 
@@ -99,6 +104,8 @@ public:
 private:
 
 	QJsonDocument _responseBody {};
+	QHash<QByteArray, QByteArray> _responseHeaders;
+
 	bool _hasError = false;
 	QString _errorReason;
 
@@ -131,6 +138,7 @@ class ProviderRestApi : public QObject
 
 public:
 
+	///
 	/// @brief Constructor of the REST-API wrapper
 	///
 	ProviderRestApi();
@@ -176,6 +184,20 @@ public:
 	///
 	virtual ~ProviderRestApi() override;
 
+	///
+	/// @brief Set the API's scheme
+	///
+	/// @param[in] scheme
+	///
+	void setScheme(const QString& scheme);
+
+	///
+	/// @brief Get the API's scheme
+	///
+	/// return schme
+	///
+	QString getScheme() { return _apiUrl.scheme(); }
+
 	///
 	/// @brief Set an API's host
 	///
@@ -190,6 +212,13 @@ public:
 	///
 	void setPort(const int port) { _apiUrl.setPort(port); }
 
+	///
+	/// @brief Get the API's port
+	///
+	/// return port
+	///
+	int getPort() { return _apiUrl.port(); }
+
 	///
 	/// @brief Set an API's url
 	///
@@ -204,6 +233,13 @@ public:
 	///
 	QUrl getUrl() const;
 
+	///
+	/// @brief Set an API's base path (the stable path element before addressing resources)
+	///
+	/// @param[in] pathElements to form a path, e.g. (clip,v2,resource) results in "/clip/v2/resource"
+	///
+	void setBasePath(const QStringList& pathElements);
+
 	///
 	/// @brief Set an API's base path (the stable path element before addressing resources)
 	///
@@ -211,6 +247,11 @@ public:
 	///
 	void setBasePath(const QString& basePath);
 
+	///
+	/// @brief Clear an API's base path (the stable path element before addressing resources)
+	///
+	void clearBasePath();
+
 	///
 	/// @brief Set an API's path to address resources
 	///
@@ -218,12 +259,18 @@ public:
 	///
 	void setPath(const QString& path);
 
+	///
 	/// @brief Set an API's path to address resources
 	///
 	/// @param[in] pathElements to form a path, e.g. (lights,1,state) results in "/lights/1/state/"
 	///
 	void setPath(const QStringList& pathElements);
 
+	///
+	/// @brief Clear an API's path
+	///
+	void clearPath();
+
 	///
 	/// @brief Append an API's path element to path set before
 	///
@@ -252,6 +299,10 @@ public:
 	///
 	void setQuery(const QUrlQuery& query);
 
+
+	QString getBasePath() {return _basePath;}
+	QString getPath() {return _path;}
+
 	///
 	/// @brief Execute GET request
 	///
@@ -359,6 +410,14 @@ public:
 	/// @param[in] timeout in milliseconds.
 	void setTransferTimeout(std::chrono::milliseconds timeout = DEFAULT_REST_TIMEOUT) { _requestTimeout = timeout; }
 
+
+	bool setCaCertificate(const QString& caFileName);
+
+	void acceptSelfSignedCertificates(bool accept);
+
+	void setAlternateServerIdentity(const QString& serverIdentity);
+	QString getAlternateServerIdentity() const;
+
 	///
 	/// @brief Set the common logger for LED-devices.
 	///
@@ -366,6 +425,10 @@ public:
 	///
 	void setLogger(Logger* log) { _log = log; }
 
+protected slots:
+	/// Handle the SSLErrors
+	void onSslErrors(QNetworkReply* reply, const QList<QSslError>& errors);
+
 private:
 
 	///
@@ -379,9 +442,11 @@ private:
 
 	httpResponse executeOperation(QNetworkAccessManager::Operation op, const QUrl& url, const QByteArray& body = {});
 
+	bool checkServerIdentity(const QSslConfiguration& sslConfig) const;
+
 	Logger* _log;
 
-	// QNetworkAccessManager object for sending REST-requests.
+	/// QNetworkAccessManager object for sending REST-requests.
 	QNetworkAccessManager* _networkManager;
 	std::chrono::milliseconds _requestTimeout;
 
@@ -394,6 +459,9 @@ private:
 	QUrlQuery _query;
 
 	QNetworkRequest _networkRequestHeaders;
+
+	QString _serverIdentity;
+	bool _isSeflSignedCertificateAccpeted;
 };
 
 #endif // PROVIDERRESTKAPI_H
diff --git a/libsrc/leddevice/dev_net/ProviderUdpSSL.cpp b/libsrc/leddevice/dev_net/ProviderUdpSSL.cpp
index d71af932..03cd2b69 100644
--- a/libsrc/leddevice/dev_net/ProviderUdpSSL.cpp
+++ b/libsrc/leddevice/dev_net/ProviderUdpSSL.cpp
@@ -150,6 +150,11 @@ const int *ProviderUdpSSL::getCiphersuites() const
 	return mbedtls_ssl_list_ciphersuites();
 }
 
+void ProviderUdpSSL::setPSKidentity(const QString& pskIdentity)
+{
+	_psk_identity = pskIdentity;
+}
+
 bool ProviderUdpSSL::initNetwork()
 {
 	if ((!_isDeviceReady || _streamPaused) && _streamReady)
@@ -334,6 +339,11 @@ void ProviderUdpSSL::freeSSLConnection()
 	}
 }
 
+void ProviderUdpSSL::writeBytes(QByteArray data, bool flush)
+{
+	writeBytes(static_cast<uint>(data.size()), reinterpret_cast<unsigned char*>(data.data()), flush);
+}
+
 void ProviderUdpSSL::writeBytes(unsigned int size, const uint8_t* data, bool flush)
 {
 	if (!_streamReady || _streamPaused)
diff --git a/libsrc/leddevice/dev_net/ProviderUdpSSL.h b/libsrc/leddevice/dev_net/ProviderUdpSSL.h
index d9558514..57b7f06b 100644
--- a/libsrc/leddevice/dev_net/ProviderUdpSSL.h
+++ b/libsrc/leddevice/dev_net/ProviderUdpSSL.h
@@ -100,6 +100,14 @@ protected:
 	///
 	void stopConnection();
 
+	///
+	/// Writes the given bytes/bits to the UDP-device and sleeps the latch time to ensure that the
+	/// values are latched.
+	///
+	/// @param[in] data The data
+	///
+	void writeBytes(QByteArray data, bool flush = false);
+
 	///
 	/// Writes the given bytes/bits to the UDP-device and sleeps the latch time to ensure that the
 	/// values are latched.
@@ -116,6 +124,8 @@ protected:
 	///
 	virtual const int * getCiphersuites() const;
 
+	void setPSKidentity(const QString& pskIdentity);
+
 private:
 
 	bool initConnection();
diff --git a/libsrc/leddevice/schemas/schema-philipshue.json b/libsrc/leddevice/schemas/schema-philipshue.json
index 209c9b9f..30c9b3a5 100644
--- a/libsrc/leddevice/schemas/schema-philipshue.json
+++ b/libsrc/leddevice/schemas/schema-philipshue.json
@@ -35,26 +35,45 @@
       },
       "propertyOrder": 4
     },
+    "useAPIv2": {
+      "type": "boolean",
+      "format": "checkbox",
+      "title": "edt_dev_spec_useAPIv2_title",
+      "default": false,
+      "options": {
+        "hidden": true
+      },
+      "access": "expert",
+      "propertyOrder": 5
+    },
     "useEntertainmentAPI": {
       "type": "boolean",
       "format": "checkbox",
       "title": "edt_dev_spec_useEntertainmentAPI_title",
       "default": true,
-      "propertyOrder": 5
+      "options": {
+        "hidden": true
+      },
+      "propertyOrder": 6
     },
     "switchOffOnBlack": {
       "type": "boolean",
       "format": "checkbox",
       "title": "edt_dev_spec_switchOffOnBlack_title",
       "default": false,
-      "propertyOrder": 6
+      "options": {
+        "dependencies": {
+          "useAPIv2": false
+        }
+      },
+      "propertyOrder": 7
     },
     "restoreOriginalState": {
       "type": "boolean",
       "format": "checkbox",
       "title": "edt_dev_spec_restoreOriginalState_title",
       "default": false,
-      "propertyOrder": 7
+      "propertyOrder": 8
     },
     "blackLevel": {
       "type": "number",
@@ -64,7 +83,12 @@
       "step": 0.01,
       "minimum": 0.001,
       "maximum": 1.0,
-      "propertyOrder": 8
+      "options": {
+        "dependencies": {
+          "useAPIv2": false
+        }
+      },
+      "propertyOrder": 9
     },
     "onBlackTimeToPowerOff": {
       "type": "integer",
@@ -76,7 +100,12 @@
       "maximum": 100000,
       "default": 600,
       "required": true,
-      "propertyOrder": 9
+      "options": {
+        "dependencies": {
+          "useAPIv2": false
+        }
+      },
+      "propertyOrder": 10
     },
     "onBlackTimeToPowerOn": {
       "type": "integer",
@@ -88,14 +117,24 @@
       "maximum": 100000,
       "default": 300,
       "required": true,
-      "propertyOrder": 9
+      "options": {
+        "dependencies": {
+          "useAPIv2": false
+        }
+      },
+      "propertyOrder": 11
     },
     "candyGamma": {
       "type": "boolean",
       "format": "checkbox",
       "title": "edt_dev_spec_candyGamma_title",
       "default": true,
-      "propertyOrder": 10
+      "options": {
+        "dependencies": {
+          "useAPIv2": false
+        }
+      },
+      "propertyOrder": 12
     },
     "lightIds": {
       "type": "array",
@@ -112,20 +151,23 @@
           "useEntertainmentAPI": false
         }
       },
-      "propertyOrder": 11
+      "propertyOrder": 13
     },
     "groupId": {
-      "type": "number",
-      "format": "stepper",
-      "step": 1,
+      "type": "string",
       "title": "edt_dev_spec_groupId_title",
-      "default": 0,
+      "default": "",
       "options": {
         "dependencies": {
           "useEntertainmentAPI": true
         }
       },
-      "propertyOrder": 12
+      "options": {
+        "dependencies": {
+          "useAPIv2": false
+        }
+      },
+      "propertyOrder": 14
     },
     "brightnessFactor": {
       "type": "number",
@@ -136,7 +178,12 @@
       "minimum": 0.5,
       "maximum": 10.0,
       "access": "advanced",
-      "propertyOrder": 13
+      "options": {
+        "dependencies": {
+          "useAPIv2": false
+        }
+      },
+      "propertyOrder": 15
     },
     "handshakeTimeoutMin": {
       "type": "number",
@@ -154,7 +201,7 @@
           "useEntertainmentAPI": true
         }
       },
-      "propertyOrder": 14
+      "propertyOrder": 16
     },
     "handshakeTimeoutMax": {
       "type": "number",
@@ -172,7 +219,7 @@
           "useEntertainmentAPI": true
         }
       },
-      "propertyOrder": 15
+      "propertyOrder": 17
     },
     "verbose": {
       "type": "boolean",
@@ -180,7 +227,7 @@
       "title": "edt_dev_spec_verbose_title",
       "default": false,
       "access": "expert",
-      "propertyOrder": 16
+      "propertyOrder": 18
     },
     "transitiontime": {
       "type": "number",
@@ -195,24 +242,29 @@
           "useEntertainmentAPI": false
         }
       },
-      "propertyOrder": 17
+      "propertyOrder": 19
     },
     "blackLightsTimeout": {
       "type": "number",
+      "title": "edt_dev_spec_blackLightsTimeout_title",
       "default": 5000,
       "options": {
-        "hidden": true
+        "dependencies": {
+          "useAPIv2": false
+        }
       },
-      "propertyOrder": 18
+      "propertyOrder": 20
     },
     "brightnessThreshold": {
       "type": "number",
       "title": "edt_dev_spec_brightnessThreshold_title",
       "default": 0.0001,
       "options": {
-        "hidden": true
+        "dependencies": {
+          "useAPIv2": false
+        }
       },
-      "propertyOrder": 19
+      "propertyOrder": 21
     },
     "brightnessMin": {
       "type": "number",
@@ -223,9 +275,11 @@
       "maximum": 1.0,
       "access": "advanced",
       "options": {
-        "hidden": true
+        "dependencies": {
+          "useAPIv2": false
+        }
       },
-      "propertyOrder": 20
+      "propertyOrder": 22
     },
     "brightnessMax": {
       "type": "number",
@@ -236,9 +290,11 @@
       "maximum": 1.0,
       "access": "advanced",
       "options": {
-        "hidden": true
+        "dependencies": {
+          "useAPIv2": false
+        }
       },
-      "propertyOrder": 21
+      "propertyOrder": 23
     }
   },
   "additionalProperties": true
diff --git a/libsrc/mdns/MdnsBrowser.cpp b/libsrc/mdns/MdnsBrowser.cpp
index 4c0e4b9e..f4f63500 100644
--- a/libsrc/mdns/MdnsBrowser.cpp
+++ b/libsrc/mdns/MdnsBrowser.cpp
@@ -182,6 +182,7 @@ bool MdnsBrowser::resolveAddress(Logger* log, const QString& hostname, QHostAddr
 		}
 		else
 		{
+			QObject::disconnect(&MdnsBrowser::getInstance(), &MdnsBrowser::addressResolved, nullptr, nullptr);
 			Error(log, "Resolved mDNS hostname [%s] timed out", QSTRING_CSTR(hostname));
 		}
 	}
diff --git a/resources/ssl/philips_hue_ca.pem b/resources/ssl/philips_hue_ca.pem
new file mode 100644
index 00000000..1cef2d7e
--- /dev/null
+++ b/resources/ssl/philips_hue_ca.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICMjCCAdigAwIBAgIUO7FSLbaxikuXAljzVaurLXWmFw4wCgYIKoZIzj0EAwIw
+OTELMAkGA1UEBhMCTkwxFDASBgNVBAoMC1BoaWxpcHMgSHVlMRQwEgYDVQQDDAty
+b290LWJyaWRnZTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMzgwMTE5MDMxNDA3WjA5
+MQswCQYDVQQGEwJOTDEUMBIGA1UECgwLUGhpbGlwcyBIdWUxFDASBgNVBAMMC3Jv
+b3QtYnJpZGdlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEjNw2tx2AplOf9x86
+aTdvEcL1FU65QDxziKvBpW9XXSIcibAeQiKxegpq8Exbr9v6LBnYbna2VcaK0G22
+jOKkTqOBuTCBtjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNV
+HQ4EFgQUZ2ONTFrDT6o8ItRnKfqWKnHFGmQwdAYDVR0jBG0wa4AUZ2ONTFrDT6o8
+ItRnKfqWKnHFGmShPaQ7MDkxCzAJBgNVBAYTAk5MMRQwEgYDVQQKDAtQaGlsaXBz
+IEh1ZTEUMBIGA1UEAwwLcm9vdC1icmlkZ2WCFDuxUi22sYpLlwJY81Wrqy11phcO
+MAoGCCqGSM49BAMCA0gAMEUCIEBYYEOsa07TH7E5MJnGw557lVkORgit2Rm1h3B2
+sFgDAiEA1Fj/C3AN5psFMjo0//mrQebo0eKd3aWRx+pQY08mk48=
+-----END CERTIFICATE-----

From b1e68a3572c618334f052e6498428e1bda93567b Mon Sep 17 00:00:00 2001
From: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
Date: Sun, 15 Oct 2023 17:04:51 +0200
Subject: [PATCH 8/8] Nanoleaf (#1647)

* Support Philips Hue APIv2 and refactoring

* Fix MDNSBrower - if timeout during host resolvment occurs

* Hue API v2 - Migrate database

* Fix macOS build

* Handle network timeout before any other error

* Address CodeQL findings

* Clean-up and Fixes

* Only getProperties, if username is available

* Option to layout by entertainment area center

* Fix Wizard

* Fix Nanoleaf, add user auth token wizard

* Nanoleaf fixes and enhancements

* Consider rotated panel layouts

* Corrections

* Layout corrections and filter for non LED panels

* Add LED test effect lightening up LEDs in sequence

* Align rotation value to 15 degree steps

* Align rotation value to 15 degree steps

* Skip non LED panels

* Fix Rotation and refactoring

---------

Co-authored-by: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
---
 CHANGELOG.md                                  |   8 +-
 assets/webconfig/content/conf_leds.html       |   3 +
 assets/webconfig/i18n/en.json                 |  15 +-
 assets/webconfig/js/content_leds.js           | 213 +++++++-
 assets/webconfig/js/wizard.js                 |  87 ++++
 effects/ledtest-seq.json                      |  11 +
 effects/ledtest-seq.py                        |  39 ++
 effects/schema/ledtest-seq.schema.json        |  56 +++
 libsrc/hyperion/SettingsManager.cpp           |  90 +++-
 .../leddevice/dev_net/LedDeviceNanoleaf.cpp   | 464 +++++++++++-------
 libsrc/leddevice/dev_net/LedDeviceNanoleaf.h  |  51 +-
 libsrc/leddevice/dev_net/ProviderRestApi.cpp  |   3 +-
 libsrc/leddevice/schemas/schema-nanoleaf.json |  25 +-
 13 files changed, 825 insertions(+), 240 deletions(-)
 create mode 100644 effects/ledtest-seq.json
 create mode 100644 effects/ledtest-seq.py
 create mode 100644 effects/schema/ledtest-seq.schema.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 996ca847..43fd1112 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,13 +10,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Nanoleaf: Wizard to generate user authorization token allowing users to configure the device via a single window
+- Nanoleaf: Generation of a default layout per device's configuration, including orientation
+
 ### Changed
 
 ### Fixed
 - Fixed missing Include limits in QJsonSchemaChecker
 - Fixed dependencies for deb packages in Debian Bookworm
+- Nanoleaf: "Panel numbering sequence" was not configurable any longer
+- Nanoleaf: Number of panels increased during retries (#1643)
 
-## Removed
+### Removed
+- Nanoleaf: Removed "Start Position" in favour of the general Blacklist feature provided
 
 ## [2.0.15](https://github.com/hyperion-project/hyperion.ng/releases/tag/2.0.15) - 2023-02
 
diff --git a/assets/webconfig/content/conf_leds.html b/assets/webconfig/content/conf_leds.html
index 3229c206..e249f630 100755
--- a/assets/webconfig/content/conf_leds.html
+++ b/assets/webconfig/content/conf_leds.html
@@ -46,6 +46,9 @@
               </div>
             </div>
             <div class="panel-footer" style="text-align:right">
+              <button id='btn_layout_controller' class="btn btn-primary" disabled data-toggle="tooltip" data-placement="top" title="Generate a layout for the configured device">
+                <i class="fa fa-fw fa-save"></i><span data-i18n="wiz_layout">Generate Layout</span>
+              </button>
               <button id='btn_test_controller' class="btn btn-primary" disabled data-toggle="tooltip" data-placement="top" title="Identify configured device by lighting it up">
                 <i class="fa fa-fw fa-save"></i><span data-i18n="wiz_identify">Identify/Test</span>
               </button>
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index d8518fd2..0b238935 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -118,6 +118,8 @@
     "conf_leds_layout_cl_vleddepth": "Vertical LED depth",
     "conf_leds_layout_frame": "Classic Layout (LED Frame)",
     "conf_leds_layout_generatedconf": "Generated/Current LED Configuration",
+    "conf_leds_layout_generation_success": "LED Layout generated sucessfully",
+    "conf_leds_layout_generation_error": "LED Layout was not generated",
     "conf_leds_layout_intro": "You also need an LED layout, which reflects your LED positions. The classic layout is the usually used TV frame, but we also support LED matrix (LED walls) creation. The view on this layout is ALWAYS from the FRONT of your TV.",
     "conf_leds_layout_ma_cabling": "Cabling",
     "conf_leds_layout_ma_direction": "Direction",
@@ -566,8 +568,8 @@
     "edt_conf_webc_port_title": "HTTP Port",
     "edt_conf_webc_sslport_expl": "Port for the WebServer, RPC and WebSocket HTTPS connections",
     "edt_conf_webc_sslport_title": "HTTPS Port",
-    "edt_dev_auth_key_title": "Authentication Token",
-    "edt_dev_auth_key_title_info": "Authentication Token required to acccess the device",
+    "edt_dev_auth_key_title": "Authorization Token",
+    "edt_dev_auth_key_title_info": "Authorization Token required to acccess the device",
     "edt_dev_enum_sub_min_cool_adjust": "Subtract cool white",
     "edt_dev_enum_sub_min_warm_adjust": "Subtract warm white",
     "edt_dev_enum_subtract_minimum": "Subtract minimum",
@@ -758,6 +760,8 @@
     "edt_eff_ledlist": "LED List",
     "edt_eff_ledtest_header": "LED Test",
     "edt_eff_ledtest_header_desc": "Rotating output: Red, Green, Blue, White, Black",
+    "edt_eff_ledtest_seq_header": "LED Test - Sequence",
+    "edt_eff_ledtest_seq_header_desc": "Light up the LEDs in sequence",    
     "edt_eff_length": "Length",
     "edt_eff_lightclock_header": "Light Clock",
     "edt_eff_lightclock_header_desc": "A real clock as light! Adjust the colors of hours, minute, seconds. A optional 3/6/9/12 o'clock marker is also available. In case the clock is wrong, you need to check your system clock.",
@@ -1121,8 +1125,15 @@
     "wiz_identify": "Identify",
     "wiz_identify_tip": "Identify configured device by lighting it up",
     "wiz_identify_light": "Identify $1",
+    "wiz_layout": "Generate Layout",
+    "wiz_layout_tip": "Generate a layout for the configured device",
     "wiz_ids_disabled": "Deactivated",
     "wiz_ids_entire": "Whole picture",
+    "wiz_nanoleaf_failure_auth_token": "Please press the Nanoleaf Power On/Off button within 30 seconds",
+    "wiz_nanoleaf_failure_auth_token_t": "User authorization token generating timeout",
+    "wiz_nanoleaf_press_onoff_button": "Please press the Power On/Off button on your Nanoleaf device for 5-7 seconds",
+    "wiz_nanoleaf_user_auth_intro": "The wizard supports you in generating a user authorization token required to allowing Hyperion to access the device.",
+    "wiz_nanoleaf_user_auth_title": "Authorization Token Generating Wizard",
     "wiz_noLights": "No $1 found! Please get the lights connected to the network or configure them manually.",
     "wiz_pos": "Position/State",
     "wiz_rgb_expl": "The color dot switches every x seconds the color (red, green), at the same time your LEDs switch the color too. Answer the questions at the bottom to check/correct your byte order.",
diff --git a/assets/webconfig/js/content_leds.js b/assets/webconfig/js/content_leds.js
index 2b0304c5..c457262b 100755
--- a/assets/webconfig/js/content_leds.js
+++ b/assets/webconfig/js/content_leds.js
@@ -1050,7 +1050,7 @@ $(document).ready(function () {
     // change save button state based on validation result
     conf_editor.validate().length || window.readOnlyMode ? $('#btn_submit_controller').prop('disabled', true) : $('#btn_submit_controller').prop('disabled', false);
 
-    // led controller sepecific wizards
+    // LED controller specific wizards
     $('#btn_wiz_holder').html("");
     $('#btn_led_device_wiz').off();
 
@@ -1060,6 +1060,13 @@ $(document).ready(function () {
       var hue_title = 'wiz_hue_title';
       changeWizard(data, hue_title, startWizardPhilipsHue);
     }
+    else if (ledType == "nanoleaf") {
+      var ledWizardType = ledType;
+      var data = { type: ledWizardType };
+      var nanoleaf_user_auth_title = 'wiz_nanoleaf_user_auth_title';
+      changeWizard(data, nanoleaf_user_auth_title, startWizardNanoleafUserAuth);
+      $('#btn_wiz_holder').hide();
+    }
     else if (ledType == "atmoorb") {
       var ledWizardType = (this.checked) ? "atmoorb" : ledType;
       var data = { type: ledWizardType };
@@ -1084,6 +1091,7 @@ $(document).ready(function () {
       var colorOrderDefault = "rgb";
       var filter = {};
 
+      $('#btn_layout_controller').hide();
       $('#btn_test_controller').hide();
 
       switch (ledType) {
@@ -1341,6 +1349,13 @@ $(document).ready(function () {
 
       if (host === "") {
         conf_editor.getEditor("root.generalOptions.hardwareLedCount").setValue(1);
+        switch (ledType) {
+
+          case "nanoleaf":
+            $('#btn_wiz_holder').hide();
+            break;
+          default:
+        }
       }
       else {
         let params = {};
@@ -1352,6 +1367,8 @@ $(document).ready(function () {
             break;
 
           case "nanoleaf":
+            $('#btn_wiz_holder').show();
+
             var token = conf_editor.getEditor("root.specificOptions.token").getValue();
             if (token === "") {
               return;
@@ -1668,6 +1685,33 @@ $(document).ready(function () {
   $("#leddevices").val(window.serverConfig.device.type);
   $("#leddevices").trigger("change");
 
+  // Generate layout for LED-Device
+  $("#btn_layout_controller").off().on("click", function () {
+    var ledType = $("#leddevices").val();
+    var isGenerated = false;
+
+    switch (ledType) {
+      case "nanoleaf":
+        var host = conf_editor.getEditor("root.specificOptions.host").getValue();
+        var ledDeviceProperties = devicesProperties[ledType][host];
+        if (ledDeviceProperties) {
+          var panelOrderTopDown = conf_editor.getEditor("root.specificOptions.panelOrderTopDown").getValue() === "top2down";
+          var panelOrderLeftRight = conf_editor.getEditor("root.specificOptions.panelOrderLeftRight").getValue() === "left2right";
+          var ledArray = nanoleafGeneratelayout(ledDeviceProperties.panelLayout, panelOrderTopDown, panelOrderLeftRight);
+          aceEdt.set(ledArray);
+          isGenerated = true;
+        }
+        break;
+      default:
+    }
+
+    if (isGenerated) {
+      showInfoDialog('success', "", $.i18n('conf_leds_layout_generation_success'));
+    } else {
+      showInfoDialog('error', "", $.i18n('conf_leds_layout_generation_error'));
+    }
+  });
+
   // Identify/ Test LED-Device
   $("#btn_test_controller").off().on("click", function () {
     var ledType = $("#leddevices").val();
@@ -2147,6 +2191,7 @@ async function identify_device(type, params) {
 }
 
 function updateElements(ledType, key) {
+  var canLayout = false;
   if (devicesProperties[ledType][key]) {
     var hardwareLedCount = 1;
     switch (ledType) {
@@ -2165,18 +2210,11 @@ function updateElements(ledType, key) {
       case "nanoleaf":
         var ledProperties = devicesProperties[ledType][key];
 
-        if (ledProperties && ledProperties.panelLayout.layout) {
-          //Identify non-LED type panels, e.g. Rhythm (1) and Shapes Controller (12)
-          var nonLedNum = 0;
-          for (const panel of ledProperties.panelLayout.layout.positionData) {
-            if (panel.shapeType === 1 || panel.shapeType === 12) {
-              nonLedNum++;
-            }
-          }
-          hardwareLedCount = ledProperties.panelLayout.layout.numPanels - nonLedNum;
+        if (ledProperties) {
+          hardwareLedCount = ledProperties.ledCount;
+          canLayout = true;
         }
         conf_editor.getEditor("root.generalOptions.hardwareLedCount").setValue(hardwareLedCount);
-
         break;
 
       case "udpraw":
@@ -2225,11 +2263,19 @@ function updateElements(ledType, key) {
   }
 
   if (!conf_editor.validate().length) {
+    if (canLayout) {
+      $("#btn_layout_controller").show();
+      $('#btn_layout_controller').prop('disabled', false);
+    } else {
+      $('#btn_layout_controller').hide();
+    }
+
     if (!window.readOnlyMode) {
       $('#btn_submit_controller').attr('disabled', false);
     }
   }
   else {
+    $('#btn_layout_controller').prop('disabled', true);
     $('#btn_submit_controller').attr('disabled', true);
   }
 }
@@ -2407,4 +2453,149 @@ function updateElementsWled(ledType, key) {
   }
   showInputOptionForItem(conf_editor, "root.specificOptions.segments", "switchOffOtherSegments", showAdditionalOptions);
 }
+function sortByPanelCoordinates(arr, topToBottom, leftToRight) {
+  arr.sort((a, b) => {
+    //Nanoleaf corodinates start at bottom left, therefore reverse topToBottom
+    if (!topToBottom) {
+      if (a.y === b.y) {
+        if (leftToRight) {
+          return a.x - b.x;
+        } else {
+          return b.x - a.x;
+        }
+      } else {
+        return a.y - b.y;
+      }
+    }
+    else {
+      if (a.y === b.y) {
+        if (leftToRight) {
+          return a.x - b.x;
+        } else {
+          return b.x - a.x;
+        }
+      } else {
+        return b.y - a.y;
+      }
+    }
+  });
+}
+function rotateCoordinates(x, y, radians) {
+  var rotatedX = x * Math.cos(radians) - y * Math.sin(radians);
+  var rotatedY = x * Math.sin(radians) + y * Math.cos(radians);
 
+  return { x: rotatedX, y: rotatedY };
+}
+
+function nanoleafGeneratelayout(panelLayout, panelOrderTopDown, panelOrderLeftRight) {
+
+  // Dictionary for Nanoleaf shape types
+  let shapeTypes = {
+    0: { name: "LightsTriangle", led: true, sideLengthX: 150, sideLengthY: 150 },
+    1: { name: "LightsRythm", led: false, sideLengthX: 0, sideLengthY: 0 },
+    2: { name: "Square", led: true, sideLengthX: 100, sideLengthY: 100 },
+    3: { name: "SquareControllerMaster", led: true, sideLengthX: 100, sideLengthY: 100 },
+    4: { name: "SquareControllerPassive", led: true, sideLengthX: 100, sideLengthY: 100 },
+    5: { name: "PowerSupply", led: true, sideLengthX: 100, sideLengthY: 100 },
+    7: { name: "ShapesHexagon", led: true, sideLengthX: 67, sideLengthY: 67 },
+    8: { name: "ShapesTriangle", led: true, sideLengthX: 134, sideLengthY: 134 },
+    9: { name: "ShapesMiniTriangle", led: true, sideLengthX: 67, sideLengthY: 67 },
+    12: { name: "ShapesController", led: false, sideLengthX: 0, sideLengthY: 0 },
+    14: { name: "ElementsHexagon", led: true, sideLengthX: 134, sideLengthY: 134 },
+    15: { name: "ElementsHexagonCorner", led: true, sideLengthX: 33.5, sideLengthY: 58 },
+    16: { name: "LinesConnector", led: false, sideLengthX: 11, sideLengthY: 11 },
+    17: { name: "LightLines", led: true, sideLengthX: 154, sideLengthY: 154 },
+    18: { name: "LightLinesSingleZone", led: true, sideLengthX: 77, sideLengthY: 77 },
+    19: { name: "ControllerCap", led: false, sideLengthX: 11, sideLengthY: 11 },
+    20: { name: "PowerConnector", led: false, sideLengthX: 11, sideLengthY: 11 },
+    999: { name: "Unknown", led: true, sideLengthX: 100, sideLengthY: 100 }
+  };
+
+  let { globalOrientation, layout } = panelLayout;
+
+  var degreesToRotate = 0;
+  if (globalOrientation) {
+    degreesToRotate = globalOrientation.value;
+  }
+
+  //Align rotation degree to 15 degree steps
+  const degreeSteps = 15;
+  var degreeRounded = ((Math.round(degreesToRotate / degreeSteps) * degreeSteps) + 360) % 360;
+
+  //Nanoleaf orientation is counter-clockwise
+  degreeRounded *= -1;
+
+  // Convert degrees to radians
+  const radians = (degreeRounded * Math.PI) / 180;
+
+  //Reduce the capture area
+  const areaSizeFactor = 0.5;
+
+  var panelDataXY = [...layout.positionData];
+  panelDataXY.forEach(panel => {
+
+    if (shapeTypes[panel.shapeType] == undefined) {
+      panel.shapeType = 999;
+    }
+
+    panel.shapeName = shapeTypes[panel.shapeType].name;
+    panel.led = shapeTypes[panel.shapeType].led;
+    panel.areaWidth = shapeTypes[panel.shapeType].sideLengthX * areaSizeFactor;
+    panel.areaHeight = shapeTypes[panel.shapeType].sideLengthY * areaSizeFactor;
+
+    if (radians !== 0) {
+      var rotatedXY = rotateCoordinates(panel.x, panel.y, radians);
+      panel.x = Math.round(rotatedXY.x);
+      panel.y = Math.round(rotatedXY.y);
+    }
+
+    panel.maxX = panel.x + panel.areaWidth;
+    panel.maxY = panel.y + panel.areaHeight;
+  });
+
+  var minX = panelDataXY[0].x;
+  var maxX = panelDataXY[0].x;
+  var minY = panelDataXY[0].y;
+  var maxY = panelDataXY[0].y;
+  panelDataXY.forEach(panel => {
+
+    if (panel.maxX > maxX) {
+      maxX = panel.maxX;
+    }
+    if (panel.x < minX) {
+      minX = panel.x;
+    }
+    if (panel.maxY > maxY) {
+      maxY = panel.maxY;
+    }
+    if (panel.y < minY) {
+      minY = panel.y;
+    }
+  });
+
+  const width = Math.abs(maxX - minX);
+  const height = Math.abs(maxY - minY);
+  const scaleX = 1 / width;
+  const scaleY = 1 / height;
+
+  var layoutObjects = [];
+  var i = 0;
+
+  sortByPanelCoordinates(panelDataXY, panelOrderTopDown, panelOrderLeftRight);
+  panelDataXY.forEach(panel => {
+
+    if (panel.led) {
+      let layoutObject = {
+        name: i + "-" + panel.panelId,
+        hmin: Math.min(1, Math.max(0, (panel.x - minX) * scaleX)),
+        hmax: Math.min(1, Math.max(0, (panel.x - minX + panel.areaWidth) * scaleX)),
+        //Nanoleaf corodinates start at bottom left, therefore reverse vertical positioning
+        vmax: (1 - Math.min(1, Math.max(0, (panel.y - minY) * scaleY))),
+        vmin: (1 - Math.min(1, Math.max(0, (panel.y - minY + panel.areaHeight) * scaleY)))
+      };
+      layoutObjects.push(JSON.parse(JSON.stringify(layoutObject)));
+      ++i;
+    }
+  });
+  return layoutObjects;
+}
diff --git a/assets/webconfig/js/wizard.js b/assets/webconfig/js/wizard.js
index 79fc9182..70584ddb 100755
--- a/assets/webconfig/js/wizard.js
+++ b/assets/webconfig/js/wizard.js
@@ -2187,3 +2187,90 @@ async function identify_atmoorb_device(orbId) {
   }
 }
 
+//****************************
+// Nanoleaf Token Wizard
+//****************************
+var lights = null;
+function startWizardNanoleafUserAuth(e) {
+  //create html
+  var nanoleaf_user_auth_title = 'wiz_nanoleaf_user_auth_title';
+  var nanoleaf_user_auth_intro = 'wiz_nanoleaf_user_auth_intro';
+
+  $('#wiz_header').html('<i class="fa fa-magic fa-fw"></i>' + $.i18n(nanoleaf_user_auth_title));
+  $('#wizp1_body').html('<h4 style="font-weight:bold;text-transform:uppercase;">' + $.i18n(nanoleaf_user_auth_title) + '</h4><p>' + $.i18n(nanoleaf_user_auth_intro) + '</p>');
+
+  $('#wizp1_footer').html('<button type="button" class="btn btn-primary" id="btn_wiz_cont"><i class="fa fa-fw fa-check"></i>'
+    + $.i18n('general_btn_continue') + '</button><button type="button" class="btn btn-danger" data-dismiss="modal"><i class="fa fa-fw fa-close"></i>'
+    + $.i18n('general_btn_cancel') + '</button>');
+
+  $('#wizp3_body').html('<span>' + $.i18n('wiz_nanoleaf_press_onoff_button') + '</span> <br /><br /><center><span id="connectionTime"></span><br /><i class="fa fa-cog fa-spin" style="font-size:100px"></i></center>');
+
+  if (getStorage("darkMode") == "on")
+    $('#wizard_logo').attr("src", 'img/hyperion/logo_negativ.png');
+
+  //open modal
+  $("#wizard_modal").modal({ backdrop: "static", keyboard: false, show: true });
+
+  //listen for continue
+  $('#btn_wiz_cont').off().on('click', function () {
+    createNanoleafUserAuthorization();
+    $('#wizp1').toggle(false);
+    $('#wizp3').toggle(true);
+  });
+}
+
+function createNanoleafUserAuthorization() {
+  var host = conf_editor.getEditor("root.specificOptions.host").getValue();
+
+  let params = { host: host };
+
+  var retryTime = 30;
+  var retryInterval = 2;
+
+  var UserInterval = setInterval(function () {
+
+    $('#wizp1').toggle(false);
+    $('#wizp3').toggle(true);
+
+    (async () => {
+
+      retryTime -= retryInterval;
+      $("#connectionTime").html(retryTime);
+      if (retryTime <= 0) {
+        abortConnection(UserInterval);
+        clearInterval(UserInterval);
+
+        showNotification('warning', $.i18n('wiz_nanoleaf_failure_auth_token'), $.i18n('wiz_nanoleaf_failure_auth_token_t'));
+
+        resetWizard(true);
+      }
+      else {
+        const res = await requestLedDeviceAddAuthorization('nanoleaf', params);
+        if (res && !res.error) {
+          var response = res.info;
+
+          if (jQuery.isEmptyObject(response)) {
+            debugMessage(retryTime + ": Power On/Off button not pressed or device not reachable");
+          } else {
+            $('#wizp1').toggle(false);
+            $('#wizp3').toggle(false);
+
+            var token = response.auth_token;
+            if (token != 'undefined') {
+              conf_editor.getEditor("root.specificOptions.token").setValue(token);
+            }
+            clearInterval(UserInterval);
+            resetWizard(true);
+          }
+        } else {
+          $('#wizp1').toggle(false);
+          $('#wizp3').toggle(false);
+          clearInterval(UserInterval);
+          resetWizard(true);
+        }
+      }
+    })();
+
+  }, retryInterval * 1000);
+}
+
diff --git a/effects/ledtest-seq.json b/effects/ledtest-seq.json
new file mode 100644
index 00000000..9577046d
--- /dev/null
+++ b/effects/ledtest-seq.json
@@ -0,0 +1,11 @@
+{
+	"name" : "Led Test - Sequence",
+	"script" : "ledtest-seq.py",
+	"args" :
+	{
+		"sleepTime" : 0.5,
+		"smoothing-custom-settings" : false,
+		"smoothing-time_ms" : 500,
+		"smoothing-updateFrequency" : 20.0
+	}
+}
diff --git a/effects/ledtest-seq.py b/effects/ledtest-seq.py
new file mode 100644
index 00000000..535c06bb
--- /dev/null
+++ b/effects/ledtest-seq.py
@@ -0,0 +1,39 @@
+import hyperion
+import time
+
+# Get parameters
+sleepTime = float(hyperion.args.get('sleepTime', 0.5))
+
+def TestRgb( iteration ):
+
+    switcher = {
+        0: (255, 0, 0),
+        1: (0, 255, 0),
+        2: (0, 0, 255),
+    }
+
+    return switcher.get(iteration, (127,127,127) )
+
+ledData = bytearray(hyperion.ledCount * (0,0,0) )
+
+i = 0
+while not hyperion.abort():
+
+	if i < hyperion.ledCount:
+		j = i % 3
+		rgb = TestRgb( j )
+		ledData[3*i+0] = rgb[0] 
+		ledData[3*i+1] = rgb[1] 
+		ledData[3*i+2] = rgb[2] 
+		i += 1
+	else:
+		if i == hyperion.ledCount:
+			ledData = bytearray(hyperion.ledCount * (0,0,0) )
+			i += 1
+		else:
+			i = 0
+
+	hyperion.setColor (ledData)
+		
+	time.sleep(sleepTime)
+
diff --git a/effects/schema/ledtest-seq.schema.json b/effects/schema/ledtest-seq.schema.json
new file mode 100644
index 00000000..d75afbe5
--- /dev/null
+++ b/effects/schema/ledtest-seq.schema.json
@@ -0,0 +1,56 @@
+{
+	"type":"object",
+	"script" : "ledtest-seq.py",
+	"title":"edt_eff_ledtest_seq_header",
+	"required":true,
+	"properties":{
+		"sleepTime": {
+			"type": "number",
+			"title":"edt_eff_sleeptime",
+			"default": 0.5,
+			"minimum" : 0.01,
+			"maximum": 1,
+			"step": 0.01,
+			"append" : "edt_append_s",
+			"propertyOrder" : 1
+		},
+		"smoothing-custom-settings" :
+		{
+			"type" : "boolean",
+			"title" : "edt_eff_smooth_custom",
+			"default" : false,
+			"propertyOrder" : 2
+		},
+		"smoothing-time_ms" :
+		{
+			"type" : "integer",
+			"title" : "edt_eff_smooth_time_ms",
+			"minimum" : 25,
+			"maximum": 600,
+			"default" : 200,
+			"append" : "edt_append_ms",
+			"options": {
+				"dependencies": {
+					"smoothing-custom-settings": true
+				}
+			},
+			"propertyOrder" : 3
+		},
+		"smoothing-updateFrequency" :
+		{
+			"type" : "number",
+			"title" : "edt_eff_smooth_updateFrequency",
+			"minimum" : 1.0,
+			"maximum" : 100.0,
+			"default" : 25.0,
+			"append" : "edt_append_hz",
+			"options": {
+				"dependencies": {
+					"smoothing-custom-settings": true
+				}
+			},
+			"propertyOrder" : 4
+		}
+	},
+	"additionalProperties": false
+}
diff --git a/libsrc/hyperion/SettingsManager.cpp b/libsrc/hyperion/SettingsManager.cpp
index ac19461d..3fe7e367 100644
--- a/libsrc/hyperion/SettingsManager.cpp
+++ b/libsrc/hyperion/SettingsManager.cpp
@@ -21,19 +21,19 @@ using namespace semver;
 
 // Constants
 namespace {
-const char DEFAULT_VERSION[] = "2.0.0-alpha.8";
+	const char DEFAULT_VERSION[] = "2.0.0-alpha.8";
 } //End of constants
 
 QJsonObject SettingsManager::schemaJson;
 
 SettingsManager::SettingsManager(quint8 instance, QObject* parent, bool readonlyMode)
 	: QObject(parent)
-	  , _log(Logger::getInstance("SETTINGSMGR", "I"+QString::number(instance)))
-	  , _instance(instance)
-	  , _sTable(new SettingsTable(instance, this))
-	  , _configVersion(DEFAULT_VERSION)
-	  , _previousVersion(DEFAULT_VERSION)
-	  , _readonlyMode(readonlyMode)
+	, _log(Logger::getInstance("SETTINGSMGR", "I" + QString::number(instance)))
+	, _instance(instance)
+	, _sTable(new SettingsTable(instance, this))
+	, _configVersion(DEFAULT_VERSION)
+	, _previousVersion(DEFAULT_VERSION)
+	, _readonlyMode(readonlyMode)
 {
 	_sTable->setReadonlyMode(_readonlyMode);
 	// get schema
@@ -739,12 +739,12 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 					{
 						QString type = newDeviceConfig["type"].toString();
 
-						const QStringList serialDevices {"adalight", "dmx", "atmo", "sedu", "tpm2", "karate"};
-						if ( serialDevices.contains(type ))
+						const QStringList serialDevices{ "adalight", "dmx", "atmo", "sedu", "tpm2", "karate" };
+						if (serialDevices.contains(type))
 						{
 							if (!newDeviceConfig.contains("rateList"))
 							{
-								newDeviceConfig["rateList"] =  "CUSTOM";
+								newDeviceConfig["rateList"] = "CUSTOM";
 								migrated = true;
 							}
 						}
@@ -791,7 +791,8 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 					if (newDeviceConfig.contains("type"))
 					{
 						QString type = newDeviceConfig["type"].toString();
-						if ( type == "philipshue")
+
+						if (type == "philipshue")
 						{
 							if (newDeviceConfig.contains("groupId"))
 							{
@@ -805,7 +806,7 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 
 							if (newDeviceConfig.contains("lightIds"))
 							{
-								QJsonArray lightIds = newDeviceConfig.value( "lightIds").toArray();
+								QJsonArray lightIds = newDeviceConfig.value("lightIds").toArray();
 								// Iterate through the JSON array and update integer values to strings
 								for (int i = 0; i < lightIds.size(); ++i) {
 									QJsonValue value = lightIds.at(i);
@@ -820,6 +821,71 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 
 							}
 						}
+
+						if (type == "nanoleaf")
+						{
+							if (newDeviceConfig.contains("panelStartPos"))
+							{
+								newDeviceConfig.remove("panelStartPos");
+								migrated = true;
+							}
+
+							if (newDeviceConfig.contains("panelOrderTopDown"))
+							{
+								int panelOrderTopDown;
+								if (newDeviceConfig["panelOrderTopDown"].isDouble())
+								{
+									panelOrderTopDown = newDeviceConfig["panelOrderTopDown"].toInt();
+								}
+								else
+								{
+									panelOrderTopDown = newDeviceConfig["panelOrderTopDown"].toString().toInt();
+								}
+
+								newDeviceConfig.remove("panelOrderTopDown");
+								if (panelOrderTopDown == 0)
+								{
+									newDeviceConfig["panelOrderTopDown"] = "top2down";
+									migrated = true;
+								}
+								else
+								{
+									if (panelOrderTopDown == 1)
+									{
+										newDeviceConfig["panelOrderTopDown"] = "bottom2up";
+										migrated = true;
+									}
+								}
+							}
+
+							if (newDeviceConfig.contains("panelOrderLeftRight"))
+							{
+								int panelOrderLeftRight;
+								if (newDeviceConfig["panelOrderLeftRight"].isDouble())
+								{
+									panelOrderLeftRight = newDeviceConfig["panelOrderLeftRight"].toInt();
+								}
+								else
+								{
+									panelOrderLeftRight = newDeviceConfig["panelOrderLeftRight"].toString().toInt();
+								}
+
+								newDeviceConfig.remove("panelOrderLeftRight");
+								if (panelOrderLeftRight == 0)
+								{
+									newDeviceConfig["panelOrderLeftRight"] = "left2right";
+									migrated = true;
+								}
+								else
+								{
+									if (panelOrderLeftRight == 1)
+									{
+										newDeviceConfig["panelOrderLeftRight"] = "right2left";
+										migrated = true;
+									}
+								}
+							}
+						}
 					}
 
 					if (migrated)
diff --git a/libsrc/leddevice/dev_net/LedDeviceNanoleaf.cpp b/libsrc/leddevice/dev_net/LedDeviceNanoleaf.cpp
index f895cba6..f3252176 100644
--- a/libsrc/leddevice/dev_net/LedDeviceNanoleaf.cpp
+++ b/libsrc/leddevice/dev_net/LedDeviceNanoleaf.cpp
@@ -4,6 +4,7 @@
 //std includes
 #include <sstream>
 #include <iomanip>
+#include <cmath>
 
 // Qt includes
 #include <QNetworkReply>
@@ -21,88 +22,79 @@
 
 // Constants
 namespace {
-const bool verbose = false;
-const bool verbose3 = false;
+	const bool verbose = false;
+	const bool verbose3 = false;
 
-// Configuration settings
-const char CONFIG_HOST[] = "host";
-const char CONFIG_AUTH_TOKEN[] = "token";
-const char CONFIG_RESTORE_STATE[] = "restoreOriginalState";
-const char CONFIG_BRIGHTNESS[] = "brightness";
-const char CONFIG_BRIGHTNESS_OVERWRITE[] = "overwriteBrightness";
+	// Configuration settings
+	const char CONFIG_HOST[] = "host";
+	const char CONFIG_AUTH_TOKEN[] = "token";
+	const char CONFIG_RESTORE_STATE[] = "restoreOriginalState";
+	const char CONFIG_BRIGHTNESS[] = "brightness";
+	const char CONFIG_BRIGHTNESS_OVERWRITE[] = "overwriteBrightness";
 
-const char CONFIG_PANEL_ORDER_TOP_DOWN[] = "panelOrderTopDown";
-const char CONFIG_PANEL_ORDER_LEFT_RIGHT[] = "panelOrderLeftRight";
-const char CONFIG_PANEL_START_POS[] = "panelStartPos";
+	const char CONFIG_PANEL_ORDER_TOP_DOWN[] = "panelOrderTopDown";
+	const char CONFIG_PANEL_ORDER_LEFT_RIGHT[] = "panelOrderLeftRight";
 
-const bool DEFAULT_IS_RESTORE_STATE = true;
-const bool DEFAULT_IS_BRIGHTNESS_OVERWRITE = true;
-const int BRI_MAX = 100;
+	const bool DEFAULT_IS_RESTORE_STATE = true;
+	const bool DEFAULT_IS_BRIGHTNESS_OVERWRITE = true;
+	const int BRI_MAX = 100;
 
-// Panel configuration settings
-const char PANEL_LAYOUT[] = "layout";
-const char PANEL_NUM[] = "numPanels";
-const char PANEL_ID[] = "panelId";
-const char PANEL_POSITIONDATA[] = "positionData";
-const char PANEL_SHAPE_TYPE[] = "shapeType";
-const char PANEL_POS_X[] = "x";
-const char PANEL_POS_Y[] = "y";
+	// Panel configuration settings
+	const char PANEL_GLOBALORIENTATION[] = "globalOrientation";
+	const char PANEL_GLOBALORIENTATION_VALUE[] = "value";
+	const char PANEL_LAYOUT[] = "layout";
+	const char PANEL_NUM[] = "numPanels";
+	const char PANEL_ID[] = "panelId";
+	const char PANEL_POSITIONDATA[] = "positionData";
+	const char PANEL_SHAPE_TYPE[] = "shapeType";
+	const char PANEL_POS_X[] = "x";
+	const char PANEL_POS_Y[] = "y";
 
-// List of State Information
-const char STATE_ON[] = "on";
-const char STATE_BRI[] = "brightness";
-const char STATE_HUE[] = "hue";
-const char STATE_SAT[] = "sat";
-const char STATE_CT[] = "ct";
-const char STATE_COLORMODE[] = "colorMode";
-const QStringList COLOR_MODES {"hs", "ct", "effect"};
-const char STATE_VALUE[] = "value";
+	// List of State Information
+	const char STATE_ON[] = "on";
+	const char STATE_BRI[] = "brightness";
+	const char STATE_HUE[] = "hue";
+	const char STATE_SAT[] = "sat";
+	const char STATE_CT[] = "ct";
+	const char STATE_COLORMODE[] = "colorMode";
+	const QStringList COLOR_MODES{ "hs", "ct", "effect" };
+	const char STATE_VALUE[] = "value";
 
-// Device Data elements
-const char DEV_DATA_NAME[] = "name";
-const char DEV_DATA_MODEL[] = "model";
-const char DEV_DATA_MANUFACTURER[] = "manufacturer";
-const char DEV_DATA_FIRMWAREVERSION[] = "firmwareVersion";
+	// Device Data elements
+	const char DEV_DATA_NAME[] = "name";
+	const char DEV_DATA_MODEL[] = "model";
+	const char DEV_DATA_MANUFACTURER[] = "manufacturer";
+	const char DEV_DATA_FIRMWAREVERSION[] = "firmwareVersion";
 
-// Nanoleaf Stream Control elements
-const quint16 STREAM_CONTROL_DEFAULT_PORT = 60222;
+	// Nanoleaf Stream Control elements
+	const quint16 STREAM_CONTROL_DEFAULT_PORT = 60222;
 
-// Nanoleaf OpenAPI URLs
-const int API_DEFAULT_PORT = 16021;
-const char API_BASE_PATH[] = "/api/v1/%1/";
-const char API_ROOT[] = "";
-const char API_EXT_MODE_STRING_V2[] = "{\"write\" : {\"command\" : \"display\", \"animType\" : \"extControl\", \"extControlVersion\" : \"v2\"}}";
-const char API_STATE[] = "state";
-const char API_PANELLAYOUT[] = "panelLayout";
-const char API_EFFECT[] = "effects";
+	// Nanoleaf OpenAPI URLs
+	const int API_DEFAULT_PORT = 16021;
+	const char API_BASE_PATH[] = "/api/v1/%1/";
+	const char API_ROOT[] = "";
+	const char API_EXT_MODE_STRING_V2[] = "{\"write\" : {\"command\" : \"display\", \"animType\" : \"extControl\", \"extControlVersion\" : \"v2\"}}";
+	const char API_STATE[] = "state";
+	const char API_PANELLAYOUT[] = "panelLayout";
+	const char API_EFFECT[] = "effects";
+	const char API_IDENTIFY[] = "identify";
+	const char API_ADD_USER[] = "new";
+	const char API_EFFECT_SELECT[] = "select";
 
-const char API_EFFECT_SELECT[] = "select";
+	//Nanoleaf Control data stream
+	const int STREAM_FRAME_PANEL_NUM_SIZE = 2;
+	const int STREAM_FRAME_PANEL_INFO_SIZE = 8;
 
-//Nanoleaf Control data stream
-const int STREAM_FRAME_PANEL_NUM_SIZE = 2;
-const int STREAM_FRAME_PANEL_INFO_SIZE = 8;
+	// Nanoleaf ssdp services
+	const char SSDP_ID[] = "ssdp:all";
+	const char SSDP_FILTER_HEADER[] = "ST";
+	const char SSDP_NANOLEAF[] = "nanoleaf:nl*";
+	const char SSDP_LIGHTPANELS[] = "nanoleaf_aurora:light";
+
+	const double ROTATION_STEPS_DEGREE = 15.0;
 
-// Nanoleaf ssdp services
-const char SSDP_ID[] = "ssdp:all";
-const char SSDP_FILTER_HEADER[] = "ST";
-const char SSDP_NANOLEAF[] = "nanoleaf:nl*";
-const char SSDP_LIGHTPANELS[] = "nanoleaf_aurora:light";
 } //End of constants
 
-// Nanoleaf Panel Shapetypes
-enum SHAPETYPES {
-	TRIANGLE = 0,
-	RHYTM = 1,
-	SQUARE = 2,
-	CONTROL_SQUARE_PRIMARY = 3,
-	CONTROL_SQUARE_PASSIVE = 4,
-	POWER_SUPPLY= 5,
-	HEXAGON_SHAPES = 7,
-	TRIANGE_SHAPES = 8,
-	MINI_TRIANGE_SHAPES = 8,
-	SHAPES_CONTROLLER = 12
-};
-
 // Nanoleaf external control versions
 enum EXTCONTROLVERSIONS {
 	EXTCTRLVER_V1 = 1,
@@ -111,18 +103,16 @@ enum EXTCONTROLVERSIONS {
 
 LedDeviceNanoleaf::LedDeviceNanoleaf(const QJsonObject& deviceConfig)
 	: ProviderUdp(deviceConfig)
-	  , _restApi(nullptr)
-	  , _apiPort(API_DEFAULT_PORT)
-	  , _topDown(true)
-	  , _leftRight(true)
-	  , _startPos(0)
-	  , _endPos(0)
-	  , _extControlVersion(EXTCTRLVER_V2)
-	  , _panelLedCount(0)
+	, _restApi(nullptr)
+	, _apiPort(API_DEFAULT_PORT)
+	, _topDown(true)
+	, _leftRight(true)
+	, _extControlVersion(EXTCTRLVER_V2)
+	, _panelLedCount(0)
 {
 #ifdef ENABLE_MDNS
 	QMetaObject::invokeMethod(&MdnsBrowser::getInstance(), "browseForServiceType",
-							   Qt::QueuedConnection, Q_ARG(QByteArray, MdnsServiceRegister::getServiceType(_activeDeviceType)));
+		Qt::QueuedConnection, Q_ARG(QByteArray, MdnsServiceRegister::getServiceType(_activeDeviceType)));
 #endif
 }
 
@@ -139,7 +129,7 @@ LedDeviceNanoleaf::~LedDeviceNanoleaf()
 
 bool LedDeviceNanoleaf::init(const QJsonObject& deviceConfig)
 {
-	bool isInitOK {false};
+	bool isInitOK{ false };
 
 	// Overwrite non supported/required features
 	setLatchTime(0);
@@ -150,9 +140,9 @@ bool LedDeviceNanoleaf::init(const QJsonObject& deviceConfig)
 		Info(_log, "Device Nanoleaf does not require rewrites. Refresh time is ignored.");
 	}
 
-	DebugIf(verbose,_log, "deviceConfig: [%s]", QString(QJsonDocument(_devConfig).toJson(QJsonDocument::Compact)).toUtf8().constData());
+	DebugIf(verbose, _log, "deviceConfig: [%s]", QString(QJsonDocument(_devConfig).toJson(QJsonDocument::Compact)).toUtf8().constData());
 
-	if ( ProviderUdp::init(deviceConfig) )
+	if (ProviderUdp::init(deviceConfig))
 	{
 		//Set hostname as per configuration and default port
 		_hostName = deviceConfig[CONFIG_HOST].toString();
@@ -164,36 +154,66 @@ bool LedDeviceNanoleaf::init(const QJsonObject& deviceConfig)
 		_isBrightnessOverwrite = _devConfig[CONFIG_BRIGHTNESS_OVERWRITE].toBool(DEFAULT_IS_BRIGHTNESS_OVERWRITE);
 		_brightness = _devConfig[CONFIG_BRIGHTNESS].toInt(BRI_MAX);
 
-		Debug(_log, "Hostname/IP       : %s", QSTRING_CSTR(_hostName) );
+		Debug(_log, "Hostname/IP       : %s", QSTRING_CSTR(_hostName));
 		Debug(_log, "RestoreOrigState  : %d", _isRestoreOrigState);
 		Debug(_log, "Overwrite Brightn.: %d", _isBrightnessOverwrite);
 		Debug(_log, "Set Brightness to : %d", _brightness);
 
 		// Read panel organisation configuration
-		if (deviceConfig[CONFIG_PANEL_ORDER_TOP_DOWN].isString())
-		{
-			_topDown = deviceConfig[CONFIG_PANEL_ORDER_TOP_DOWN].toString().toInt() == 0;
-		}
-		else
-		{
-			_topDown = deviceConfig[CONFIG_PANEL_ORDER_TOP_DOWN].toInt() == 0;
-		}
-
-		if (deviceConfig[CONFIG_PANEL_ORDER_LEFT_RIGHT].isString())
-		{
-			_leftRight = deviceConfig[CONFIG_PANEL_ORDER_LEFT_RIGHT].toString().toInt() == 0;
-		}
-		else
-		{
-			_leftRight = deviceConfig[CONFIG_PANEL_ORDER_LEFT_RIGHT].toInt() == 0;
-		}
-		_startPos = deviceConfig[CONFIG_PANEL_START_POS].toInt(0);
+		_topDown = deviceConfig[CONFIG_PANEL_ORDER_TOP_DOWN].toString("top2down") == "top2down";
+		_leftRight = deviceConfig[CONFIG_PANEL_ORDER_LEFT_RIGHT].toString("left2right") == "left2right";
 
 		isInitOK = true;
 	}
 	return isInitOK;
 }
 
+int LedDeviceNanoleaf::getHwLedCount(const QJsonObject& jsonLayout) const
+{
+	int hwLedCount{ 0 };
+
+	const QJsonArray positionData = jsonLayout[PANEL_POSITIONDATA].toArray();
+	for (const QJsonValue& value : positionData)
+	{
+		QJsonObject panelObj = value.toObject();
+		int panelId = panelObj[PANEL_ID].toInt();
+		int panelshapeType = panelObj[PANEL_SHAPE_TYPE].toInt();
+
+		DebugIf(verbose, _log, "Panel [%d] - Type: [%d]", panelId, panelshapeType);
+
+		if (hasLEDs(static_cast<SHAPETYPES>(panelshapeType)))
+		{
+			++hwLedCount;
+		}
+		else
+		{
+			DebugIf(verbose, _log, "Rhythm/Shape/Lines Controller panel skipped.");
+		}
+	}
+	return hwLedCount;
+}
+
+bool LedDeviceNanoleaf::hasLEDs(const SHAPETYPES& panelshapeType) const
+{
+	bool hasLED {true};
+	// Skip non LED panel types
+	switch (panelshapeType)
+	{
+	case SHAPES_CONTROLLER:
+	case LINES_CONECTOR:
+	case CONTROLLER_CAP:
+	case POWER_CONNECTOR:
+	case RHYTM:
+		DebugIf(verbose, _log, "Rhythm/Shape/Lines Controller panel skipped.");
+		hasLED = false;
+		break;
+	default:
+		break;
+	}
+
+	return hasLED;
+}
+
 bool LedDeviceNanoleaf::initLedsConfiguration()
 {
 	bool isInitOK = true;
@@ -206,7 +226,7 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 	if (response.error())
 	{
 		QString errorReason = QString("Getting device details failed with error: '%1'").arg(response.getErrorReason());
-		this->setInError ( errorReason );
+		this->setInError(errorReason);
 		isInitOK = false;
 	}
 	else
@@ -225,37 +245,71 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 
 		// Get panel details from /panelLayout/layout
 		QJsonObject jsonPanelLayout = jsonAllPanelInfo[API_PANELLAYOUT].toObject();
+
+		const QJsonObject globalOrientation = jsonPanelLayout[PANEL_GLOBALORIENTATION].toObject();
+		int orientation = globalOrientation[PANEL_GLOBALORIENTATION_VALUE].toInt();
+
+		int degreesToRotate {orientation};
+		bool isRotated {false};
+		if (degreesToRotate > 0)
+		{
+			isRotated = true;
+			int degreeRounded = static_cast<int>(round(degreesToRotate / ROTATION_STEPS_DEGREE) * ROTATION_STEPS_DEGREE);
+			degreesToRotate = (degreeRounded +360) % 360;
+		}
+
+		//Nanoleaf orientation is counter-clockwise
+		degreesToRotate *= -1;
+
+		double radians = (degreesToRotate * std::acos(-1)) / 180;
+		DebugIf(verbose, _log, "globalOrientation: %d, degreesToRotate: %d, radians: %0.2f", orientation, degreesToRotate, radians);
+
 		QJsonObject jsonLayout = jsonPanelLayout[PANEL_LAYOUT].toObject();
 
+		_panelLedCount = getHwLedCount(jsonLayout);
+		_devConfig["hardwareLedCount"] = _panelLedCount;
+
 		int panelNum = jsonLayout[PANEL_NUM].toInt();
 		const QJsonArray positionData = jsonLayout[PANEL_POSITIONDATA].toArray();
 
 		std::map<int, std::map<int, int>> panelMap;
 
 		// Loop over all children.
-		for(const QJsonValue & value : positionData)
+		for (const QJsonValue& value : positionData)
 		{
 			QJsonObject panelObj = value.toObject();
 
 			int panelId = panelObj[PANEL_ID].toInt();
-			int panelX = panelObj[PANEL_POS_X].toInt();
-			int panelY = panelObj[PANEL_POS_Y].toInt();
 			int panelshapeType = panelObj[PANEL_SHAPE_TYPE].toInt();
+			int posX = panelObj[PANEL_POS_X].toInt();
+			int posY = panelObj[PANEL_POS_Y].toInt();
 
-			DebugIf(verbose,_log, "Panel [%d] (%d,%d) - Type: [%d]", panelId, panelX, panelY, panelshapeType);
-
-			// Skip Rhythm and Shapes controller panels
-			if (panelshapeType != RHYTM && panelshapeType != SHAPES_CONTROLLER)
+			int panelX;
+			int panelY;
+			if (isRotated)
 			{
-				panelMap[panelY][panelX] = panelId;
+				panelX = static_cast<int>(round(posX * cos(radians) - posY * sin(radians)));
+				panelY = static_cast<int>(round(posX * sin(radians) + posY * cos(radians)));
 			}
 			else
-			{	// Reset non support/required features
-				Info(_log, "Rhythm/Shape Controller panel skipped.");
+			{
+				panelX = posX;
+				panelY = posY;
+			}
+
+			if (hasLEDs(static_cast<SHAPETYPES>(panelshapeType)))
+			{
+				panelMap[panelY][panelX] = panelId;
+				DebugIf(verbose, _log, "Use  Panel [%d] (%d,%d) - Type: [%d]", panelId, panelX, panelY, panelshapeType);
+			}
+			else
+			{
+				DebugIf(verbose, _log, "Skip Panel [%d] (%d,%d) - Type: [%d]", panelId, panelX, panelY, panelshapeType);
 			}
 		}
 
 		// Travers panels top down
+		_panelIds.clear();
 		for (auto posY = panelMap.crbegin(); posY != panelMap.crend(); ++posY)
 		{
 			// Sort panels left to right
@@ -263,7 +317,7 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 			{
 				for (auto posX = posY->second.cbegin(); posX != posY->second.cend(); ++posX)
 				{
-					DebugIf(verbose3, _log, "panelMap[%d][%d]=%d", posY->first, posX->first, posX->second);
+					DebugIf(verbose, _log, "panelMap[%d][%d]=%d", posY->first, posX->first, posX->second);
 
 					if (_topDown)
 					{
@@ -280,7 +334,7 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 				// Sort panels right to left
 				for (auto posX = posY->second.crbegin(); posX != posY->second.crend(); ++posX)
 				{
-					DebugIf(verbose3, _log, "panelMap[%d][%d]=%d", posY->first, posX->first, posX->second);
+					DebugIf(verbose, _log, "panelMap[%d][%d]=%d", posY->first, posX->first, posX->second);
 
 					if (_topDown)
 					{
@@ -294,27 +348,22 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 			}
 		}
 
-		this->_panelLedCount = _panelIds.size();
-		_devConfig["hardwareLedCount"] = _panelLedCount;
-
 		Debug(_log, "PanelsNum      : %d", panelNum);
 		Debug(_log, "PanelLedCount  : %d", _panelLedCount);
+		Debug(_log, "Sort Top>Down  : %d", _topDown);
+		Debug(_log, "Sort Left>Right: %d", _leftRight);
+
+		DebugIf(verbose, _log, "PanelMap size  : %d", panelMap.size());
+		DebugIf(verbose, _log, "PanelIds count : %d", _panelIds.size());
 
 		// Check. if enough panels were found.
 		int configuredLedCount = this->getLedCount();
-		_endPos = _startPos + configuredLedCount - 1;
-
-		Debug(_log, "Sort Top>Down  : %d", _topDown);
-		Debug(_log, "Sort Left>Right: %d", _leftRight);
-		Debug(_log, "Start Panel Pos: %d", _startPos);
-		Debug(_log, "End Panel Pos  : %d", _endPos);
-
 		if (_panelLedCount < configuredLedCount)
 		{
 			QString errorReason = QString("Not enough panels [%1] for configured LEDs [%2] found!")
-									  .arg(_panelLedCount)
-									  .arg(configuredLedCount);
-			this->setInError(errorReason);
+				.arg(_panelLedCount)
+				.arg(configuredLedCount);
+			this->setInError(errorReason, false);
 			isInitOK = false;
 		}
 		else
@@ -324,15 +373,16 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 				Info(_log, "%s: More panels [%d] than configured LEDs [%d].", QSTRING_CSTR(this->getActiveDeviceType()), _panelLedCount, configuredLedCount);
 			}
 
-			// Check, if start position + number of configured LEDs is greater than number of panels available
-			if (_endPos >= _panelLedCount)
+			//Check that panel count matches working list created for processing
+			if (_panelLedCount != _panelIds.size())
 			{
-				QString errorReason = QString("Start panel [%1] out of range. Start panel position can be max [%2] given [%3] panel available!")
-										  .arg(_startPos).arg(_panelLedCount - configuredLedCount).arg(_panelLedCount);
-
-				this->setInError(errorReason);
+				QString errorReason = QString("Number of available panels [%1] do not match panel-ID look-up list [%2]!")
+					.arg(_panelLedCount)
+					.arg(_panelIds.size());
+				this->setInError(errorReason, false);
 				isInitOK = false;
 			}
+
 		}
 	}
 	return isInitOK;
@@ -340,7 +390,7 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 
 bool LedDeviceNanoleaf::openRestAPI()
 {
-	bool isInitOK {true};
+	bool isInitOK{ true };
 
 	if (_restApi == nullptr)
 	{
@@ -360,7 +410,7 @@ int LedDeviceNanoleaf::open()
 
 	if (NetUtils::resolveHostToAddress(_log, _hostName, _address, _apiPort))
 	{
-		if ( openRestAPI() )
+		if (openRestAPI())
 		{
 			// Read LedDevice configuration and validate against device configuration
 			if (initLedsConfiguration())
@@ -415,7 +465,7 @@ QJsonObject LedDeviceNanoleaf::discover(const QJsonObject& /*params*/)
 		MdnsServiceRegister::getServiceType(_activeDeviceType),
 		MdnsServiceRegister::getServiceNameFilter(_activeDeviceType),
 		DEFAULT_DISCOVER_TIMEOUT
-		);
+	);
 #else
 	QString discoveryMethod("ssdp");
 	deviceList = discover();
@@ -424,25 +474,25 @@ QJsonObject LedDeviceNanoleaf::discover(const QJsonObject& /*params*/)
 	devicesDiscovered.insert("discoveryMethod", discoveryMethod);
 	devicesDiscovered.insert("devices", deviceList);
 
-	DebugIf(verbose,_log, "devicesDiscovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData());
+	DebugIf(verbose, _log, "devicesDiscovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData());
 
 	return devicesDiscovered;
 }
 
 QJsonObject LedDeviceNanoleaf::getProperties(const QJsonObject& params)
 {
-	DebugIf(verbose,_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
+	DebugIf(verbose, _log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
 	QJsonObject properties;
 
 	_hostName = params[CONFIG_HOST].toString("");
 	_apiPort = API_DEFAULT_PORT;
-	_authToken = params["token"].toString("");
+	_authToken = params[CONFIG_AUTH_TOKEN].toString("");
 
-	Info(_log, "Get properties for %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(_hostName) );
+	Info(_log, "Get properties for %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(_hostName));
 
 	if (NetUtils::resolveHostToAddress(_log, _hostName, _address, _apiPort))
 	{
-		if ( openRestAPI() )
+		if (openRestAPI())
 		{
 			QString filter = params["filter"].toString("");
 			_restApi->setPath(filter);
@@ -453,7 +503,14 @@ QJsonObject LedDeviceNanoleaf::getProperties(const QJsonObject& params)
 			{
 				Warning(_log, "%s get properties failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
 			}
-			properties.insert("properties", response.getBody().object());
+			QJsonObject propertiesDetails = response.getBody().object();
+			if (!propertiesDetails.isEmpty())
+			{
+				QJsonObject jsonLayout = propertiesDetails.value(API_PANELLAYOUT).toObject().value(PANEL_LAYOUT).toObject();
+				_panelLedCount = getHwLedCount(jsonLayout);
+				propertiesDetails.insert("ledCount", getHwLedCount(jsonLayout));
+			}
+			properties.insert("properties", propertiesDetails);
 		}
 
 		DebugIf(verbose, _log, "properties: [%s]", QString(QJsonDocument(properties).toJson(QJsonDocument::Compact)).toUtf8().constData());
@@ -463,21 +520,19 @@ QJsonObject LedDeviceNanoleaf::getProperties(const QJsonObject& params)
 
 void LedDeviceNanoleaf::identify(const QJsonObject& params)
 {
-	DebugIf(verbose,_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
+	DebugIf(verbose, _log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
 
 	_hostName = params[CONFIG_HOST].toString("");
-	_apiPort = API_DEFAULT_PORT;if (NetUtils::resolveHostToAddress(_log, _hostName, _address))
-	_authToken = params["token"].toString("");
+	_apiPort = API_DEFAULT_PORT;
+	_authToken = params[CONFIG_AUTH_TOKEN].toString("");
 
-	Info(_log, "Identify %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(_hostName) );
+	Info(_log, "Identify %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(_hostName));
 
 	if (NetUtils::resolveHostToAddress(_log, _hostName, _address, _apiPort))
 	{
-		if ( openRestAPI() )
+		if (openRestAPI())
 		{
-			_restApi->setPath("identify");
-
-			// Perform request
+			_restApi->setPath(API_IDENTIFY);
 			httpResponse response = _restApi->put();
 			if (response.error())
 			{
@@ -487,6 +542,36 @@ void LedDeviceNanoleaf::identify(const QJsonObject& params)
 	}
 }
 
+QJsonObject LedDeviceNanoleaf::addAuthorization(const QJsonObject& params)
+{
+	Debug(_log, "params: [%s]", QJsonDocument(params).toJson(QJsonDocument::Compact).constData());
+	QJsonObject responseBody;
+
+	_hostName = params[CONFIG_HOST].toString("");
+	_apiPort = API_DEFAULT_PORT;
+
+	Info(_log, "Generate user authorization token for %s, hostname (%s)", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(_hostName));
+
+	if (NetUtils::resolveHostToAddress(_log, _hostName, _address, _apiPort))
+	{
+		if (openRestAPI())
+		{
+			_restApi->setBasePath(QString(API_BASE_PATH).arg(API_ADD_USER));
+			httpResponse response = _restApi->post();
+			if (response.error())
+			{
+				Warning(_log, "%s generating user authorization token failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+			}
+			else
+			{
+				Debug(_log, "Generated user authorization token: \"%s\"", QSTRING_CSTR(response.getBody().object().value("auth_token").toString()));
+				responseBody = response.getBody().object();
+			}
+		}
+	}
+	return responseBody;
+}
+
 bool LedDeviceNanoleaf::powerOn()
 {
 	bool on = false;
@@ -496,12 +581,12 @@ bool LedDeviceNanoleaf::powerOn()
 		{
 			QJsonObject newState;
 
-			QJsonObject onValue { {STATE_VALUE, true} };
+			QJsonObject onValue{ {STATE_VALUE, true} };
 			newState.insert(STATE_ON, onValue);
 
-			if ( _isBrightnessOverwrite)
+			if (_isBrightnessOverwrite)
 			{
-				QJsonObject briValue { {STATE_VALUE, _brightness} };
+				QJsonObject briValue{ {STATE_VALUE, _brightness} };
 				newState.insert(STATE_BRI, briValue);
 			}
 
@@ -511,9 +596,10 @@ bool LedDeviceNanoleaf::powerOn()
 			if (response.error())
 			{
 				QString errorReason = QString("Power-on request failed with error: '%1'").arg(response.getErrorReason());
-				this->setInError ( errorReason );
+				this->setInError(errorReason);
 				on = false;
-			} else {
+			}
+			else {
 				on = true;
 			}
 
@@ -529,7 +615,7 @@ bool LedDeviceNanoleaf::powerOff()
 	{
 		QJsonObject newState;
 
-		QJsonObject onValue { {STATE_VALUE, false} };
+		QJsonObject onValue{ {STATE_VALUE, false} };
 		newState.insert(STATE_ON, onValue);
 
 		//Power-off the Nanoleaf device physically
@@ -538,7 +624,7 @@ bool LedDeviceNanoleaf::powerOff()
 		if (response.error())
 		{
 			QString errorReason = QString("Power-off request failed with error: '%1'").arg(response.getErrorReason());
-			this->setInError ( errorReason );
+			this->setInError(errorReason);
 			off = false;
 		}
 	}
@@ -549,12 +635,12 @@ bool LedDeviceNanoleaf::storeState()
 {
 	bool rc = true;
 
-	if ( _isRestoreOrigState )
+	if (_isRestoreOrigState)
 	{
 		_restApi->setPath(API_STATE);
 
 		httpResponse response = _restApi->get();
-		if ( response.error() )
+		if (response.error())
 		{
 			QString errorReason = QString("Storing device state failed with error: '%1'").arg(response.getErrorReason());
 			setInError(errorReason);
@@ -563,7 +649,7 @@ bool LedDeviceNanoleaf::storeState()
 		else
 		{
 			_originalStateProperties = response.getBody().object();
-			DebugIf(verbose, _log, "state: [%s]", QString(QJsonDocument(_originalStateProperties).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+			DebugIf(verbose, _log, "state: [%s]", QString(QJsonDocument(_originalStateProperties).toJson(QJsonDocument::Compact)).toUtf8().constData());
 
 			QJsonObject isOn = _originalStateProperties.value(STATE_ON).toObject();
 			if (!isOn.isEmpty())
@@ -579,7 +665,7 @@ bool LedDeviceNanoleaf::storeState()
 
 			_originalColorMode = _originalStateProperties[STATE_COLORMODE].toString();
 
-			switch(COLOR_MODES.indexOf(_originalColorMode)) {
+			switch (COLOR_MODES.indexOf(_originalColorMode)) {
 			case 0:
 			{
 				// hs
@@ -611,7 +697,7 @@ bool LedDeviceNanoleaf::storeState()
 				_restApi->setPath(API_EFFECT);
 
 				httpResponse responseEffects = _restApi->get();
-				if ( responseEffects.error() )
+				if (responseEffects.error())
 				{
 					QString errorReason = QString("Storing device state failed with error: '%1'").arg(responseEffects.getErrorReason());
 					setInError(errorReason);
@@ -620,7 +706,7 @@ bool LedDeviceNanoleaf::storeState()
 				else
 				{
 					QJsonObject effects = responseEffects.getBody().object();
-					DebugIf(verbose, _log, "effects: [%s]", QString(QJsonDocument(_originalStateProperties).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+					DebugIf(verbose, _log, "effects: [%s]", QString(QJsonDocument(_originalStateProperties).toJson(QJsonDocument::Compact)).toUtf8().constData());
 					_originalEffect = effects[API_EFFECT_SELECT].toString();
 					_originalIsDynEffect = _originalEffect == "*Dynamic*" || _originalEffect == "*Solid*";
 				}
@@ -641,21 +727,21 @@ bool LedDeviceNanoleaf::restoreState()
 {
 	bool rc = true;
 
-	if ( _isRestoreOrigState )
+	if (_isRestoreOrigState)
 	{
 		QJsonObject newState;
-		switch(COLOR_MODES.indexOf(_originalColorMode)) {
+		switch (COLOR_MODES.indexOf(_originalColorMode)) {
 		case 0:
 		{	// hs
-			QJsonObject hueValue { {STATE_VALUE, _originalHue} };
+			QJsonObject hueValue{ {STATE_VALUE, _originalHue} };
 			newState.insert(STATE_HUE, hueValue);
-			QJsonObject satValue { {STATE_VALUE, _originalSat} };
+			QJsonObject satValue{ {STATE_VALUE, _originalSat} };
 			newState.insert(STATE_SAT, satValue);
 			break;
 		}
 		case 1:
 		{	// ct
-			QJsonObject ctValue { {STATE_VALUE, _originalCt} };
+			QJsonObject ctValue{ {STATE_VALUE, _originalCt} };
 			newState.insert(STATE_CT, ctValue);
 			break;
 		}
@@ -667,37 +753,38 @@ bool LedDeviceNanoleaf::restoreState()
 				newEffect[API_EFFECT_SELECT] = _originalEffect;
 				_restApi->setPath(API_EFFECT);
 				httpResponse response = _restApi->put(newEffect);
-				if ( response.error() )
+				if (response.error())
 				{
-					Warning (_log, "%s restoring effect failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+					Warning(_log, "%s restoring effect failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
 				}
-			} else {
-				Warning (_log, "%s restoring effect failed with error: Cannot restore dynamic or solid effect. Device is switched off", QSTRING_CSTR(_activeDeviceType));
+			}
+			else {
+				Warning(_log, "%s restoring effect failed with error: Cannot restore dynamic or solid effect. Device is switched off", QSTRING_CSTR(_activeDeviceType));
 				_originalIsOn = false;
 			}
 			break;
 		}
 		default:
-			Warning (_log, "%s restoring failed with error: Unknown ColorMode", QSTRING_CSTR(_activeDeviceType));
+			Warning(_log, "%s restoring failed with error: Unknown ColorMode", QSTRING_CSTR(_activeDeviceType));
 			rc = false;
 		}
 
 		if (!_originalIsDynEffect)
 		{
-			QJsonObject briValue { {STATE_VALUE, _originalBri} };
+			QJsonObject briValue{ {STATE_VALUE, _originalBri} };
 			newState.insert(STATE_BRI, briValue);
 		}
 
-		QJsonObject onValue { {STATE_VALUE, _originalIsOn} };
+		QJsonObject onValue{ {STATE_VALUE, _originalIsOn} };
 		newState.insert(STATE_ON, onValue);
 
 		_restApi->setPath(API_STATE);
 
 		httpResponse response = _restApi->put(newState);
 
-		if ( response.error() )
+		if (response.error())
 		{
-			Warning (_log, "%s restoring state failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+			Warning(_log, "%s restoring state failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
 			rc = false;
 		}
 	}
@@ -722,7 +809,7 @@ bool LedDeviceNanoleaf::changeToExternalControlMode(QJsonDocument& resp)
 	if (response.error())
 	{
 		QString errorReason = QString("Change to external control mode failed with error: '%1'").arg(response.getErrorReason());
-		this->setInError ( errorReason );
+		this->setInError(errorReason);
 	}
 	else
 	{
@@ -758,29 +845,24 @@ int LedDeviceNanoleaf::write(const std::vector<ColorRgb>& ledValues)
 
 	ColorRgb color;
 
-	//Maintain LED counter independent from PanelCounter
-	int ledCounter = 0;
-	for (int panelCounter = 0; panelCounter < _panelLedCount; panelCounter++)
+	for (int panelCounter = 0; panelCounter < _panelLedCount; ++panelCounter)
 	{
+		// Set panelID
 		int panelID = _panelIds[panelCounter];
+		qToBigEndian<quint16>(static_cast<quint16>(panelID), udpbuffer.data() + i);
+		i += 2;
 
-		// Set panels configured
-		if (panelCounter >= _startPos && panelCounter <= _endPos) {
-			color = static_cast<ColorRgb>(ledValues.at(ledCounter));
-			++ledCounter;
+		// Set panel's color LEDs
+		if (panelCounter < this->getLedCount()) {
+			color = static_cast<ColorRgb>(ledValues.at(panelCounter));
 		}
 		else
 		{
 			// Set panels not configured to black
 			color = ColorRgb::BLACK;
-			DebugIf(verbose3, _log, "[%d] >= panelLedCount [%d] => Set to BLACK", panelCounter, _panelLedCount);
+			DebugIf(verbose3, _log, "[%u] >= panelLedCount [%u] => Set to BLACK", panelCounter, _panelLedCount);
 		}
 
-		// Set panelID
-		qToBigEndian<quint16>(static_cast<quint16>(panelID), udpbuffer.data() + i);
-		i += 2;
-
-		// Set panel's color LEDs
 		udpbuffer[i++] = static_cast<char>(color.red);
 		udpbuffer[i++] = static_cast<char>(color.green);
 		udpbuffer[i++] = static_cast<char>(color.blue);
@@ -799,7 +881,7 @@ int LedDeviceNanoleaf::write(const std::vector<ColorRgb>& ledValues)
 	if (verbose3)
 	{
 		Debug(_log, "UDP-Address [%s], UDP-Port [%u], udpBufferSize[%d], Bytes to send [%d]", QSTRING_CSTR(_address.toString()), _port, udpBufferSize, i);
-		Debug( _log, "packet: [%s]", QSTRING_CSTR(toHex(udpbuffer, 64)));
+		Debug(_log, "packet: [%s]", QSTRING_CSTR(toHex(udpbuffer, 64)));
 	}
 
 	retVal = writeBytes(udpbuffer);
diff --git a/libsrc/leddevice/dev_net/LedDeviceNanoleaf.h b/libsrc/leddevice/dev_net/LedDeviceNanoleaf.h
index a1df1f80..8aae03ec 100644
--- a/libsrc/leddevice/dev_net/LedDeviceNanoleaf.h
+++ b/libsrc/leddevice/dev_net/LedDeviceNanoleaf.h
@@ -87,6 +87,20 @@ public:
 	///
 	void identify(const QJsonObject& params) override;
 
+	/// @brief Add an API-token to the Nanoleaf device
+	///
+	/// Following parameters are required
+	/// @code
+	/// {
+	///     "host"  : "hostname or IP",
+	/// }
+	///@endcode
+	///
+	/// @param[in] params Parameters to query device
+	/// @return A JSON structure holding the authorization keys
+	///
+	QJsonObject addAuthorization(const QJsonObject& params) override;
+
 protected:
 
 	///
@@ -147,6 +161,27 @@ protected:
 
 private:
 
+	// Nanoleaf Panel Shapetypes
+	enum SHAPETYPES {
+		TRIANGLE = 0,
+		RHYTM = 1,
+		SQUARE = 2,
+		CONTROL_SQUARE_PRIMARY = 3,
+		CONTROL_SQUARE_PASSIVE = 4,
+		POWER_SUPPLY = 5,
+		HEXAGON_SHAPES = 7,
+		TRIANGE_SHAPES = 8,
+		MINI_TRIANGE_SHAPES = 9,
+		SHAPES_CONTROLLER = 12,
+		ELEMENTS_HEXAGONS = 14,
+		ELEMENTS_HEXAGONS_CORNER = 15,
+		LINES_CONECTOR = 16,
+		LIGHT_LINES = 17,
+		LIGHT_LINES_SINGLZONE = 18,
+		CONTROLLER_CAP = 19,
+		POWER_CONNECTOR = 20
+	};
+
 	///
 	/// @brief Initialise the access to the REST-API wrapper
 	///
@@ -182,6 +217,20 @@ private:
 	///
 	QJsonArray discover();
 
+	///
+	/// @brief Get number of panels that can be used as LEds.
+	///
+	/// @return Number of usable LED panels
+	///
+	int getHwLedCount(const QJsonObject& jsonLayout) const;
+
+	///
+	/// @brief Check, if panelshape type has LEDs
+	///
+	/// @return True, if panel shape type has LEDs
+	///
+	bool hasLEDs(const SHAPETYPES& panelshapeType) const;
+
 	///REST-API wrapper
 	ProviderRestApi* _restApi;
 	int	_apiPort;
@@ -189,8 +238,6 @@ private:
 
 	bool _topDown;
 	bool _leftRight;
-	int _startPos;
-	int _endPos;
 
 	//Nanoleaf device details
 	QString _deviceModel;
diff --git a/libsrc/leddevice/dev_net/ProviderRestApi.cpp b/libsrc/leddevice/dev_net/ProviderRestApi.cpp
index 359a4ea5..e2d07475 100644
--- a/libsrc/leddevice/dev_net/ProviderRestApi.cpp
+++ b/libsrc/leddevice/dev_net/ProviderRestApi.cpp
@@ -318,7 +318,6 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply)
 		}
 		else
 		{
-			qDebug() << "httpStatusCode: "<< httpStatusCode;
 			if (httpStatusCode > 0) {
 				QString httpReason = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
 				QString advise;
@@ -327,7 +326,7 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply)
 					advise = "Check Request Body";
 					break;
 				case HttpStatusCode::UnAuthorized:
-					advise = "Check Authentication Token (API Key)";
+					advise = "Check Authorization Token (API Key)";
 					break;
 				case HttpStatusCode::Forbidden:
 					advise = "No permission to access the given resource";
diff --git a/libsrc/leddevice/schemas/schema-nanoleaf.json b/libsrc/leddevice/schemas/schema-nanoleaf.json
index e975d763..c1afd126 100644
--- a/libsrc/leddevice/schemas/schema-nanoleaf.json
+++ b/libsrc/leddevice/schemas/schema-nanoleaf.json
@@ -72,41 +72,28 @@
       "propertyOrder": 7
     },
     "panelOrderTopDown": {
-      "type": "integer",
+      "type": "string",
       "title": "edt_dev_spec_order_top_down_title",
-      "enum": [ 0, 1 ],
-      "default": 0,
+      "enum": [ "top2down", "bottom2up" ],
+      "default": "top2down",
       "required": true,
       "options": {
         "enum_titles": [ "edt_conf_enum_top_down", "edt_conf_enum_bottom_up" ]
       },
-      "minimum": 0,
-      "maximum": 1,
       "access": "advanced",
       "propertyOrder": 8
     },
     "panelOrderLeftRight": {
-      "type": "integer",
+      "type": "string",
       "title": "edt_dev_spec_order_left_right_title",
-      "enum": [ 0, 1 ],
-      "default": 0,
+      "enum": [ "left2right", "right2left" ],
+      "default": "left2right",
       "required": true,
       "options": {
         "enum_titles": [ "edt_conf_enum_left_right", "edt_conf_enum_right_left" ]
       },
-      "minimum": 0,
-      "maximum": 1,
       "access": "advanced",
       "propertyOrder": 9
-    },
-    "panelStartPos": {
-      "type": "integer",
-      "title": "edt_dev_spec_panel_start_position",
-      "step": 1,
-      "minimum": 0,
-      "default": 0,
-      "access": "advanced",
-      "propertyOrder": 10
     }
   },
   "additionalProperties": true