diff --git a/opi_dmx_monitor/.settings/language.settings.xml b/opi_dmx_monitor/.settings/language.settings.xml
index 1e6db509b..4482b5c09 100644
--- a/opi_dmx_monitor/.settings/language.settings.xml
+++ b/opi_dmx_monitor/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -17,7 +17,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_dmx_usb_pro/.settings/language.settings.xml b/opi_dmx_usb_pro/.settings/language.settings.xml
index 6fce7dd62..2c8ccfc2f 100644
--- a/opi_dmx_usb_pro/.settings/language.settings.xml
+++ b/opi_dmx_usb_pro/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_artnet_dmx/.settings/language.settings.xml b/opi_emac_artnet_dmx/.settings/language.settings.xml
index 72fba641a..975dbf525 100644
--- a/opi_emac_artnet_dmx/.settings/language.settings.xml
+++ b/opi_emac_artnet_dmx/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_artnet_dmx/firmware/main.cpp b/opi_emac_artnet_dmx/firmware/main.cpp
index 913db42fb..29d6d20d0 100644
--- a/opi_emac_artnet_dmx/firmware/main.cpp
+++ b/opi_emac_artnet_dmx/firmware/main.cpp
@@ -29,8 +29,6 @@
 #include "hardware.h"
 #include "network.h"
 
-#include "net/apps/mdns.h"
-
 #include "displayudf.h"
 #include "displayudfparams.h"
 #include "displayhandler.h"
@@ -43,7 +41,6 @@
 #include "dmxparams.h"
 #include "dmxsend.h"
 #include "rdmdeviceparams.h"
-#include "dmxconfigudp.h"
 
 #if defined (NODE_SHOWFILE)
 # include "showfile.h"
diff --git a/opi_emac_artnet_dmx_multi/firmware/main.cpp b/opi_emac_artnet_dmx_multi/firmware/main.cpp
index 065492346..589b35243 100644
--- a/opi_emac_artnet_dmx_multi/firmware/main.cpp
+++ b/opi_emac_artnet_dmx_multi/firmware/main.cpp
@@ -44,7 +44,6 @@
 #include "dmxparams.h"
 #include "dmxsend.h"
 #include "rdmdeviceparams.h"
-#include "dmxconfigudp.h"
 
 #if defined (NODE_SHOWFILE)
 # include "showfile.h"
diff --git a/opi_emac_artnet_monitor/.settings/language.settings.xml b/opi_emac_artnet_monitor/.settings/language.settings.xml
index 72fba641a..975dbf525 100644
--- a/opi_emac_artnet_monitor/.settings/language.settings.xml
+++ b/opi_emac_artnet_monitor/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_artnet_monitor/Makefile.H3 b/opi_emac_artnet_monitor/Makefile.H3
index ec5ffcf64..e9d60c801 100644
--- a/opi_emac_artnet_monitor/Makefile.H3
+++ b/opi_emac_artnet_monitor/Makefile.H3
@@ -9,6 +9,8 @@ DEFINES+=CONFIG_SHOWFILE_FORMAT_OLA
 DEFINES+=CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET
 DEFINES+=CONFIG_SHOWFILE_ENABLE_OSC
 
+DEFINES+=CONFIG_NET_ENABLE_NTP_CLIENT
+
 DEFINES+=CONFIG_FS_ENABLE_WRITE SD_EXFAT_SUPPORT
 
 DEFINES+=CONSOLE_FB
diff --git a/opi_emac_artnet_monitor/firmware/main.cpp b/opi_emac_artnet_monitor/firmware/main.cpp
index f44d278bf..74e036b36 100644
--- a/opi_emac_artnet_monitor/firmware/main.cpp
+++ b/opi_emac_artnet_monitor/firmware/main.cpp
@@ -29,10 +29,6 @@
 #include "hardware.h"
 #include "network.h"
 
-#include "net/apps/mdns.h"
-
-#include "net/apps/ntpclient.h"
-
 #include "console.h"
 #include "h3/showsystime.h"
 
