diff --git a/.gitmodules b/.gitmodules
index d055882..753acc4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,7 +18,7 @@
 	url = https://github.com/VCVRack/Befaco.git
 [submodule "plugins/AudibleInstruments"]
 	path = plugins/AudibleInstruments
-	url = https://github.com/VCVRack/AudibleInstruments.git
+	url = https://github.com/CardinalModules/AudibleInstruments.git
 [submodule "plugins/AnimatedCircuits"]
 	path = plugins/AnimatedCircuits
 	url = https://github.com/CardinalModules/AnimatedCircuits.git
@@ -42,7 +42,7 @@
 	url = https://github.com/jeremywen/JW-Modules.git
 [submodule "plugins/rackwindows"]
 	path = plugins/rackwindows
-	url = https://github.com/n0jo/rackwindows.git
+	url = https://github.com/CardinalModules/rackwindows.git
 [submodule "plugins/AS"]
 	path = plugins/AS
 	url = https://github.com/AScustomWorks/AS.git
@@ -60,7 +60,7 @@
 	url = https://github.com/MarcBoule/MindMeldModular.git
 [submodule "plugins/ValleyAudio"]
 	path = plugins/ValleyAudio
-	url = https://github.com/ValleyAudio/ValleyRackFree.git
+	url = https://github.com/CardinalModules/ValleyAudio.git
 [submodule "plugins/DrumKit"]
 	path = plugins/DrumKit
 	url = https://github.com/SVModular/DrumKit.git
diff --git a/Makefile b/Makefile
index c06d51f..9f2a1a5 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ cardinal: carla deps dgl plugins
 	$(MAKE) all -C src $(CARLA_EXTRA_ARGS)
 
 carla:
-	$(MAKE) plugin -C carla $(CARLA_EXTRA_ARGS) \
+	$(MAKE) static-plugin -C carla $(CARLA_EXTRA_ARGS) \
 		CAN_GENERATE_LV2_TTL=false \
 		STATIC_PLUGIN_TARGET=true
 
diff --git a/carla b/carla
index a79be89..8c9edf7 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit a79be8987182387ec43fe8c09b180849199a84e9
+Subproject commit 8c9edf7d51e49d36772a5f1814c74251ca41a2a9
diff --git a/plugins/AudibleInstruments b/plugins/AudibleInstruments
index dab8ca5..44d8ccb 160000
--- a/plugins/AudibleInstruments
+++ b/plugins/AudibleInstruments
@@ -1 +1 @@
-Subproject commit dab8ca5753c89b56f9ebc249b81658d12d5403ef
+Subproject commit 44d8ccb5c205921f070a0bdaf9c46a19ea83a93a
diff --git a/plugins/Makefile b/plugins/Makefile
index e07d7e3..d460c23 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -746,7 +746,8 @@ $(BUILD_DIR)/AS/%.cpp.o: AS/%.cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
 		$(foreach m,$(AS_CUSTOM),$(call custom_module_names,$(m),AS)) \
-		-DpluginInstance=pluginInstance__AS
+		-DpluginInstance=pluginInstance__AS \
+		-Wno-unused-private-field
 
 $(BUILD_DIR)/Atelier/%.o: Atelier/%
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@@ -756,19 +757,10 @@ $(BUILD_DIR)/Atelier/%.o: Atelier/%
 		-DpluginInstance=pluginInstance__Atelier \
 		-DTEST \
 		-IAtelier/eurorack \
+		-Wno-sign-compare \
 		-Wno-unused-local-typedefs
 
-$(BUILD_DIR)/AudibleInstruments/%.cc.o: AudibleInstruments/%.cc
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
-		$(foreach m,$(AUDIBLEINSTRUMENTS_CUSTOM),$(call custom_module_names,$(m),AudibleInstruments)) \
-		-DpluginInstance=pluginInstance__AudibleInstruments \
-		-DTEST \
-		-IAudibleInstruments/eurorack \
-		-Wno-unused-local-typedefs
-
-$(BUILD_DIR)/AudibleInstruments/%.cpp.o: AudibleInstruments/%.cpp
+$(BUILD_DIR)/AudibleInstruments/%.o: AudibleInstruments/%
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
@@ -792,7 +784,8 @@ $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp
 		$(foreach m,$(BIDOO_CUSTOM),$(call custom_module_names,$(m),Bidoo)) \
 		$(foreach m,$(BIDOO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bidoo_$(shell basename $*))) \
 		-DpluginInstance=pluginInstance__Bidoo \
