diff --git a/deps/Makefile b/deps/Makefile
index c845a97..68ba1e2 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -274,9 +274,6 @@ SURGE_CXX_FLAGS += -msse -msse2 -mfpmath=sse
 endif
 endif
 
-# same flags as applied to main build
-SURGE_CXX_FLAGS += -I$(abspath ../src/Rack/dep/simde)
-
 # possibly use fftw?
 # ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true)
 # SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1
diff --git a/plugins/Makefile b/plugins/Makefile
index 76df0ad..6d7cf81 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -643,7 +643,7 @@ CATROMODULO_CUSTOM = LowFrequencyOscillator NumDisplayWidget
 PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp))
 
 # modules/types which are present in other plugins
-CF_CUSTOM = $(DRWAV) ledTrigger
+CF_CUSTOM = $(DRWAV)
 
 # --------------------------------------------------------------
 # dBiz
diff --git a/src/custom/RemoteWindow.cpp b/src/custom/RemoteWindow.cpp
index e0e9fab..575f322 100644
--- a/src/custom/RemoteWindow.cpp
+++ b/src/custom/RemoteWindow.cpp
@@ -108,10 +108,6 @@ void Window::step() {
 }
 
 
-// void Window::activateContext() {
-// }
-
-
 void Window::screenshot(const std::string&) {
 }
 
diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp
index 6c5ba80..c0916d5 100644
--- a/src/custom/dep.cpp
+++ b/src/custom/dep.cpp
@@ -61,6 +61,9 @@ void updateForcingBlackSilverScrewMode(std::string slug) {
 }
 }
 #endif
+namespace plugin {
+void updateStaticPluginsDarkMode();
+}
 namespace settings {
 bool darkMode = true;
 int rateLimit = 0;
@@ -1483,6 +1486,7 @@ void switchDarkMode(const bool darkMode)
     settings::darkMode = darkMode;
     settings::uiTheme = darkMode ? "dark" : "light";
     ui::refreshTheme();
+    plugin::updateStaticPluginsDarkMode();
 
     for (ExtendedNSVGimage& ext : loadedDarkSVGs)
     {
diff --git a/src/override/MenuBar.cpp b/src/override/MenuBar.cpp
index 62bfbac..1ae8c99 100644
--- a/src/override/MenuBar.cpp
+++ b/src/override/MenuBar.cpp
@@ -67,9 +67,6 @@ std::string patchesPath();
 namespace engine {
 void Engine_setRemoteDetails(Engine*, remoteUtils::RemoteDetails*);
 }
-namespace plugin {
-void updateStaticPluginsDarkMode();
-}
 
 namespace app {
 namespace menuBar {
@@ -565,7 +562,6 @@ struct ViewButton : MenuButton {
 			darkModeText = CHECKMARK_STRING;
 		menu->addChild(createMenuItem("Dark Mode", darkModeText, []() {
 			switchDarkMode(!settings::darkMode);
-			plugin::updateStaticPluginsDarkMode();
 			setAllFramebufferWidgetsDirty(APP->scene);
 		}));
 
diff --git a/src/override/common.cpp b/src/override/common.cpp
index 32b9962..336034b 100644
--- a/src/override/common.cpp
+++ b/src/override/common.cpp
@@ -66,13 +66,10 @@ const std::string APP_VERSION_MAJOR = "2";
 const std::string APP_VERSION = "2.3.0";
 #if defined ARCH_WIN
 	const std::string APP_OS = "win";
-	const std::string APP_OS_NAME = "Windows";
 #elif defined ARCH_MAC
 	const std::string APP_OS = "mac";
-	const std::string APP_OS_NAME = "macOS";
 #elif defined ARCH_LIN
 	const std::string APP_OS = "lin";
-	const std::string APP_OS_NAME = "Linux";
 #else
 	#error ARCH_LIN undefined
 #endif