diff --git a/Makefile b/Makefile
index f836c72..0c0da61 100644
--- a/Makefile
+++ b/Makefile
@@ -65,15 +65,17 @@ endif
 # --------------------------------------------------------------
 
 carla: dgl
-	$(MAKE) -C carla $(CARLA_EXTRA_ARGS) $(CARLA_TARGETS)
+	$(MAKE) $(CARLA_EXTRA_ARGS) -C carla $(CARLA_TARGETS)
 
 dgl:
 	$(MAKE) -C dpf/dgl opengl
 
 plugins: carla dgl
-	$(MAKE) all -C plugins/FX
-	$(MAKE) all -C plugins/MIDI
-	$(MAKE) all -C plugins/Synth
+	$(MAKE) $(CARLA_EXTRA_ARGS) all -C plugins/FX
+ifneq ($(WASM),true)
+	$(MAKE) $(CARLA_EXTRA_ARGS) all -C plugins/MIDI
+	$(MAKE) $(CARLA_EXTRA_ARGS) all -C plugins/Synth
+endif
 
 ifneq ($(CROSS_COMPILING),true)
 gen: plugins dpf/utils/lv2_ttl_generator
diff --git a/carla b/carla
index 6ee0333..7a9b7ba 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 6ee03336ab0a15dba4da78dbf7413624228c5db5
+Subproject commit 7a9b7ba35e261f519b4ab38b7f506e2745998e90
diff --git a/dpf b/dpf
index b9e654c..f1e157a 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit b9e654c3d331933dbeae0413246be8dc2bd64a58
+Subproject commit f1e157a03c40637c9055ddf82e7b0543b386c48a
diff --git a/dpf-widgets b/dpf-widgets
index b0a1286..0253c44 160000
--- a/dpf-widgets
+++ b/dpf-widgets
@@ -1 +1 @@
-Subproject commit b0a1286f7933dc5f6d33237e2dff7b64267c62ae
+Subproject commit 0253c44ac9345f5b93cfa303f03a02b44fe65901
diff --git a/plugins/Common/IldaeilUI.cpp b/plugins/Common/IldaeilUI.cpp
index cf4f700..bbf6d2a 100644
--- a/plugins/Common/IldaeilUI.cpp
+++ b/plugins/Common/IldaeilUI.cpp
@@ -194,11 +194,7 @@ public:
           fIdleState(kIdleInit),
           fPlugin((IldaeilBasePlugin*)getPluginInstancePointer()),
           fPluginHostWindow(getWindow(), this),
-         #ifdef DISTRHO_OS_WASM
-          fPluginType(PLUGIN_INTERNAL),
-         #else
           fPluginType(PLUGIN_LV2),
-         #endif
           fNextPluginType(fPluginType),
           fPluginCount(0),
           fPluginId(0),
diff --git a/plugins/Common/Makefile.mk b/plugins/Common/Makefile.mk
index 8a5b251..86edefd 100644
--- a/plugins/Common/Makefile.mk
+++ b/plugins/Common/Makefile.mk
@@ -50,6 +50,11 @@ CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/water.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/ysfx.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/zita-resampler.a
 
+# FIXME
+# ifeq ($(WASM),true)
+# STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm
+# endif
+
 EXTRA_DEPENDENCIES = $(CARLA_EXTRA_LIBS)
 EXTRA_LIBS = $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
 
@@ -59,13 +64,18 @@ EXTRA_LIBS = $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
 USE_VST2_BUNDLE = true
 include ../../dpf/Makefile.plugins.mk
 
-ifneq ($(WASM),true)
+ifeq ($(WASM),true)
+# used for testing
+LINK_FLAGS += -sALLOW_MEMORY_GROWTH
+# LINK_FLAGS += --preload-file=foolme.mp3
+# LINK_FLAGS += --preload-file=furelise.mid
+# LINK_FLAGS += --preload-file=./jsfx
+# LINK_FLAGS += --preload-file=./lv2
+# LINK_FLAGS += --shell-file=../Cardinal/src/emscripten/shell.html
+else ifneq ($(HAIKU),true)
 BUILD_CXX_FLAGS += -pthread
 endif
 
-# used for testing
-# LINK_FLAGS += --preload-file=foolme.mp3 --preload-file=furelise.mid -sALLOW_MEMORY_GROWTH
-
 BUILD_CXX_FLAGS += -I../Common
 BUILD_CXX_FLAGS += -I../../dpf-widgets/generic
 BUILD_CXX_FLAGS += -I../../dpf-widgets/opengl
@@ -86,11 +96,16 @@ endif
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
+ifneq ($(WASM),true)
 all: jack lv2 vst2 vst3 carlabins
+else
+all: jack
+endif
 
 # --------------------------------------------------------------
 # special step for carla binaries
 
+ifneq ($(WASM),true)
 CARLA_BINARIES  = $(CURDIR)/../../carla/bin/carla-bridge-native$(APP_EXT)
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-lv2-gtk2$(APP_EXT)
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-lv2-gtk3$(APP_EXT)
@@ -99,5 +114,8 @@ carlabins: lv2 vst2 vst3
 	install -m 755 $(CARLA_BINARIES) $(shell dirname $(lv2))
 	install -m 755 $(CARLA_BINARIES) $(shell dirname $(vst2))
 	install -m 755 $(CARLA_BINARIES) $(shell dirname $(vst3))
+else
+carlabins:
+endif
 
 # --------------------------------------------------------------