diff --git a/.gitignore b/.gitignore
index 10a84289..ef1a72fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ third-party/include/cargs.h
 third-party/include/*.hpp
 third-party/include/libserialport.h
 third-party/include/pupdmd.h
+third-party/include/serum.h
 third-party/include/serum-decode.h
 third-party/include/ZeDMD.h
 .DS_Store
diff --git a/README.md b/README.md
index cc9b8786..49b5933b 100644
--- a/README.md
+++ b/README.md
@@ -210,8 +210,6 @@ SaveSettings = 0
 Enabled = 0
 # Enter your ZeDMD WiFi IP address here
 WiFiAddr = 
-# Set the ZeDMD WiFi Port number, you can leave this empty and it will default to 3333
-WiFiPort = 3333
 
 [Pixelcade]
 # Set to 1 if Pixelcade is attached
diff --git a/dmdserver.ini b/dmdserver.ini
index 1c6110d5..c7b1a6e5 100644
--- a/dmdserver.ini
+++ b/dmdserver.ini
@@ -40,8 +40,6 @@ SaveSettings = 0
 Enabled = 0
 # Enter your ZeDMD WiFi IP address here
 WiFiAddr = 
-# Set the ZeDMD WiFi Port number, you can leave this empty and it will default to 3333
-WiFiPort = 3333
 
 [Pixelcade]
 # Set to 1 if Pixelcade is attached
diff --git a/include/DMDUtil/Config.h b/include/DMDUtil/Config.h
index e344efa6..07eee635 100644
--- a/include/DMDUtil/Config.h
+++ b/include/DMDUtil/Config.h
@@ -66,8 +66,6 @@ class DMDUTILAPI Config
   void SetZeDMDWiFiEnabled(bool WiFiEnabled) { m_zedmdWiFiEnabled = WiFiEnabled; }
   const char* GetZeDMDWiFiAddr() const { return m_zedmdWiFiAddr.c_str(); }
   void SetZeDMDWiFiAddr(const char* ipaddr) { m_zedmdWiFiAddr = ipaddr; }
-  int GetZeDMDWiFiPort() const { return m_zedmdWiFiPort; }
-  void SetZeDMDWiFiPort(int port) { m_zedmdWiFiPort = port; }
   bool IsPixelcade() const { return m_pixelcade; }
   void SetPixelcade(bool pixelcade) { m_pixelcade = pixelcade; }
   void SetPixelcadeDevice(const char* port) { m_pixelcadeDevice = port; }
@@ -109,7 +107,6 @@ class DMDUTILAPI Config
   bool m_zedmdSaveSettings;
   bool m_zedmdWiFiEnabled;
   std::string m_zedmdWiFiAddr;
-  int m_zedmdWiFiPort;
   bool m_dmdServer;
   std::string m_dmdServerAddr;
   int m_dmdServerPort;
diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
index 5fd80201..574bc971 100755
--- a/platforms/android/arm64-v8a/external.sh
+++ b/platforms/android/arm64-v8a/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -21,7 +20,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo "  NUM_PROCS: ${NUM_PROCS}"
@@ -67,7 +65,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/android/arm64-v8a/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/android/arm64-v8a/external.sh
 cmake \
    -DPLATFORM=android \
    -DARCH=arm64-v8a \
@@ -77,6 +75,8 @@ cmake \
    -B build
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
+cp -a third-party/runtime-libs/android/arm64-v8a/*.so ../../third-party/runtime-libs/android/arm64-v8a/
 cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a/
 cp -r test ../../
 cd ..
@@ -101,29 +101,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp build/libserum.so ../../third-party/runtime-libs/android/arm64-v8a/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-patch -p1 < ../../platforms/android/arm64-v8a/sockpp/001.patch
-cmake \
-   -DSOCKPP_BUILD_SHARED=ON \
-   -DSOCKPP_BUILD_STATIC=OFF \
-   -DCMAKE_SYSTEM_NAME=Android \
-   -DCMAKE_SYSTEM_VERSION=30 \
-   -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \
-   -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
-   -DCMAKE_INSTALL_RPATH="\$ORIGIN" \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp build/libsockpp.so ../../third-party/runtime-libs/android/arm64-v8a/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/android/arm64-v8a/sockpp/001.patch b/platforms/android/arm64-v8a/sockpp/001.patch
deleted file mode 100644
index b594dbc9..00000000
--- a/platforms/android/arm64-v8a/sockpp/001.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/exception.cpp b/src/exception.cpp
-index 72aae7e..7a56c60 100644
---- a/src/exception.cpp
-+++ b/src/exception.cpp
-@@ -66,7 +66,7 @@ string sys_error::error_str(int err)
- 			buf, sizeof(buf), NULL);
-     #else
-     	#ifdef _GNU_SOURCE
--			#if !defined(__GLIBC__)
-+			#if !defined(__GLIBC__) && !defined(__ANDROID__)
- 			// use the XSI standard behavior.
- 				int e = strerror_r(err, buf, sizeof(buf));
- 				auto s = strerror(e);
diff --git a/platforms/ios-simulator/arm64/external.sh b/platforms/ios-simulator/arm64/external.sh
index 5270b183..dd59d45e 100755
--- a/platforms/ios-simulator/arm64/external.sh
+++ b/platforms/ios-simulator/arm64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -58,7 +56,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/ios-simulator/arm64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/ios-simulator/arm64/external.sh
 cmake \
    -DPLATFORM=ios-simulator \
    -DARCH=arm64 \
@@ -68,6 +66,8 @@ cmake \
    -B build
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
+cp -a third-party/build-libs/ios-simulator/arm64/*.a ../../third-party/build-libs/ios-simulator/arm64/
 cp build/libzedmd.a ../../third-party/build-libs/ios-simulator/arm64/
 cp -r test ../../
 cd ..
@@ -92,27 +92,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp build/libserum.a ../../third-party/build-libs/ios-simulator/arm64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=OFF \
-   -DSOCKPP_BUILD_STATIC=ON \
-   -DCMAKE_SYSTEM_NAME=iOS \
-   -DCMAKE_OSX_SYSROOT=iphonesimulator \
-   -DCMAKE_OSX_ARCHITECTURES=arm64 \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp build/libsockpp.a ../../third-party/build-libs/ios-simulator/arm64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
index 2e7f1ebd..e3ae9d7e 100755
--- a/platforms/ios/arm64/external.sh
+++ b/platforms/ios/arm64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -57,7 +55,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/ios/arm64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/ios/arm64/external.sh
 cmake \
    -DPLATFORM=ios \
    -DARCH=arm64 \
@@ -67,6 +65,8 @@ cmake \
    -B build
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
+cp -a third-party/build-libs/ios/arm64/*.a ../../third-party/build-libs/ios/arm64/
 cp build/libzedmd.a ../../third-party/build-libs/ios/arm64/
 cp -r test ../../
 cd ..
@@ -91,26 +91,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp build/libserum.a ../../third-party/build-libs/ios/arm64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=OFF \
-   -DSOCKPP_BUILD_STATIC=ON \
-   -DCMAKE_SYSTEM_NAME=iOS \
-   -DCMAKE_OSX_ARCHITECTURES=arm64 \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp build/libsockpp.a ../../third-party/build-libs/ios/arm64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
index 2caa1651..0ee9b851 100755
--- a/platforms/linux/aarch64/external.sh
+++ b/platforms/linux/aarch64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -55,7 +53,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/linux/aarch64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/linux/aarch64/external.sh
 cmake \
    -DPLATFORM=linux \
    -DARCH=aarch64 \
@@ -66,6 +64,7 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
 cp -a third-party/runtime-libs/linux/aarch64/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
 cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
 cp -r test ../../
@@ -92,21 +91,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp -a build/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
index 5bd940a7..98177e64 100755
--- a/platforms/linux/x64/external.sh
+++ b/platforms/linux/x64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -55,7 +53,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/linux/x64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/linux/x64/external.sh
 cmake \
    -DPLATFORM=linux \
    -DARCH=x64 \
@@ -66,6 +64,7 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
 cp -a third-party/runtime-libs/linux/x64/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
 cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
 cp -r test ../../
@@ -91,21 +90,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/x64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp -a build/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/x64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
index db39ea42..6ccb4859 100755
--- a/platforms/macos/arm64/external.sh
+++ b/platforms/macos/arm64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -57,7 +55,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/macos/arm64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/macos/arm64/external.sh
 cmake \
    -DPLATFORM=macos \
    -DARCH=arm64 \
@@ -68,6 +66,7 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
 cp -a third-party/runtime-libs/macos/arm64/*.dylib ../../third-party/runtime-libs/macos/arm64/
 cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
 cp -r test ../../
@@ -94,25 +93,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=ON \
-   -DSOCKPP_BUILD_STATIC=OFF \
-   -DCMAKE_OSX_ARCHITECTURES=arm64 \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
index fe2391f6..b6380cdc 100755
--- a/platforms/macos/x64/external.sh
+++ b/platforms/macos/x64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -57,7 +55,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/macos/x64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/macos/x64/external.sh
 cmake \
    -DPLATFORM=macos \
    -DARCH=x64 \
@@ -68,6 +66,7 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
 cp -a third-party/runtime-libs/macos/x64/*.dylib ../../third-party/runtime-libs/macos/x64/
 cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
 cp -r test ../../
@@ -94,25 +93,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=ON \
-   -DSOCKPP_BUILD_STATIC=OFF \
-   -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
index 8e327341..cf015af8 100755
--- a/platforms/tvos/arm64/external.sh
+++ b/platforms/tvos/arm64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -54,7 +52,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/tvos/arm64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/tvos/arm64/external.sh
 cmake \
    -DPLATFORM=tvos \
    -DARCH=arm64 \
@@ -64,6 +62,8 @@ cmake \
    -B build
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
+cp -a third-party/build-libs/tvos/arm64/*.a ../../third-party/build-libs/tvos/arm64/
 cp build/libzedmd.a ../../third-party/build-libs/tvos/arm64/
 cp -r test ../../
 cd ..
@@ -89,26 +89,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp build/libserum.a ../../third-party/build-libs/tvos/arm64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=OFF \
-   -DSOCKPP_BUILD_STATIC=ON \
-   -DCMAKE_SYSTEM_NAME=tvOS \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=16.0 \
-   -DCMAKE_OSX_ARCHITECTURES=arm64 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp build/libsockpp.a ../../third-party/build-libs/tvos/arm64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh
index ac0867a7..e4d7b476 100755
--- a/platforms/win/x64/external.sh
+++ b/platforms/win/x64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -13,7 +12,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -54,7 +52,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/win/x64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/win/x64/external.sh
 cmake \
    -G "Visual Studio 17 2022" \
    -DPLATFORM=win \
@@ -64,9 +62,12 @@ cmake \
    -B build
 cmake --build build --config ${BUILD_TYPE}
 cp src/ZeDMD.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
 cp third-party/build-libs/win/x64/libserialport64.lib ../../third-party/build-libs/win/x64/
 cp third-party/runtime-libs/win/x64/libserialport64.dll ../../third-party/runtime-libs/win/x64/
+cp third-party/build-libs/win/x64/sockpp64.lib ../../third-party/build-libs/win/x64/
+cp third-party/runtime-libs/win/x64/sockpp64.dll ../../third-party/runtime-libs/win/x64/
 cp build/${BUILD_TYPE}/zedmd64.lib ../../third-party/build-libs/win/x64/
 cp build/${BUILD_TYPE}/zedmd64.dll ../../third-party/runtime-libs/win/x64/
 cp -r test ../../
@@ -94,23 +95,6 @@ cp build/${BUILD_TYPE}/serum64.lib ../../third-party/build-libs/win/x64/
 cp build/${BUILD_TYPE}/serum64.dll ../../third-party/runtime-libs/win/x64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-patch -p1 < ../../platforms/win/x64/sockpp/001.patch
-cmake \
-   -G "Visual Studio 17 2022" \
-   -B build
-cmake --build build --config ${BUILD_TYPE}
-cp -r include/sockpp ../../third-party/include/
-cp build/${BUILD_TYPE}/sockpp64.lib ../../third-party/build-libs/win/x64/
-cp build/${BUILD_TYPE}/sockpp64.dll ../../third-party/runtime-libs/win/x64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/platforms/win/x64/sockpp/001.patch b/platforms/win/x64/sockpp/001.patch
deleted file mode 100644
index b7f1c2a9..00000000
--- a/platforms/win/x64/sockpp/001.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b6f828f..6be0845 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,7 +55,7 @@ option(SOCKPP_BUILD_CAN "Build the Linux SocketCAN components" OFF)
- 
- # --- Setting naming variables ---
- 
--set(SOCKPP_SHARED_LIBRARY sockpp)
-+set(SOCKPP_SHARED_LIBRARY sockpp64)
- set(SOCKPP_STATIC_LIBRARY sockpp-static)
- set(SOCKPP_OBJECT_LIBRARY sockpp-objs)
- 
diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh
index 17873183..c12d1bf4 100755
--- a/platforms/win/x86/external.sh
+++ b/platforms/win/x86/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -13,7 +12,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -54,7 +52,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/win/x86/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/win/x86/external.sh
 cmake \
    -G "Visual Studio 17 2022" \
    -A Win32 \
@@ -66,8 +64,11 @@ cmake \
 cmake --build build --config ${BUILD_TYPE}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
 cp third-party/build-libs/win/x86/libserialport.lib ../../third-party/build-libs/win/x86/
 cp third-party/runtime-libs/win/x86/libserialport.dll ../../third-party/runtime-libs/win/x86/
+cp third-party/build-libs/win/x86/sockpp.lib ../../third-party/build-libs/win/x86/
+cp third-party/runtime-libs/win/x86/sockpp.dll ../../third-party/runtime-libs/win/x86/
 cp build/${BUILD_TYPE}/zedmd.lib ../../third-party/build-libs/win/x86/
 cp build/${BUILD_TYPE}/zedmd.dll ../../third-party/runtime-libs/win/x86/
 cp -r test ../../
@@ -96,23 +97,6 @@ cp build/${BUILD_TYPE}/serum.lib ../../third-party/build-libs/win/x86/
 cp build/${BUILD_TYPE}/serum.dll ../../third-party/runtime-libs/win/x86/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -G "Visual Studio 17 2022" \
-   -A Win32 \
-   -B build
-cmake --build build --config ${BUILD_TYPE}
-cp -r include/sockpp ../../third-party/include/
-cp build/${BUILD_TYPE}/sockpp.lib ../../third-party/build-libs/win/x86/
-cp build/${BUILD_TYPE}/sockpp.dll ../../third-party/runtime-libs/win/x86/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #
diff --git a/src/DMD.cpp b/src/DMD.cpp
index 24d97bf9..38306074 100644
--- a/src/DMD.cpp
+++ b/src/DMD.cpp
@@ -482,7 +482,6 @@ void DMD::FindDisplays()
           if (pConfig->IsZeDMDWiFiEnabled())
           {
             std::string WiFiAddr = pConfig->GetZeDMDWiFiAddr() ? pConfig->GetZeDMDWiFiAddr() : "zedmd-wifi.local";
-            uint16_t udpPortNumber = pConfig->GetZeDMDWiFiPort() > 0 ? pConfig->GetZeDMDWiFiPort() : 3333;
 
             if (WiFiAddr.empty())
             {
@@ -490,10 +489,10 @@ void DMD::FindDisplays()
             }
 
             // Proceed only if the WiFiAddr is valid.
-            if (!WiFiAddr.empty() && (openWiFi = pZeDMD->OpenWiFi(WiFiAddr.c_str(), udpPortNumber)))
+            if (!WiFiAddr.empty() && (openWiFi = pZeDMD->OpenWiFi(WiFiAddr.c_str())))
             {
               std::stringstream logMessage;
-              logMessage << "ZeDMD WiFi enabled, connected to " << WiFiAddr << ":" << udpPortNumber << ".";
+              logMessage << "ZeDMD WiFi enabled, connected to " << WiFiAddr << ".";
               DMDUtil::Log(DMDUtil_LogLevel_INFO, logMessage.str().c_str());
             }
           }
diff --git a/src/dmdServer.cpp b/src/dmdServer.cpp
index 69ec9b99..8caa279b 100644
--- a/src/dmdServer.cpp
+++ b/src/dmdServer.cpp
@@ -289,7 +289,6 @@ int main(int argc, char* argv[])
       // ZeDMD WiFi
       pConfig->SetZeDMDWiFiEnabled(r.Get<bool>("ZeDMD-WiFi", "Enabled", false));
       pConfig->SetZeDMDWiFiAddr(r.Get<string>("ZeDMD-WiFi", "WiFiAddr", "").c_str());
-      pConfig->SetZeDMDWiFiPort(r.Get<int>("ZeDMD-WiFi", "WiFiPort", 3333));
       // Pixelcade
       pConfig->SetPixelcade(r.Get<bool>("Pixelcade", "Enabled", true));
       pConfig->SetPixelcadeDevice(r.Get<string>("Pixelcade", "Device", "").c_str());