diff --git a/assets/webconfig/css/hyperion.css b/assets/webconfig/css/hyperion.css
index 9f2ce55b..6d06046f 100644
--- a/assets/webconfig/css/hyperion.css
+++ b/assets/webconfig/css/hyperion.css
@@ -24,14 +24,35 @@ body{
 */
 /* fixed brand icon */
 @media (min-width: 768px){
-    .navbar-brand{position:fixed}
-  #main-nav{position:absolute !important;}
+  #wrapper{
+    padding-left: 10px;
+    padding-bottom: 10px;
+    padding-right: 10px;
+  }
+  .navbar-brand{
+    position:fixed;
+    padding: 0px;
+    height: 80px;
+  }
+  #main-nav{
+    position:absolute !important;
+  }
+  .navbar-top-links li a {
+    font-size: 22px;
+  }
 }
 
 /*mobile nav*/
 @media (max-width: 768px){
-    .navbar-toggle{position:fixed;right:0px;}
-    #main-nav{position:fixed;right:-200px;}
+    #wrapper{
+      padding: 0px;
+    }
+    .navbar-toggle{
+      position:fixed;right:0px;
+    }
+    #main-nav{
+      position:fixed;right:-200px;
+    }
 }
 .navbar-toggle .icon-bar {
   background-color:#4c4c4c !important;
@@ -83,14 +104,14 @@ table.first_cell_borderless td:first-child,table.first_cell_borderless th:first-
 table.first_cell_borderless td:first-child{width: 25px !important;}
 
 /*Header*/
-.navbar-brand{padding-top:4px;padding-bottom:0px;padding-left:2;}
-.sidebar{margin-top:65px;}
+.navbar-brand{padding-top:0px;padding-left:2;}
+.sidebar{margin-top:85px;}
 .dropdown{font-size:18px;}
 @media (max-width: 767px) {.sidebar{margin-top:0px;padding-top:0px !important;}}
 .page-header{margin-top:0px;}
 
 .navbar-top-links li a {
-    min-height: 64px;
+    min-height: 84px;
     display: flex;
     align-items: center;
 }
diff --git a/assets/webconfig/img/hyperion/logo_negativ.png b/assets/webconfig/img/hyperion/logo_negativ.png
index 2a41de0e..2d356c5a 100644
Binary files a/assets/webconfig/img/hyperion/logo_negativ.png and b/assets/webconfig/img/hyperion/logo_negativ.png differ
diff --git a/assets/webconfig/img/hyperion/logo_positiv.png b/assets/webconfig/img/hyperion/logo_positiv.png
index ff2b02e7..00dfd110 100644
Binary files a/assets/webconfig/img/hyperion/logo_positiv.png and b/assets/webconfig/img/hyperion/logo_positiv.png differ
diff --git a/assets/webconfig/index.html b/assets/webconfig/index.html
index 99ccb844..d50aeca9 100644
--- a/assets/webconfig/index.html
+++ b/assets/webconfig/index.html
@@ -101,7 +101,7 @@
   <div id="wrapper">
 
     <!-- Navigation -->
-    <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0; min-height: 65px">
+    <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0; min-height: 85px">
       <div class="navbar-header">
         <button type="button" class="navbar-toggle closed" aria-controls="navbar">
           <span class="sr-only">Toggle navigation</span>
@@ -109,7 +109,7 @@
           <span class="icon-bar middle-bar"></span>
           <span class="icon-bar bottom-bar"></span>
         </button>
-        <a class="navbar-brand" href="https://www.hyperion-project.org" target="_blank"><img id="navbar_brand_logo" src="img/hyperion/logo_positiv.png" alt="Redefine ambient light!" height="60"></a>
+        <a class="navbar-brand" href="https://www.hyperion-project.org" target="_blank"><img id="navbar_brand_logo" src="img/hyperion/logo_positiv.png" alt="Redefine ambient light!" height="80"></a>
 
       </div>
       <!-- /.navbar-header -->
diff --git a/assets/webconfig/js/ledsim.js b/assets/webconfig/js/ledsim.js
index ec62fe97..e51b7601 100644
--- a/assets/webconfig/js/ledsim.js
+++ b/assets/webconfig/js/ledsim.js
@@ -112,6 +112,7 @@ $(document).ready(function () {
       },
       closed: function (e) {
         modalOpened = false;
+        lC = false;
       },
       resizeStop: function (e) {
         setStorage("ledsim_width", $("#ledsim_dialog").outerWidth());
diff --git a/cmake/debian/postinst b/cmake/debian/postinst
index 4cef9515..2a1100e4 100644
--- a/cmake/debian/postinst
+++ b/cmake/debian/postinst
@@ -16,7 +16,7 @@ install_file()
 }
 
 
-echo "---Hyperion ambient light postinstall ---"
+echo "--- Hyperion ambient light postinstall ---"
 
 #check system
 CPU_RPI=`grep -m1 -c 'BCM2708\|BCM2709\|BCM2710\|BCM2835\|BCM2836\|BCM2837\|BCM2711' /proc/cpuinfo`
diff --git a/cmake/desktop/hyperiond_128.png b/cmake/desktop/hyperiond_128.png
index be7b4b16..fa0fb12b 100644
Binary files a/cmake/desktop/hyperiond_128.png and b/cmake/desktop/hyperiond_128.png differ
diff --git a/include/hyperion/GrabberWrapper.h b/include/hyperion/GrabberWrapper.h
index 2091c110..9abe5daf 100644
--- a/include/hyperion/GrabberWrapper.h
+++ b/include/hyperion/GrabberWrapper.h
@@ -23,6 +23,8 @@ class QTimer;
 /// Map of Hyperion instances with grabber name that requested screen capture
 static QMap<int, QString> GRABBER_SYS_CLIENTS;
 static QMap<int, QString> GRABBER_V4L_CLIENTS;
+static bool GLOBAL_GRABBER_SYS_ENABLE;
+static bool GLOBAL_GRABBER_V4L_ENABLE;
 
 ///
 /// This class will be inherted by FramebufferWrapper and others which contains the real capture interface
diff --git a/libsrc/grabber/video/VideoWrapper.cpp b/libsrc/grabber/video/VideoWrapper.cpp
index 6f4c9d55..26814b57 100644
--- a/libsrc/grabber/video/VideoWrapper.cpp
+++ b/libsrc/grabber/video/VideoWrapper.cpp
@@ -53,67 +53,73 @@ void VideoWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument
 		// extract settings
 		const QJsonObject& obj = config.object();
 
-		// Device
-		_grabber.setDevice(obj["device"].toString("auto"));
+		// global grabber state
+		GLOBAL_GRABBER_V4L_ENABLE = obj["enable"].toBool(false);
 
-		// Device input
-		_grabber.setInput(obj["input"].toInt(0));
+		if (GLOBAL_GRABBER_V4L_ENABLE)
+		{
+			// Device
+			_grabber.setDevice(obj["device"].toString("auto"));
 
-		// Device resolution
-		_grabber.setWidthHeight(obj["width"].toInt(0), obj["height"].toInt(0));
+			// Device input
+			_grabber.setInput(obj["input"].toInt(0));
 
-		// Device framerate
-		_grabber.setFramerate(obj["fps"].toInt(15));
+			// Device resolution
+			_grabber.setWidthHeight(obj["width"].toInt(0), obj["height"].toInt(0));
 
-		// Device encoding format
-		_grabber.setEncoding(obj["encoding"].toString("NO_CHANGE"));
+			// Device framerate
+			_grabber.setFramerate(obj["fps"].toInt(15));
 
-		// Video standard
-		_grabber.setVideoStandard(parseVideoStandard(obj["standard"].toString("NO_CHANGE")));
+			// Device encoding format
+			_grabber.setEncoding(obj["encoding"].toString("NO_CHANGE"));
 
-		// Image size decimation
-		_grabber.setPixelDecimation(obj["sizeDecimation"].toInt(8));
+			// Video standard
+			_grabber.setVideoStandard(parseVideoStandard(obj["standard"].toString("NO_CHANGE")));
 
-		// Flip mode
-		_grabber.setFlipMode(parseFlipMode(obj["flip"].toString("NO_CHANGE")));
+			// Image size decimation
+			_grabber.setPixelDecimation(obj["sizeDecimation"].toInt(8));
 
-		// Image cropping
-		_grabber.setCropping(
-			obj["cropLeft"].toInt(0),
-			obj["cropRight"].toInt(0),
-			obj["cropTop"].toInt(0),
-			obj["cropBottom"].toInt(0));
+			// Flip mode
+			_grabber.setFlipMode(parseFlipMode(obj["flip"].toString("NO_CHANGE")));
 
-		// Brightness, Contrast, Saturation, Hue
-		_grabber.setBrightnessContrastSaturationHue(
-			obj["hardware_brightness"].toInt(0),
-			obj["hardware_contrast"].toInt(0),
-			obj["hardware_saturation"].toInt(0),
-			obj["hardware_hue"].toInt(0));
+			// Image cropping
+			_grabber.setCropping(
+				obj["cropLeft"].toInt(0),
+				obj["cropRight"].toInt(0),
+				obj["cropTop"].toInt(0),
+				obj["cropBottom"].toInt(0));
+
+			// Brightness, Contrast, Saturation, Hue
+			_grabber.setBrightnessContrastSaturationHue(
+				obj["hardware_brightness"].toInt(0),
+				obj["hardware_contrast"].toInt(0),
+				obj["hardware_saturation"].toInt(0),
+				obj["hardware_hue"].toInt(0));
 
 #if defined(ENABLE_CEC) && defined(ENABLE_V4L2)
-		// CEC Standby
-		_grabber.setCecDetectionEnable(obj["cecDetection"].toBool(true));
+			// CEC Standby
+			_grabber.setCecDetectionEnable(obj["cecDetection"].toBool(true));
 #endif
 
-		// Software frame skipping
-		_grabber.setFpsSoftwareDecimation(obj["fpsSoftwareDecimation"].toInt(1));
+			// Software frame skipping
+			_grabber.setFpsSoftwareDecimation(obj["fpsSoftwareDecimation"].toInt(1));
 
-		// Signal detection
-		_grabber.setSignalDetectionEnable(obj["signalDetection"].toBool(true));
-		_grabber.setSignalDetectionOffset(
-			obj["sDHOffsetMin"].toDouble(0.25),
-			obj["sDVOffsetMin"].toDouble(0.25),
-			obj["sDHOffsetMax"].toDouble(0.75),
-			obj["sDVOffsetMax"].toDouble(0.75));
-		_grabber.setSignalThreshold(
-			obj["redSignalThreshold"].toDouble(0.0)/100.0,
-			obj["greenSignalThreshold"].toDouble(0.0)/100.0,
-			obj["blueSignalThreshold"].toDouble(0.0)/100.0,
-			obj["noSignalCounterThreshold"].toInt(50));
+			// Signal detection
+			_grabber.setSignalDetectionEnable(obj["signalDetection"].toBool(true));
+			_grabber.setSignalDetectionOffset(
+				obj["sDHOffsetMin"].toDouble(0.25),
+				obj["sDVOffsetMin"].toDouble(0.25),
+				obj["sDHOffsetMax"].toDouble(0.75),
+				obj["sDVOffsetMax"].toDouble(0.75));
+			_grabber.setSignalThreshold(
+				obj["redSignalThreshold"].toDouble(0.0)/100.0,
+				obj["greenSignalThreshold"].toDouble(0.0)/100.0,
+				obj["blueSignalThreshold"].toDouble(0.0)/100.0,
+				obj["noSignalCounterThreshold"].toInt(50));
 
-		// Reload the Grabber if any settings have been changed that require it
-		_grabber.reload();
+			// Reload the Grabber if any settings have been changed that require it
+			_grabber.reload();
+		}
 	}
 }
 
