diff --git a/.gitmodules b/.gitmodules
index e66e81c..4cf547b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -132,4 +132,4 @@
 	url = https://github.com/NikolaiVChr/Autinn.git
 [submodule "plugins/substation-opensource"]
 	path = plugins/substation-opensource
-	url = https://gitlab.com/slimechild/substation-opensource.git
+	url = https://gitlab.com/falktx/substation-opensource.git
diff --git a/plugins/Makefile b/plugins/Makefile
index 2832e4c..ce6315c 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -627,10 +627,8 @@ PLUGIN_FILES += $(filter-out sonusmodular/src/sonusmodular,$(wildcard sonusmodul
 
 PLUGIN_FILES += $(wildcard substation-opensource/dep/slime4rack/src/slime/*.cpp)
 PLUGIN_FILES += $(wildcard substation-opensource/dep/slime4rack/src/slime/**/*.cpp)
-PLUGIN_FILES += $(filter-out substation-opensource/src/_plugin.cpp,$(wildcard substation-opensource/src/*.cpp))
-
-# modules/types which are present in other plugins
-SUBSTATION_CUSTOM = Clock Mixer Quantizer VCA init
+PLUGIN_FILES += $(filter-out substation-opensource/src/_plugin.cpp substation-opensource/src/Settings.cpp,$(wildcard substation-opensource/src/*.cpp))
+PLUGIN_FILES += substation-settings/Settings.cpp
 
 # --------------------------------------------------------------
 # ValleyAudio
@@ -1410,14 +1408,13 @@ $(BUILD_DIR)/sonusmodular/%.cpp.o: sonusmodular/%.cpp
 		$(foreach m,$(SONUSMODULAR_CUSTOM),$(call custom_module_names,$(m),sonusmodular)) \
 		-DpluginInstance=pluginInstance__sonusmodular
 
-$(BUILD_DIR)/substation-opensource/%.cpp.o: substation-opensource/%.cpp
+$(BUILD_DIR)/substation-%.cpp.o: substation-%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
 		$(foreach m,$(SUBSTATION_CUSTOM),$(call custom_module_names,$(m),substation)) \
 		-DpluginInstance=pluginInstance__substation \
 		-D'PRIVATE=__attribute__((error("Using internal Rack function or symbol")))' \
-		-Werror \
 		-Isubstation-opensource/dep/slime4rack/include
 
 $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index 2faa0a5..9389df6 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -500,10 +500,9 @@ extern Model* modelMaude_221;
 //substation
 // NOTE too much noise in original include, do this a different way
 // "substation-opensource/src/_plugin.hpp"
-#define modelClock modelsubstationClock
-#define modelMixer modelsubstationMixer
-#define modelQuantizer modelsubstationQuantizer
-#define modelVCA modelsubstationVCA
+namespace slime {
+namespace plugin {
+namespace substation {
 extern Model* modelClock;
 extern Model* modelPolySequencer;
 extern Model* modelSubOscillator;
@@ -515,10 +514,7 @@ extern Model* modelVCA;
 extern Model* modelBlank4;
 extern Model* modelBlank7;
 extern Model* modelFilterPlus;
-#undef modelClock
-#undef modelMixer
-#undef modelQuantizer
-#undef modelVCA
+}}}
 
 // ValleyAudio
 #include "ValleyAudio/src/Valley.hpp"
@@ -1854,25 +1850,17 @@ static void initStatic__substation()
     const StaticPluginLoader spl(p, "substation-opensource");
     if (spl.ok())
     {
-#define modelClock modelsubstationClock
-#define modelMixer modelsubstationMixer
-#define modelQuantizer modelsubstationQuantizer
-#define modelVCA modelsubstationVCA
-        p->addModel(modelClock);
-        p->addModel(modelEnvelopes);
-        p->addModel(modelFilter);
-        p->addModel(modelMixer);
-        p->addModel(modelQuantizer);
-        p->addModel(modelPolySequencer);
-        p->addModel(modelVCA);
-        p->addModel(modelSubOscillator);
-        p->addModel(modelBlank4);
-        p->addModel(modelBlank7);
-        p->addModel(modelFilterPlus);
-#undef modelClock
-#undef modelMixer
-#undef modelQuantizer
-#undef modelVCA
+        p->addModel(slime::plugin::substation::modelClock);
+        p->addModel(slime::plugin::substation::modelEnvelopes);
+        p->addModel(slime::plugin::substation::modelFilter);
+        p->addModel(slime::plugin::substation::modelMixer);
+        p->addModel(slime::plugin::substation::modelQuantizer);
+        p->addModel(slime::plugin::substation::modelPolySequencer);
+        p->addModel(slime::plugin::substation::modelVCA);
+        p->addModel(slime::plugin::substation::modelSubOscillator);
+        p->addModel(slime::plugin::substation::modelBlank4);
+        p->addModel(slime::plugin::substation::modelBlank7);
+        p->addModel(slime::plugin::substation::modelFilterPlus);
     }
 }
 
diff --git a/plugins/substation-opensource b/plugins/substation-opensource
index f71030d..33a0e0c 160000
--- a/plugins/substation-opensource
+++ b/plugins/substation-opensource
@@ -1 +1 @@
-Subproject commit f71030d598923be76a0d7f05af5be949500c17b5
+Subproject commit 33a0e0cc1025aae66554238d3653aaf71d3e47a2