diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json
index 35dbf291..f72243e0 100644
--- a/assets/webconfig/i18n/de.json
+++ b/assets/webconfig/i18n/de.json
@@ -20,6 +20,7 @@
 	"general_comp_FORWARDER" : "Weiterleitung",
 	"general_comp_UDPLISTENER" : "UDP Listener",
 	"general_comp_BOBLIGHTSERVER" : "Boblight Server",
+	"general_comp_FLATBUFSERVER" : "Flatbuffers Server",
 	"general_comp_GRABBER" : "Plattform Aufnahme",
 	"general_comp_V4L" : "USB Aufnahme",
 	"general_comp_LEDDEVICE" : "LED Hardware",
@@ -163,7 +164,6 @@
 	"conf_colors_smoothing_intro" : "Glätte den Farbverlauf und Helligkeitsänderungen um nicht von schnellen Übergängen abgelenkt zu werden.",
 	"conf_colors_blackborder_intro" : "Ignoriere schwarze Balken, jeder Modus nutzt einen anderen Algorithmus um diese zu erkennen. Erhöhe die Schwelle, sollte es nicht funktionieren.",
 	"conf_network_json_intro" : "Der JSON-RPC-Port dieser Hyperion-Instanz, wird genutzt zur Fernsteuerung.",
-	"conf_network_proto_intro" : "Der PROTO-Port dieser Hyperion-Instanz, wird genutzt für \"Bildstreams\" (HyperionScreenCap, Kodi Adddon, ...)",
 	"conf_network_bobl_intro" : "Boblight Empfänger",
 	"conf_network_udpl_intro" : "UDP Empfänger",
 	"conf_network_fbs_intro" : "Google Flatbuffers Empfänger. Wird genutzt für schnellen Bildempfang.",
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index 0f49ee8a..693a248e 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -20,6 +20,7 @@
 	"general_comp_FORWARDER" : "Forwarder",
 	"general_comp_UDPLISTENER" : "UDP Listener",
 	"general_comp_BOBLIGHTSERVER" : "Boblight Server",
+	"general_comp_FLATBUFSERVER" : "Flatbuffers Server",
 	"general_comp_GRABBER" : "Platform Capture",
 	"general_comp_V4L" : "USB Capture",
 	"general_comp_LEDDEVICE" : "LED device",
@@ -163,7 +164,6 @@
 	"conf_colors_smoothing_intro" : "Smoothing flattens color/brightness changes to reduce annoying distraction.",
 	"conf_colors_blackborder_intro" : "Skip black bars wherever they are. Each mode use another detection algorithm which is tuned for special situations. Higher the threshold if it doesn't work for you.",
 	"conf_network_json_intro" : "The JSON-RPC-Port of this Hyperion instance, used for remote control.",
-	"conf_network_proto_intro" : "The PROTO-Port of this Hyperion instance, used for picture streams (HyperionScreenCap, Kodi Adddon, ...)",
 	"conf_network_bobl_intro" : "Receiver for Boblight",
 	"conf_network_udpl_intro" : "Receiver for UDP",
 	"conf_network_fbs_intro" : "Google Flatbuffers Receiver. Used for fast image transmission.",
diff --git a/assets/webconfig/img/hyperion/ssdp_icon.png b/assets/webconfig/img/hyperion/ssdp_icon.png
new file mode 100644
index 00000000..ebd86fbe
Binary files /dev/null and b/assets/webconfig/img/hyperion/ssdp_icon.png differ
diff --git a/assets/webconfig/js/content_dashboard.js b/assets/webconfig/js/content_dashboard.js
index de61dffd..b43ca531 100644
--- a/assets/webconfig/js/content_dashboard.js
+++ b/assets/webconfig/js/content_dashboard.js
@@ -60,15 +60,24 @@ $(document).ready( function() {
 		$("#tab_components").html(components_html);
 
 		//info
-		$('#dash_statush').html(serverInfo.hyperion.enabled ? '<span style="color:green">'+$.i18n('general_btn_on')+'</span>' : '<span style="color:red">'+$.i18n('general_btn_off')+'</span>');
-		$('#btn_hsc').html(serverInfo.hyperion.enabled ? '<button class="btn btn-sm btn-danger" onClick="requestSetComponentState(\'ALL\',false)">'+$.i18n('dashboard_infobox_label_disableh')+'</button>' : '<button class="btn btn-sm btn-success" onClick="requestSetComponentState(\'ALL\',true)">'+$.i18n('dashboard_infobox_label_enableh')+'</button>');
+		hyperion_enabled = true;
+
+		components.forEach( function(obj) {
+			if (obj.name == "ALL")
+			{
+				hyperion_enabled = obj.enabled
+			}
+		});
+
+		$('#dash_statush').html(hyperion_enabled ? '<span style="color:green">'+$.i18n('general_btn_on')+'</span>' : '<span style="color:red">'+$.i18n('general_btn_off')+'</span>');
+		$('#btn_hsc').html(hyperion_enabled ? '<button class="btn btn-sm btn-danger" onClick="requestSetComponentState(\'ALL\',false)">'+$.i18n('dashboard_infobox_label_disableh')+'</button>' : '<button class="btn btn-sm btn-success" onClick="requestSetComponentState(\'ALL\',true)">'+$.i18n('dashboard_infobox_label_enableh')+'</button>');
 	}
 
 	// add more info
 	$('#dash_leddevice').html(serverInfo.ledDevices.active);
 	$('#dash_currv').html(currentVersion);
 	$('#dash_instance').html(serverConfig.general.name);
-	$('#dash_ports').html(jsonPort+' | '+serverConfig.protoServer.port);
+	$('#dash_ports').html(serverConfig.flatbufServer.port);
 
 	$.get( "https://raw.githubusercontent.com/hyperion-project/hyperion.ng/master/version.json", function( data ) {
 		parsedUpdateJSON = JSON.parse(data);
diff --git a/assets/webconfig/js/content_remote.js b/assets/webconfig/js/content_remote.js
index e997dbf7..fde23d4f 100644
--- a/assets/webconfig/js/content_remote.js
+++ b/assets/webconfig/js/content_remote.js
@@ -153,8 +153,8 @@ $(document).ready(function() {
 				case "UDPLISTENER":
 					owner = $.i18n('general_comp_UDPLISTENER');
 					break;
-				case "PROTOSERVER":
-					owner = "Proto";
+				case "FLATBUFSERVER":
+					owner = $.i18n('general_comp_FLATBUFSERVER');
 					break;
 			}
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 5f90eced..93601451 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -15,7 +15,7 @@ if (BUILD_HYPERION_DOC)
 		message(STATUS "Doxygen build started")
 
 		# Define all static (i.e. not generated) documentation files
-		set(StaticDocumentationFileshyperion-footer.html)
+		set(StaticDocumentationFiles hyperion-footer.html)
 
 		# Loop over all static documentation files
 		foreach(StaticDocumentationFile ${StaticDocumentationFiles})