diff --git a/libsrc/hyperion/CaptureCont.cpp b/libsrc/hyperion/CaptureCont.cpp
index 11226164..3cb566ed 100644
--- a/libsrc/hyperion/CaptureCont.cpp
+++ b/libsrc/hyperion/CaptureCont.cpp
@@ -127,8 +127,8 @@ void CaptureCont::handleSettingsUpdate(settings::type type, const QJsonDocument&
 			_systemCaptPrio = obj["systemPriority"].toInt(250);
 		}
 
-		setV4LCaptureEnable(obj["v4lEnable"].toBool(true));
-		setSystemCaptureEnable(obj["systemEnable"].toBool(true));
+		setV4LCaptureEnable(obj["v4lEnable"].toBool(false));
+		setSystemCaptureEnable(obj["systemEnable"].toBool(false));
 	}
 }
 
diff --git a/libsrc/hyperion/GrabberWrapper.cpp b/libsrc/hyperion/GrabberWrapper.cpp
index 68002181..8e9a912c 100644
--- a/libsrc/hyperion/GrabberWrapper.cpp
+++ b/libsrc/hyperion/GrabberWrapper.cpp
@@ -165,33 +165,38 @@ void GrabberWrapper::updateTimer(int interval)
 }
 
 void GrabberWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
