diff --git a/README.md b/README.md
index a644741..2f6bdb7 100644
--- a/README.md
+++ b/README.md
@@ -145,7 +145,6 @@ At the moment the following 3rd-party modules are provided:
 - [CVfunk](https://github.com/codygeary/CVfunk-Modules)
 - [dBiz](https://github.com/dBiz/dBiz)
 - [DHE Modules](https://github.com/dhemery/DHE-Modules)
-- [WSTD-Drums](https://github.com/Wasted-Audio/WSTD-Drums)
 - [eightfold](https://github.com/scanner-darkly/eightfold)
 - [EnigmaCurry](https://github.com/EnigmaCurry/EnigmaCurry-vcv-pack)
 - [E-Series](https://github.com/VCVRack/ESeries)
@@ -199,6 +198,7 @@ At the moment the following 3rd-party modules are provided:
 - [Valley](https://github.com/ValleyAudio/ValleyRackFree)
 - [Voxglitch](https://github.com/clone45/voxglitch)
 - [WhatTheRack](https://github.com/korfuri/WhatTheRack)
+- [WSTD-Drums](https://github.com/Wasted-Audio/WSTD-Drums)
 - [ZetaCarinae](https://github.com/mhampton/ZetaCarinaeModules)
 - [ZZC](https://github.com/zezic/ZZC)
 
diff --git a/plugins/Makefile b/plugins/Makefile
index 84dee4c..1c8f1d0 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -694,19 +694,6 @@ DBIZ_CUSTOM_PER_FILE = LERP MultiFilter Oscillator calcOutput sineOsc subBank
 
 PLUGIN_FILES += $(filter-out DHE-Modules/src/plugin.cpp,$(wildcard DHE-Modules/src/modules/*/init.cpp))
 
-# --------------------------------------------------------------
-# WSTD-Drums
-
-PLUGIN_FILES += $(wildcard WSTD-Drums/src/*.cpp)
-PLUGIN_FILES += $(wildcard WSTD-Drums/src/controller/*.cpp)
-PLUGIN_FILES += $(wildcard WSTD-Drums/src/view/*.cpp)
-PLUGIN_FILES += $(wildcard WSTD-Drums/src/model/*.cpp)
-PLUGIN_FILES += $(wildcard WSTD-Drums/deps/*.cpp)
-PLUGIN_FILES += $(wildcard WSTD-Drums/deps/SynthDevKit/src/*.cpp)
-
-# modules/types which are present in other plugins
-WSTD_DRUMS_CUSTOM = ADSR Envelope LowFrequencyOscillator
-
 # --------------------------------------------------------------
 # eightfold
 
@@ -1338,6 +1325,19 @@ VOXGLITCH_CUSTOM_PER_FILE = AudioBuffer GateSequencer Grain SamplePlayer Sequenc
 
 PLUGIN_FILES += $(filter-out WhatTheRack/src/WhatTheRack.cpp,$(wildcard WhatTheRack/src/*.cpp))
 
+# --------------------------------------------------------------
+# WSTD-Drums
+
+PLUGIN_FILES += $(wildcard WSTD-Drums/src/*.cpp)
+PLUGIN_FILES += $(wildcard WSTD-Drums/src/controller/*.cpp)
+PLUGIN_FILES += $(wildcard WSTD-Drums/src/view/*.cpp)
+PLUGIN_FILES += $(wildcard WSTD-Drums/src/model/*.cpp)
+PLUGIN_FILES += $(wildcard WSTD-Drums/deps/*.cpp)
+PLUGIN_FILES += $(wildcard WSTD-Drums/deps/SynthDevKit/src/*.cpp)
+
+# modules/types which are present in other plugins
+WSTD_DRUMS_CUSTOM = ADSR Envelope LowFrequencyOscillator
+
 # --------------------------------------------------------------
 # ZetaCarinaeModules
 
@@ -2350,15 +2350,6 @@ $(BUILD_DIR)/DHE-Modules/src/%.cpp.o: DHE-Modules/src/%.cpp
 		-DpluginInstance=pluginInstance__DHE \
 		-IDHE-Modules/src
 
-$(BUILD_DIR)/WSTD-Drums/%.cpp.o: WSTD-Drums/%.cpp
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
-		$(foreach m,$(WSTD_DRUMS_CUSTOM),$(call custom_module_names,$(m),WSTD_Drums)) \
-		-DpluginInstance=pluginInstance__WSTD_Drums \
-		-Dinit=init__WSTD_Drums \
-		-Wno-sign-compare
-
 $(BUILD_DIR)/eightfold/src/%.cpp.o: eightfold/src/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
@@ -2846,6 +2837,15 @@ $(BUILD_DIR)/WhatTheRack/%.cpp.o: WhatTheRack/%.cpp
 		$(foreach m,$(WHATTHERACK_CUSTOM),$(call custom_module_names,$(m),WhatTheRack)) \
 		-DpluginInstance=pluginInstance__WhatTheRack
 
+$(BUILD_DIR)/WSTD-Drums/%.cpp.o: WSTD-Drums/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(WSTD_DRUMS_CUSTOM),$(call custom_module_names,$(m),WSTD_Drums)) \
+		-DpluginInstance=pluginInstance__WSTD_Drums \
+		-Dinit=init__WSTD_Drums \
+		-Wno-sign-compare
+
 $(BUILD_DIR)/ZamAudio/%.cpp.o: ZamAudio/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index 4ce5f65..85f3709 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -395,10 +395,6 @@ namespace truth { void init(Plugin*); }
 namespace xycloid { void init(Plugin*); }
 }
 
-// WSTD-Drums
-#include "WSTD-Drums/src/WSTD_Drums.hpp"
-void setupSamples();
-
 // eightfold
 #include "eightfold/src/plugin.hpp"
 
@@ -900,6 +896,10 @@ void surgext_rack_update_theme();
 // WhatTheRack
 #include "WhatTheRack/src/WhatTheRack.hpp"
 
+// WSTD-Drums
+#include "WSTD-Drums/src/WSTD_Drums.hpp"
+void setupSamples();
+
 // ZetaCarinaeModules
 #include "ZetaCarinaeModules/src/plugin.hpp"
 
@@ -957,7 +957,6 @@ Plugin* pluginInstance__Computerscare;
 Plugin* pluginInstance__CVfunk;
 Plugin* pluginInstance__dBiz;
 Plugin* pluginInstance__DHE;
-extern Plugin* pluginInstance__WSTD_Drums;
 Plugin* pluginInstance__eightfold;
 Plugin* pluginInstance__EnigmaCurry;
 Plugin* pluginInstance__ESeries;
@@ -1010,6 +1009,7 @@ Plugin* pluginInstance__unless_modules;
 Plugin* pluginInstance__ValleyAudio;
 Plugin* pluginInstance__Voxglitch;
 Plugin* pluginInstance__WhatTheRack;
+extern Plugin* pluginInstance__WSTD_Drums;
 Plugin* pluginInstance__ZetaCarinaeModules;
 Plugin* pluginInstance__ZZC;
 
@@ -2147,30 +2147,6 @@ static void initStatic__DHE()
     }
 }
 
-static void initStatic__WSTD_Drums()
-{
-    Plugin* const p = new Plugin;
-    pluginInstance__WSTD_Drums = p;
-
-    const StaticPluginLoader spl(p, "WSTD-Drums");
-    if (spl.ok())
-    {
-        setupSamples();
-        p->addModel(modelBD9);
-        p->addModel(modelSnare);
-        p->addModel(modelClosedHH);
-        p->addModel(modelOpenHH);
-        p->addModel(modelDMX);
-        p->addModel(modelCR78);
-        p->addModel(modelSBD);
-        p->addModel(modelGnome);
-        p->addModel(modelSequencer);
-        p->addModel(modelTomi);
-        p->addModel(modelBaronial);
-        p->addModel(modelMarionette);
-    }
-}
-
 static void initStatic__eightfold()
 {
     Plugin* const p = new Plugin;
@@ -3537,6 +3513,30 @@ static void initStatic__WhatTheRack()
     }
 }
 
+static void initStatic__WSTD_Drums()
+{
+    Plugin* const p = new Plugin;
+    pluginInstance__WSTD_Drums = p;
+
+    const StaticPluginLoader spl(p, "WSTD-Drums");
+    if (spl.ok())
+    {
+        setupSamples();
+        p->addModel(modelBD9);
+        p->addModel(modelSnare);
+        p->addModel(modelClosedHH);
+        p->addModel(modelOpenHH);
+        p->addModel(modelDMX);
+        p->addModel(modelCR78);
+        p->addModel(modelSBD);
+        p->addModel(modelGnome);
+        p->addModel(modelSequencer);
+        p->addModel(modelTomi);
+        p->addModel(modelBaronial);
+        p->addModel(modelMarionette);
+    }
+}
+
 static void initStatic__ZetaCarinaeModules()
 {
     Plugin* p = new Plugin;
@@ -3609,7 +3609,6 @@ void initStaticPlugins()
     initStatic__CVfunk();
     initStatic__dBiz();
     initStatic__DHE();
-    initStatic__WSTD_Drums();
     initStatic__eightfold();
     initStatic__EnigmaCurry();
     initStatic__ESeries();
@@ -3662,6 +3661,7 @@ void initStaticPlugins()
     initStatic__ValleyAudio();
     initStatic__Voxglitch();
     initStatic__WhatTheRack();
+    initStatic__WSTD_Drums();
     initStatic__ZetaCarinaeModules();
     initStatic__ZZC();
 
diff --git a/src/CardinalRemote/Makefile b/src/CardinalRemote/Makefile
index a283835..6e53f44 100644
--- a/src/CardinalRemote/Makefile
+++ b/src/CardinalRemote/Makefile
@@ -229,7 +229,6 @@ SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/chopin
 SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/debussy
 SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/goldberg
 SYMLINKED_DIRS_RESOURCES += cf/playeroscs
-SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples
 SYMLINKED_DIRS_RESOURCES += Fundamental/presets
 SYMLINKED_DIRS_RESOURCES += GrandeModular/presets
 SYMLINKED_DIRS_RESOURCES += LyraeModules/presets
@@ -247,6 +246,7 @@ SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/fx_presets
 SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables
 SYMLINKED_DIRS_RESOURCES += surgext/patches
 SYMLINKED_DIRS_RESOURCES += surgext/presets
+SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples
 LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d))
 endif
 LINK_FLAGS += -sALLOW_MEMORY_GROWTH
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index e627808..576a893 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -317,7 +317,6 @@ SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/debussy
 SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/goldberg
 SYMLINKED_DIRS_RESOURCES += cf/playeroscs
 SYMLINKED_DIRS_RESOURCES += DHE-Modules/svg
-SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples
 SYMLINKED_DIRS_RESOURCES += GrandeModular/presets
 SYMLINKED_DIRS_RESOURCES += LyraeModules/presets
 SYMLINKED_DIRS_RESOURCES += Meander/res
@@ -332,6 +331,7 @@ SYMLINKED_DIRS_RESOURCES += Orbits/presets
 SYMLINKED_DIRS_RESOURCES += stoermelder-packone/presets
 SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/fx_presets
 SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables
+SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples
 endif
 LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d))
 
diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp
index 4e9d5be..7466a60 100644
--- a/src/custom/dep.cpp
+++ b/src/custom/dep.cpp
@@ -346,7 +346,6 @@ enum LightMode {
     kModeBefaco,
     kModeCardinal,
     kModeComputerscareLight,
-    kModeWSTDDrums,
     kModeExtratone,
     kModeFehlerFabrik,
     kModeForsitan,
@@ -360,6 +359,7 @@ enum LightMode {
     kModePrism,
     kModeRepelzen,
     kModeSonusmodular,
+    kModeWSTDDrums,
 };
 
 static const struct {
@@ -443,21 +443,6 @@ static const struct {
     { kModeCardinal, "/Cardinal/res/HostParamsMap.svg" },
     { kModeCardinal, "/Cardinal/res/HostTime.svg" },
     { kModeCardinal, "/Cardinal/res/Ildaeil.svg" },
-    // CC0-1.0
-    { kModeWSTDDrums, "/WSTD-Drums/res/Baronial.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/BD9.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/ClosedHH.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/CR78.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/DMX.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/Gnome.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/Marionette.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/OpenHH.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/SBD.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/Sequencer.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/Snare.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/Tomi.svg" },
-    { kModeWSTDDrums, "/WSTD-Drums/res/component/Knob.svg" },
-
     // BSD-3 Clause
     { kModeComputerscareLight, "/Computerscare/res/ComputerscareStolyFickPigurePanel.svg" },
     // GPLv3+
@@ -595,6 +580,20 @@ static const struct {
     { kModeSonusmodular, "/sonusmodular/res/tropicana.svg" },
     { kModeSonusmodular, "/sonusmodular/res/twoff.svg" },
     { kModeSonusmodular, "/sonusmodular/res/yabp.svg" },
+    // CC0-1.0
+    { kModeWSTDDrums, "/WSTD-Drums/res/Baronial.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/BD9.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/ClosedHH.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/CR78.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/DMX.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/Gnome.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/Marionette.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/OpenHH.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/SBD.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/Sequencer.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/Snare.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/Tomi.svg" },
+    { kModeWSTDDrums, "/WSTD-Drums/res/component/Knob.svg" },
 };
 
 static inline