-		-IBidoo/src/dep/gverb/include
+		-IBidoo/src/dep/gverb/include \
+		-Wno-sign-compare
 
 $(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@@ -829,7 +822,8 @@ $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
 		$(foreach m,$(DRUMKIT_CUSTOM),$(call custom_module_names,$(m),DrumKit)) \
 		-DpluginInstance=pluginInstance__DrumKit \
-		-Dinit=init__DrumKit
+		-Dinit=init__DrumKit \
+		-Wno-sign-compare
 
 $(BUILD_DIR)/ESeries/%.cpp.o: ESeries/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@@ -845,19 +839,14 @@ $(BUILD_DIR)/Fundamental/%.cpp.o: Fundamental/%.cpp
 		$(foreach m,$(FUNDAMENTAL_CUSTOM),$(call custom_module_names,$(m),Fundamental)) \
 		-DpluginInstance=pluginInstance__Fundamental
 
-$(BUILD_DIR)/Fundamental-workaround/%.cpp.o: Fundamental-workaround/%.cpp
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
-		$(foreach m,$(FUNDAMENTAL_CUSTOM),$(call custom_module_names,$(m),Fundamental)) \
-		-DpluginInstance=pluginInstance__Fundamental 
-
 $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
 		$(foreach m,$(GRANDEMODULAR_CUSTOM),$(call custom_module_names,$(m),GrandeModular)) \
-		-DpluginInstance=pluginInstance__GrandeModular
+		-DpluginInstance=pluginInstance__GrandeModular \
+		-Wno-missing-braces \
+		-Wno-self-assign
 
 $(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@@ -916,14 +905,16 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp
 		$(foreach m,$(MSCHACK_CUSTOM),$(call custom_module_names,$(m),mscHack)) \
 		$(foreach m,$(MSCHACK_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),mscHack_$(shell basename $*))) \
 		-DthePlugin=pluginInstance__mscHack \
-		-Dinit=init__mscHack
+		-Dinit=init__mscHack \
+		-Wno-non-c-typedef-for-linkage
 
 $(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
 		$(foreach m,$(RACKWINDOWS_CUSTOM),$(call custom_module_names,$(m),rackwindows)) \
-		-DpluginInstance=pluginInstance__rackwindows
+		-DpluginInstance=pluginInstance__rackwindows \
+		-Wno-sign-compare
 
 $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@@ -932,7 +923,8 @@ $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp
 		$(foreach m,$(VALLEYAUDIO_CUSTOM),$(call custom_module_names,$(m),ValleyAudio)) \
 		$(foreach m,$(VALLEYAUDIO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ValleyAudio_$(shell basename $*))) \
 		-DpluginInstance=pluginInstance__ValleyAudio \
-		-DSTDIO_OVERRIDE=ValleyAudio
+		-DSTDIO_OVERRIDE=ValleyAudio \
+		-Wno-sign-compare
 
 $(BUILD_DIR)/ZetaCarinaeModules/%.cpp.o: ZetaCarinaeModules/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
diff --git a/plugins/ValleyAudio b/plugins/ValleyAudio
index 3ed00f1..d51e97d 160000
--- a/plugins/ValleyAudio
+++ b/plugins/ValleyAudio
@@ -1 +1 @@
-Subproject commit 3ed00f195c31c578daa2b739aaf3ff97310464c4
+Subproject commit d51e97d77b23b0321231b0bdab8c18f24ae159d7
diff --git a/plugins/rackwindows b/plugins/rackwindows
index 1b639e3..6c978ef 160000
--- a/plugins/rackwindows
+++ b/plugins/rackwindows
@@ -1 +1 @@
-Subproject commit 1b639e389aab543a0b1a4eaaee68b3be0f68b5d4
+Subproject commit 6c978ef6314af1d98353fd2b185e947c88aa6141