-{
-	if(type == settings::SYSTEMCAPTURE && !_grabberName.startsWith("V4L"))
+{	if(type == settings::SYSTEMCAPTURE && !_grabberName.startsWith("V4L"))
 	{
 		// extract settings
 		const QJsonObject& obj = config.object();
 
-		// width/height
-		_ggrabber->setWidthHeight(obj["width"].toInt(96), obj["height"].toInt(96));
+		// global grabber state
+		GLOBAL_GRABBER_SYS_ENABLE = obj["enable"].toBool(false);
 
-		// display index for MAC
-		_ggrabber->setDisplayIndex(obj["input"].toInt(0));
+		if (GLOBAL_GRABBER_SYS_ENABLE)
+		{
+			// width/height
+			_ggrabber->setWidthHeight(obj["width"].toInt(96), obj["height"].toInt(96));
 
-		// device path for Framebuffer
-		_ggrabber->setDevicePath(obj["device"].toString("/dev/fb0"));
+			// display index for MAC
+			_ggrabber->setDisplayIndex(obj["input"].toInt(0));
 
-		// pixel decimation for x11
-		_ggrabber->setPixelDecimation(obj["pixelDecimation"].toInt(8));
+			// device path for Framebuffer
+			_ggrabber->setDevicePath(obj["device"].toString("/dev/fb0"));
 
-		// crop for system capture
-		_ggrabber->setCropping(
-			obj["cropLeft"].toInt(0),
-			obj["cropRight"].toInt(0),
-			obj["cropTop"].toInt(0),
-			obj["cropBottom"].toInt(0));
+			// pixel decimation for x11
+			_ggrabber->setPixelDecimation(obj["pixelDecimation"].toInt(8));
 
-		// eval new update time
-		updateTimer(1000/obj["fps"].toInt(10));
+			// crop for system capture
+			_ggrabber->setCropping(
+				obj["cropLeft"].toInt(0),
+				obj["cropRight"].toInt(0),
+				obj["cropTop"].toInt(0),
+				obj["cropBottom"].toInt(0));
+
+			// eval new update time
+			updateTimer(1000/obj["fps"].toInt(10));
+		}
 	}
 }
 
@@ -204,7 +209,7 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
 		else
 			GRABBER_SYS_CLIENTS.remove(hyperionInd);
 
-		if(GRABBER_SYS_CLIENTS.empty())
+		if(GRABBER_SYS_CLIENTS.empty() || !GLOBAL_GRABBER_SYS_ENABLE)
 			stop();
 		else
 			start();
@@ -216,7 +221,7 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
 		else
 			GRABBER_V4L_CLIENTS.remove(hyperionInd);
 
-		if(GRABBER_V4L_CLIENTS.empty())
+		if(GRABBER_V4L_CLIENTS.empty() || !GLOBAL_GRABBER_V4L_ENABLE)
 			stop();
 		else
 			start();
@@ -226,8 +231,6 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
 void GrabberWrapper::tryStart()
 {
 	// verify start condition
-	if((_grabberName.startsWith("V4L") && !GRABBER_V4L_CLIENTS.empty()) || (!_grabberName.startsWith("V4L") && !GRABBER_SYS_CLIENTS.empty()))
-	{
+	if(!_grabberName.startsWith("V4L") && !GRABBER_SYS_CLIENTS.empty() && GLOBAL_GRABBER_SYS_ENABLE)
 		start();
-	}
 }
diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp
index 2b30a795..44d636dd 100644
--- a/src/hyperiond/hyperiond.cpp
+++ b/src/hyperiond/hyperiond.cpp
@@ -493,7 +493,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberFramebuffer(grabberConfig);
 				}
 				#ifdef ENABLE_FB