@@ -80,10 +76,6 @@ int main() {
 	console_set_fg_color(CONSOLE_WHITE);
 	console_set_top_row(2);
 
-	NtpClient ntpClient;
-	ntpClient.Start();
-	ntpClient.Print();
-
 	ShowSystime showSystime;
 
 	ArtNetNode node;
@@ -156,9 +148,7 @@ int main() {
 #endif
 		remoteConfig.Run();
 		configStore.Flash();
-		ntpClient.Run();
 		showSystime.Run();
-
 		display.Run();
 		hw.Run();
 	}
diff --git a/opi_emac_artnet_pixel/firmware/main.cpp b/opi_emac_artnet_pixel/firmware/main.cpp
index 5ab74541f..c923250ac 100644
--- a/opi_emac_artnet_pixel/firmware/main.cpp
+++ b/opi_emac_artnet_pixel/firmware/main.cpp
@@ -32,8 +32,6 @@
 #include "hardware.h"
 #include "network.h"
 
-#include "net/apps/mdns.h"
-
 #include "displayudf.h"
 #include "displayudfparams.h"
 #include "displayhandler.h"
diff --git a/opi_emac_artnet_pixel_dmx/firmware/main.cpp b/opi_emac_artnet_pixel_dmx/firmware/main.cpp
index 3cbb5bdd1..c97d39999 100644
--- a/opi_emac_artnet_pixel_dmx/firmware/main.cpp
+++ b/opi_emac_artnet_pixel_dmx/firmware/main.cpp
@@ -51,7 +51,6 @@
 
 #include "dmxparams.h"
 #include "dmxsend.h"
-#include "dmxconfigudp.h"
 
 #include "lightsetwith4.h"
 
@@ -134,7 +133,7 @@ int main() {
 	uint32_t nDmxUniverses = 0;
 
 	if (artnetParams.GetDirection(0) == lightset::PortDir::OUTPUT) {
-		node.SetUniverse(dmxsend::DMXPORT_OFFSET, lightset::PortDir::OUTPUT, artnetParams.GetUniverse(0));
+		node.SetUniverse(DmxSend::DMXPORT_OFFSET, lightset::PortDir::OUTPUT, artnetParams.GetUniverse(0));
 		nDmxUniverses = 1;
 	}
 
@@ -144,7 +143,7 @@ int main() {
 	dmxparams.Load();
 	dmxparams.Set(&dmx);
 
-	if (node.GetPortDirection(dmxsend::DMXPORT_OFFSET) == lightset::PortDir::OUTPUT) {
+	if (node.GetPortDirection(DmxSend::DMXPORT_OFFSET) == lightset::PortDir::OUTPUT) {
 		dmx.SetPortDirection(0, dmx::PortDirection::OUTP, false);
 	}
 
diff --git a/opi_emac_artnet_pixel_dmx_multi/firmware/main.cpp b/opi_emac_artnet_pixel_dmx_multi/firmware/main.cpp
index a17118df1..be6432be9 100644
--- a/opi_emac_artnet_pixel_dmx_multi/firmware/main.cpp
+++ b/opi_emac_artnet_pixel_dmx_multi/firmware/main.cpp
@@ -56,7 +56,6 @@
 
 #include "dmxparams.h"
 #include "dmxsend.h"
-#include "dmxconfigudp.h"
 
 #include "lightsetwith4.h"
 
@@ -151,8 +150,8 @@ int main() {
 
 	uint32_t nDmxUniverses = 0;
 
-	for (uint32_t nPortIndex = dmxsend::DMXPORT_OFFSET; nPortIndex < artnetnode::MAX_PORTS; nPortIndex++) {
-		const auto nDmxPortIndex = nPortIndex - dmxsend::DMXPORT_OFFSET;
+	for (uint32_t nPortIndex = DmxSend::DMXPORT_OFFSET; nPortIndex < artnetnode::MAX_PORTS; nPortIndex++) {
+		const auto nDmxPortIndex = nPortIndex - DmxSend::DMXPORT_OFFSET;
 		const auto portDirection = artnetParams.GetDirection(nDmxPortIndex);
 
 		if (portDirection == lightset::PortDir::OUTPUT) {
@@ -168,8 +167,8 @@ int main() {
 	dmxparams.Load();
 	dmxparams.Set(&dmx);
 
-	for (uint32_t nPortIndex = dmxsend::DMXPORT_OFFSET; nPortIndex < artnetnode::MAX_PORTS; nPortIndex++) {
-		const auto nDmxPortIndex = nPortIndex - dmxsend::DMXPORT_OFFSET;
+	for (uint32_t nPortIndex = DmxSend::DMXPORT_OFFSET; nPortIndex < artnetnode::MAX_PORTS; nPortIndex++) {
+		const auto nDmxPortIndex = nPortIndex - DmxSend::DMXPORT_OFFSET;
 
 		if (node.GetPortDirection(nPortIndex) == lightset::PortDir::OUTPUT) {
 			dmx.SetPortDirection(nDmxPortIndex, dmx::PortDirection::OUTP, false);
diff --git a/opi_emac_artnet_rdm_l6470/.settings/language.settings.xml b/opi_emac_artnet_rdm_l6470/.settings/language.settings.xml
index 72fba641a..975dbf525 100644
--- a/opi_emac_artnet_rdm_l6470/.settings/language.settings.xml
+++ b/opi_emac_artnet_rdm_l6470/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_artnet_rdm_l6470/Makefile.H3 b/opi_emac_artnet_rdm_l6470/Makefile.H3
index f7a9769a1..3a1d8e2d1 100644
--- a/opi_emac_artnet_rdm_l6470/Makefile.H3
+++ b/opi_emac_artnet_rdm_l6470/Makefile.H3
@@ -18,10 +18,12 @@ DEFINES+=CONFIG_FS_ENABLE_WRITE SD_EXFAT_SUPPORT
 DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
 
 DEFINES+=DISPLAY_UDF 
-DEFINES+=CONFIG_DISPLAY_FIX_FLIP_VERTICALLY
+#DEFINES+=CONFIG_DISPLAY_FIX_FLIP_VERTICALLY
 
 #DEFINES+=CONFIG_RTC_DISABLE_DS3231
 
+DEFINES+=CONFIG_NET_ENABLE_NTP_CLIENT
+
 DEFINES+=NDEBUG
 
 LIBS=
diff --git a/opi_emac_artnet_rdm_l6470/firmware/main.cpp b/opi_emac_artnet_rdm_l6470/firmware/main.cpp
index 695f87b95..cb71157df 100644
--- a/opi_emac_artnet_rdm_l6470/firmware/main.cpp
+++ b/opi_emac_artnet_rdm_l6470/firmware/main.cpp
@@ -30,11 +30,6 @@
 #include "hardware.h"
 #include "network.h"
 
-
-#include "net/apps/mdns.h"
-
-#include "net/apps/ntpclient.h"
-
 #include "displayudf.h"
 #include "displayudfparams.h"
 
@@ -93,10 +88,6 @@ int main() {
 
 	fw.Print("Art-Net 4 Stepper L6470");
 
-	NtpClient ntpClient;
-	ntpClient.Start();
-	ntpClient.Print();
-
 	LightSet *pBoard;
 	uint32_t nMotorsConnected = 0;
 
@@ -231,10 +222,8 @@ int main() {
 #if defined (NODE_SHOWFILE)
 		showFile.Run();
 #endif
-		ntpClient.Run();
 		remoteConfig.Run();
 		configStore.Flash();
-
 		display.Run();
 		hw.Run();
 	}
diff --git a/opi_emac_artnet_rdm_pca9685/.settings/language.settings.xml b/opi_emac_artnet_rdm_pca9685/.settings/language.settings.xml
index 6014c6fb3..aed4c621f 100755
--- a/opi_emac_artnet_rdm_pca9685/.settings/language.settings.xml
+++ b/opi_emac_artnet_rdm_pca9685/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_artnet_rdm_pca9685/Makefile.H3 b/opi_emac_artnet_rdm_pca9685/Makefile.H3
index 4890a54e9..fa5173689 100755
--- a/opi_emac_artnet_rdm_pca9685/Makefile.H3
+++ b/opi_emac_artnet_rdm_pca9685/Makefile.H3
@@ -21,6 +21,8 @@ DEFINES+=DISPLAY_UDF
 
 #DEFINES+=CONFIG_RTC_DISABLE_DS3231
 
+DEFINES+=CONFIG_NET_ENABLE_NTP_CLIENT
+
 DEFINES+=NDEBUG
 
 LIBS=
diff --git a/opi_emac_artnet_rdm_pca9685/firmware/main.cpp b/opi_emac_artnet_rdm_pca9685/firmware/main.cpp
index 583706bdb..af5d7020f 100755
--- a/opi_emac_artnet_rdm_pca9685/firmware/main.cpp
+++ b/opi_emac_artnet_rdm_pca9685/firmware/main.cpp
@@ -30,11 +30,6 @@
 #include "hardware.h"
 #include "network.h"
 
-
-#include "net/apps/mdns.h"
-
-#include "net/apps/ntpclient.h"
-
 #include "displayudf.h"
 #include "displayudfparams.h"
 
@@ -88,10 +83,6 @@ int main() {
 
 	fw.Print("Art-Net 4 PCA9685");
 
-	NtpClient ntpClient;
-	ntpClient.Start();
-	ntpClient.Print();
-
 	PCA9685Dmx pca9685Dmx;
 
 	PCA9685DmxParams pca9685DmxParams;
@@ -188,10 +179,8 @@ int main() {
 #if defined (NODE_SHOWFILE)
 		showFile.Run();
 #endif
-		ntpClient.Run();
 		remoteConfig.Run();
 		configStore.Flash();
-
 		display.Run();
 		hw.Run();
 	}
diff --git a/opi_emac_artnet_serial/.settings/language.settings.xml b/opi_emac_artnet_serial/.settings/language.settings.xml
index 72fba641a..975dbf525 100644
--- a/opi_emac_artnet_serial/.settings/language.settings.xml
+++ b/opi_emac_artnet_serial/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_ddp_pixel_dmx_multi/.settings/language.settings.xml b/opi_emac_ddp_pixel_dmx_multi/.settings/language.settings.xml
index 95baaaeb4..448d5849c 100755
--- a/opi_emac_ddp_pixel_dmx_multi/.settings/language.settings.xml
+++ b/opi_emac_ddp_pixel_dmx_multi/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_ddp_pixel_dmx_multi/firmware/main.cpp b/opi_emac_ddp_pixel_dmx_multi/firmware/main.cpp
index 9bd93dc8e..a05a796be 100644
--- a/opi_emac_ddp_pixel_dmx_multi/firmware/main.cpp
+++ b/opi_emac_ddp_pixel_dmx_multi/firmware/main.cpp
@@ -53,7 +53,6 @@
 
 #include "dmxparams.h"
 #include "dmxsend.h"
-#include "dmxconfigudp.h"
 
 #include "lightsetwith4.h"
 
diff --git a/opi_emac_ddp_pixel_multi/.settings/language.settings.xml b/opi_emac_ddp_pixel_multi/.settings/language.settings.xml
index 95baaaeb4..448d5849c 100755
--- a/opi_emac_ddp_pixel_multi/.settings/language.settings.xml
+++ b/opi_emac_ddp_pixel_multi/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_e131_artnet/.settings/language.settings.xml b/opi_emac_e131_artnet/.settings/language.settings.xml
index 9b091d7b9..69baeb88c 100644
--- a/opi_emac_e131_artnet/.settings/language.settings.xml
+++ b/opi_emac_e131_artnet/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_e131_dmx/.settings/language.settings.xml b/opi_emac_e131_dmx/.settings/language.settings.xml
index 9b091d7b9..69baeb88c 100644
--- a/opi_emac_e131_dmx/.settings/language.settings.xml
+++ b/opi_emac_e131_dmx/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_e131_dmx/firmware/main.cpp b/opi_emac_e131_dmx/firmware/main.cpp
index 77c384fd2..024cee5a0 100644
--- a/opi_emac_e131_dmx/firmware/main.cpp
+++ b/opi_emac_e131_dmx/firmware/main.cpp
@@ -42,7 +42,6 @@
 
 #include "dmxparams.h"
 #include "dmxsend.h"
-#include "dmxconfigudp.h"
 
 #if defined (NODE_RDMNET_LLRP_ONLY)
 # include "rdmdeviceparams.h"
diff --git a/opi_emac_e131_dmx_multi/.settings/language.settings.xml b/opi_emac_e131_dmx_multi/.settings/language.settings.xml
index 9b091d7b9..69baeb88c 100644
--- a/opi_emac_e131_dmx_multi/.settings/language.settings.xml
+++ b/opi_emac_e131_dmx_multi/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_e131_dmx_multi/firmware/main.cpp b/opi_emac_e131_dmx_multi/firmware/main.cpp
index 4005bcae7..331478ed2 100644
--- a/opi_emac_e131_dmx_multi/firmware/main.cpp
+++ b/opi_emac_e131_dmx_multi/firmware/main.cpp
@@ -42,7 +42,6 @@
 
 #include "dmxparams.h"
 #include "dmxsend.h"
-#include "dmxconfigudp.h"
 
 #if defined (NODE_RDMNET_LLRP_ONLY)
 # include "rdmdeviceparams.h"
@@ -103,9 +102,9 @@ int main() {
 	dmxparams.Load();
 	dmxparams.Set(&dmx);
 
-	for (uint32_t nPortIndex = dmxsend::DMXPORT_OFFSET; nPortIndex < e131bridge::MAX_PORTS; nPortIndex++) {
+	for (uint32_t nPortIndex = DmxSend::DMXPORT_OFFSET; nPortIndex < e131bridge::MAX_PORTS; nPortIndex++) {
 		uint16_t nUniverse;
-		const auto nDmxPortIndex = nPortIndex - dmxsend::DMXPORT_OFFSET;
+		const auto nDmxPortIndex = nPortIndex - DmxSend::DMXPORT_OFFSET;
 
 		if (bridge.GetUniverse(nPortIndex, nUniverse, lightset::PortDir::OUTPUT)) {
 			dmx.SetPortDirection(nDmxPortIndex, dmx::PortDirection::OUTP, false);
diff --git a/opi_emac_e131_monitor/.settings/language.settings.xml b/opi_emac_e131_monitor/.settings/language.settings.xml
index 9b091d7b9..69baeb88c 100644
--- a/opi_emac_e131_monitor/.settings/language.settings.xml
+++ b/opi_emac_e131_monitor/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_e131_monitor/Makefile.H3 b/opi_emac_e131_monitor/Makefile.H3
index 29d28f42a..02e5e37a7 100644
--- a/opi_emac_e131_monitor/Makefile.H3
+++ b/opi_emac_e131_monitor/Makefile.H3
@@ -11,6 +11,8 @@ DEFINES+=CONFIG_SHOWFILE_FORMAT_OLA
 DEFINES+=CONFIG_SHOWFILE_PROTOCOL_NODE_E131
 DEFINES+=CONFIG_SHOWFILE_ENABLE_OSC
 
+DEFINES+=CONFIG_NET_ENABLE_NTP_CLIENT
+
 DEFINES+=CONFIG_FS_ENABLE_WRITE SD_EXFAT_SUPPORT
 
 DEFINES+=CONSOLE_FB
diff --git a/opi_emac_e131_monitor/firmware/main.cpp b/opi_emac_e131_monitor/firmware/main.cpp
index 89acacb65..8ae5279d1 100644
--- a/opi_emac_e131_monitor/firmware/main.cpp
+++ b/opi_emac_e131_monitor/firmware/main.cpp
@@ -29,11 +29,6 @@
 #include "hardware.h"
 #include "network.h"
 
-
-#include "net/apps/mdns.h"
-
-#include "net/apps/ntpclient.h"
-
 #include "console.h"
 #include "h3/showsystime.h"
 
@@ -67,8 +62,6 @@
 #include "firmwareversion.h"
 #include "software_version.h"
 
-
-
 int main() {
 	Hardware hw;
 	DisplayUdf display;
@@ -87,10 +80,6 @@ int main() {
 	console_set_fg_color(CONSOLE_WHITE);
 	console_set_top_row(2);
 
-	NtpClient ntpClient;
-	ntpClient.Start();
-	ntpClient.Print();
-
 	ShowSystime showSystime;
 
 	char aDescription[rdm::personality::DESCRIPTION_MAX_LENGTH + 1];
@@ -182,9 +171,7 @@ int main() {
 		remoteConfig.Run();
 		llrpOnlyDevice.Run();
 		configStore.Flash();
-		ntpClient.Run();
 		showSystime.Run();
-
 		display.Run();
 		hw.Run();
 	}
diff --git a/opi_emac_e131_pixel_dmx/.settings/language.settings.xml b/opi_emac_e131_pixel_dmx/.settings/language.settings.xml
index 84af6fe95..b24889188 100755
--- a/opi_emac_e131_pixel_dmx/.settings/language.settings.xml
+++ b/opi_emac_e131_pixel_dmx/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_e131_pixel_dmx/firmware/main.cpp b/opi_emac_e131_pixel_dmx/firmware/main.cpp
index 1c98dfc77..fc37c33ad 100644
--- a/opi_emac_e131_pixel_dmx/firmware/main.cpp
+++ b/opi_emac_e131_pixel_dmx/firmware/main.cpp
@@ -50,7 +50,6 @@
 
 #include "dmxparams.h"
 #include "dmxsend.h"
-#include "dmxconfigudp.h"
 
 #include "lightsetwith4.h"
 
@@ -131,7 +130,7 @@ int main() {
 	const auto portDirection = e131params.GetDirection(0);
 
 	if (portDirection == lightset::PortDir::OUTPUT) {
-		bridge.SetUniverse(dmxsend::DMXPORT_OFFSET, lightset::PortDir::OUTPUT, e131params.GetUniverse(0, isDmxUniverseSet));
+		bridge.SetUniverse(DmxSend::DMXPORT_OFFSET, lightset::PortDir::OUTPUT, e131params.GetUniverse(0, isDmxUniverseSet));
 	}
 
 	Dmx dmx;
@@ -142,7 +141,7 @@ int main() {
 
 	uint16_t nUniverse;
 
-	if (bridge.GetUniverse(dmxsend::DMXPORT_OFFSET, nUniverse, lightset::PortDir::OUTPUT)) {
+	if (bridge.GetUniverse(DmxSend::DMXPORT_OFFSET, nUniverse, lightset::PortDir::OUTPUT)) {
 		dmx.SetPortDirection(0, dmx::PortDirection::OUTP, false);
 	} else {
 		dmx.SetPortDirection(0, dmx::PortDirection::INP, false);
diff --git a/opi_emac_e131_pixel_dmx_multi/.settings/language.settings.xml b/opi_emac_e131_pixel_dmx_multi/.settings/language.settings.xml
index 9a6a7e4a2..5a5d19bc9 100755
--- a/opi_emac_e131_pixel_dmx_multi/.settings/language.settings.xml
+++ b/opi_emac_e131_pixel_dmx_multi/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_e131_pixel_dmx_multi/firmware/main.cpp b/opi_emac_e131_pixel_dmx_multi/firmware/main.cpp
index e0bb630de..1c4a53667 100644
--- a/opi_emac_e131_pixel_dmx_multi/firmware/main.cpp
+++ b/opi_emac_e131_pixel_dmx_multi/firmware/main.cpp
@@ -54,7 +54,6 @@
 
 #include "dmxparams.h"
 #include "dmxsend.h"
-#include "dmxconfigudp.h"
 
 #include "lightsetwith4.h"
 
@@ -145,7 +144,7 @@ int main() {
 	auto direction = e131params.GetDirection(0);
 
 	if (direction == lightset::PortDir::OUTPUT) {
-		bridge.SetUniverse(dmxsend::DMXPORT_OFFSET, lightset::PortDir::OUTPUT, nUniverse);
+		bridge.SetUniverse(DmxSend::DMXPORT_OFFSET, lightset::PortDir::OUTPUT, nUniverse);
 		nDmxUniverses++;
 	}
 
@@ -153,7 +152,7 @@ int main() {
 	direction = e131params.GetDirection(1);
 
 	if (direction == lightset::PortDir::OUTPUT) {
-		bridge.SetUniverse(dmxsend::DMXPORT_OFFSET + 1U, lightset::PortDir::OUTPUT, nUniverse);
+		bridge.SetUniverse(DmxSend::DMXPORT_OFFSET + 1U, lightset::PortDir::OUTPUT, nUniverse);
 		nDmxUniverses++;
 	}
 
@@ -163,9 +162,9 @@ int main() {
 	dmxparams.Load();
 	dmxparams.Set(&dmx);
 
-	for (uint32_t nPortIndex = dmxsend::DMXPORT_OFFSET; nPortIndex < e131bridge::MAX_PORTS; nPortIndex++) {
+	for (uint32_t nPortIndex = DmxSend::DMXPORT_OFFSET; nPortIndex < e131bridge::MAX_PORTS; nPortIndex++) {
 		uint16_t nUniverse;
-		const auto nDmxPortIndex = nPortIndex - dmxsend::DMXPORT_OFFSET;
+		const auto nDmxPortIndex = nPortIndex - DmxSend::DMXPORT_OFFSET;
 
 		if (bridge.GetUniverse(nPortIndex, nUniverse, lightset::PortDir::OUTPUT)) {
 			dmx.SetPortDirection(nDmxPortIndex, dmx::PortDirection::OUTP, false);
diff --git a/opi_emac_llrp_tftpd/.settings/language.settings.xml b/opi_emac_llrp_tftpd/.settings/language.settings.xml
index 4f2269910..8a5e5102f 100644
--- a/opi_emac_llrp_tftpd/.settings/language.settings.xml
+++ b/opi_emac_llrp_tftpd/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_llrp_tftpd/Makefile.H3 b/opi_emac_llrp_tftpd/Makefile.H3
index 0f3093b33..ac01ee177 100644
--- a/opi_emac_llrp_tftpd/Makefile.H3
+++ b/opi_emac_llrp_tftpd/Makefile.H3
@@ -5,6 +5,8 @@ DEFINES =NODE_RDMNET_LLRP_ONLY
 DEFINES+=DISPLAY_UDF 
 DEFINES+=ENABLE_SSD1311 
 
+DEFINES+=CONFIG_NET_ENABLE_NTP_CLIENT
+
 DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
 
 #DEFINES+=CONFIG_DISPLAY_USE_SPI
diff --git a/opi_emac_llrp_tftpd/firmware/main.cpp b/opi_emac_llrp_tftpd/firmware/main.cpp
index a7d90fb08..cfef96743 100755
--- a/opi_emac_llrp_tftpd/firmware/main.cpp
+++ b/opi_emac_llrp_tftpd/firmware/main.cpp
@@ -33,7 +33,6 @@
 #include "hardware.h"
 #include "network.h"
 
-
 #include "displayudf.h"
 #include "displayudfparams.h"
 #include "flashcodeinstall.h"
@@ -43,9 +42,6 @@
 
 #include "rdmnetllrponly.h"
 
-#include "net/apps/mdns.h"
-#include "net/apps/ntpclient.h"
-
 #include "factorydefaults.h"
 
 #include "firmwareversion.h"
@@ -77,10 +73,6 @@ int main() {
 
 	fw.Print("RDMNet LLRP device only");
 
-	NtpClient ntpClient;
-	ntpClient.Start();
-	ntpClient.Print();
-
 	RDMNetLLRPOnly device;
 	device.Init();
 	device.Print();
@@ -115,10 +107,10 @@ int main() {
 	for (;;) {
 		nw.Run();
 		remoteConfig.Run();
-		ntpClient.Run();
 		configStore.Flash();
 		display.Run();
 		hw.Run();
+
 		time_t ltime;
 		auto t2 = time(&ltime);
 		if (t1 != t2) {
@@ -134,5 +126,6 @@ int main() {
 					tmlocal.tm_hour, tmlocal.tm_min, tmlocal.tm_sec,
 					tmHwClock.tm_hour, tmHwClock.tm_min, tmHwClock.tm_sec);
 		}
+
 	}
 }
diff --git a/opi_emac_osc_client/.settings/language.settings.xml b/opi_emac_osc_client/.settings/language.settings.xml
index 8da06afcf..f65c1511b 100644
--- a/opi_emac_osc_client/.settings/language.settings.xml
+++ b/opi_emac_osc_client/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_osc_dmx/.settings/language.settings.xml b/opi_emac_osc_dmx/.settings/language.settings.xml
index 8da06afcf..f65c1511b 100644
--- a/opi_emac_osc_dmx/.settings/language.settings.xml
+++ b/opi_emac_osc_dmx/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_osc_dmx/firmware/main.cpp b/opi_emac_osc_dmx/firmware/main.cpp
index 7d7dd3a56..721fc247f 100644
--- a/opi_emac_osc_dmx/firmware/main.cpp
+++ b/opi_emac_osc_dmx/firmware/main.cpp
@@ -36,10 +36,9 @@
 #include "oscserver.h"
 #include "oscserverparams.h"
 #include "oscservermsgconst.h"
-// DMX Out
+
 #include "dmxparams.h"
 #include "dmxsend.h"
-#include "dmxconfigudp.h"
 
 #include "flashcodeinstall.h"
 #include "configstore.h"
diff --git a/opi_emac_osc_monitor/.settings/language.settings.xml b/opi_emac_osc_monitor/.settings/language.settings.xml
index 8da06afcf..f65c1511b 100644
--- a/opi_emac_osc_monitor/.settings/language.settings.xml
+++ b/opi_emac_osc_monitor/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_osc_monitor/Makefile.H3 b/opi_emac_osc_monitor/Makefile.H3
index 41c0f2c5e..e99b0e3e6 100644
--- a/opi_emac_osc_monitor/Makefile.H3
+++ b/opi_emac_osc_monitor/Makefile.H3
@@ -1,9 +1,15 @@
 PLATFORM=ORANGE_PI_ONE
 
 DEFINES =NODE_OSC_SERVER 
+
 DEFINES+=OUTPUT_DMX_MONITOR
+
+DEFINES+=CONFIG_NET_ENABLE_NTP_CLIENT
+
 DEFINES+=CONSOLE_FB
+
 DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
+
 DEFINES+=NDEBUG
 
 LIBS=
diff --git a/opi_emac_osc_monitor/firmware/main.cpp b/opi_emac_osc_monitor/firmware/main.cpp
index dc536d4bb..4bc4bb548 100644
--- a/opi_emac_osc_monitor/firmware/main.cpp
+++ b/opi_emac_osc_monitor/firmware/main.cpp
@@ -32,8 +32,6 @@
 #include "console.h"
 #include "h3/showsystime.h"
 
-#include "net/apps/ntpclient.h"
-
 #include "net/apps/mdns.h"
 
 #include "display.h"
@@ -84,10 +82,6 @@ int main() {
 
 	mdns_service_record_add(nullptr, mdns::Services::OSC, "type=monitor", server.GetPortIncoming());
 
-	NtpClient ntpClient;
-	ntpClient.Start();
-	ntpClient.Print();
-
 	DMXMonitor monitor;
 	// There is support for HEX output only
 	server.SetOutput(&monitor);
@@ -125,9 +119,7 @@ int main() {
 		server.Run();
 		remoteConfig.Run();
 		configStore.Flash();
-		ntpClient.Run();
 		showSystime.Run();
-
 		display.Run();
 		hw.Run();
 	}
diff --git a/opi_emac_osc_pixel/.settings/language.settings.xml b/opi_emac_osc_pixel/.settings/language.settings.xml
index 8da06afcf..f65c1511b 100644
--- a/opi_emac_osc_pixel/.settings/language.settings.xml
+++ b/opi_emac_osc_pixel/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_pp_pixel_multi/.settings/language.settings.xml b/opi_emac_pp_pixel_multi/.settings/language.settings.xml
index 95baaaeb4..448d5849c 100755
--- a/opi_emac_pp_pixel_multi/.settings/language.settings.xml
+++ b/opi_emac_pp_pixel_multi/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_showfile_artnet/.settings/language.settings.xml b/opi_emac_showfile_artnet/.settings/language.settings.xml
index b80defc80..9541231dc 100755
--- a/opi_emac_showfile_artnet/.settings/language.settings.xml
+++ b/opi_emac_showfile_artnet/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_emac_showfile_e131/.settings/language.settings.xml b/opi_emac_showfile_e131/.settings/language.settings.xml
index b80defc80..9541231dc 100755
--- a/opi_emac_showfile_e131/.settings/language.settings.xml
+++ b/opi_emac_showfile_e131/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_midi_monitor/.settings/language.settings.xml b/opi_midi_monitor/.settings/language.settings.xml
index 5e87b0005..79d80199a 100644
--- a/opi_midi_monitor/.settings/language.settings.xml
+++ b/opi_midi_monitor/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_midi_monitor/firmware/main.cpp b/opi_midi_monitor/firmware/main.cpp
index 2117e6d78..b20030821 100644
--- a/opi_midi_monitor/firmware/main.cpp
+++ b/opi_midi_monitor/firmware/main.cpp
@@ -67,9 +67,6 @@ int main() {
 	RemoteConfigParams remoteConfigParams;
 	remoteConfigParams.Load();
 	remoteConfigParams.Set(&remoteConfig);
-
-	while (configStore.Flash())
-		;
 #endif
 
 	console_clear();
diff --git a/opi_rdm_responder/.settings/language.settings.xml b/opi_rdm_responder/.settings/language.settings.xml
index d4e938a2f..d394bbff2 100644
--- a/opi_rdm_responder/.settings/language.settings.xml
+++ b/opi_rdm_responder/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/opi_rdm_responder_l6470/.settings/language.settings.xml b/opi_rdm_responder_l6470/.settings/language.settings.xml
index 6c715cf98..b81270a9f 100644
--- a/opi_rdm_responder_l6470/.settings/language.settings.xml
+++ b/opi_rdm_responder_l6470/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868907429938189684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868850457862413684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>