-				_fbGrabber->tryStart();
+					_dispmanx->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
+					_dispmanx->tryStart();
 				#endif
 			}
 			else if (type == "dispmanx")
@@ -503,7 +504,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberDispmanx();
 				}
 				#ifdef ENABLE_DISPMANX
-				_dispmanx->tryStart();
+					_dispmanx->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
+					_dispmanx->tryStart();
 				#endif
 			}
 			else if (type == "amlogic")
@@ -513,7 +515,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberAmlogic();
 				}
 				#ifdef ENABLE_AMLOGIC
-				_amlGrabber->tryStart();
+					_amlGrabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
+					_amlGrabber->tryStart();
 				#endif
 			}
 			else if (type == "osx")
@@ -523,7 +526,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberOsx(grabberConfig);
 				}
 				#ifdef ENABLE_OSX
-				_osxGrabber->tryStart();
+					_osxGrabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
+					_osxGrabber->tryStart();
 				#endif
 			}
 			else if (type == "x11")
@@ -533,7 +537,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberX11(grabberConfig);
 				}
 				#ifdef ENABLE_X11
-				_x11Grabber->tryStart();
+					_x11Grabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
+					_x11Grabber->tryStart();
 				#endif
 			}
 			else if (type == "xcb")
@@ -543,7 +548,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberXcb(grabberConfig);
 				}
 				#ifdef ENABLE_XCB
-				_xcbGrabber->tryStart();
+					_xcbGrabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
+					_xcbGrabber->tryStart();
 				#endif
 			}
 			else if (type == "qt")
@@ -553,7 +559,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberQt(grabberConfig);
 				}
 				#ifdef ENABLE_QT
-				_qtGrabber->tryStart();
+					_qtGrabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
+					_qtGrabber->tryStart();
 				#endif
 			}
 			else if (type == "dx")
@@ -563,7 +570,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberDx(grabberConfig);
 				}
 				#ifdef ENABLE_DX
-				_dxGrabber->tryStart();
+				// _dxGrabber->tryStart();
 				#endif
 			}
 			else
@@ -577,11 +584,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 	else if (settingsType == settings::V4L2)
 	{
 
-#if defined(ENABLE_CEC) || defined(ENABLE_V4L2) || defined(ENABLE_MF)
-		const QJsonObject& grabberConfig = config.object();
-#endif
-
 #ifdef ENABLE_CEC
+		const QJsonObject& grabberConfig = config.object();
 		if (_cecHandler != nullptr && grabberConfig["cecDetection"].toBool(false))
 		{
 			QMetaObject::invokeMethod(_cecHandler, "start", Qt::QueuedConnection);
@@ -596,7 +600,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 		if (_videoGrabber == nullptr)
 		{
 			_videoGrabber = new VideoWrapper();
-			_videoGrabber->handleSettingsUpdate(settings::V4L2, QJsonDocument(grabberConfig));
+			_videoGrabber->handleSettingsUpdate(settings::V4L2, getSetting(settings::V4L2));
 
 #if defined(ENABLE_MF)
 			Debug(_log, "Media Foundation grabber created");