diff --git a/Makefile.dist.mk b/Makefile.dist.mk
index f1aea22f3..ebbdb7b78 100644
--- a/Makefile.dist.mk
+++ b/Makefile.dist.mk
@@ -256,7 +256,7 @@ build/Carla.app/Contents/MacOS/lib/library.zip: $(CARLA_APP_ZIPS) data/macos/bun
 
 build/Carla/Carla.exe: build/Carla/lib/library.zip
 
-build/Carla/lib/library.zip: data/windows/app-gui.py # source/frontend/*
+build/Carla/lib/library.zip: data/windows/app-gui.py source/frontend/*
 	$(call GENERATE_LIBRARY_ZIP,Carla)
 
 # $(CARLA_APP_ZIPS)
@@ -325,6 +325,14 @@ build/Carla/iconengines/% build/Carla-Control/iconengines/%: $(QT5_PREFIX)/lib/q
 	-@mkdir -p $(shell dirname $@)
 	@cp -v $< $@
 
+build/Carla/imageformats/% build/Carla-Control/imageformats/%: $(QT5_PREFIX)/lib/qt5/plugins/imageformats/%
+	-@mkdir -p $(shell dirname $@)
+	@cp -v $< $@
+
+build/Carla/platforms/% build/Carla-Control/platforms/%: $(QT5_PREFIX)/lib/qt5/plugins/platforms/%
+	-@mkdir -p $(shell dirname $@)
+	@cp -v $< $@
+
 build/Carla/% build/Carla-Control/%: bin/%
 	-@mkdir -p $(shell dirname $@)
 	@cp -v $< $@
diff --git a/source/frontend/carla.cpp b/source/frontend/C++/carla.cpp
similarity index 100%
rename from source/frontend/carla.cpp
rename to source/frontend/C++/carla.cpp
diff --git a/source/frontend/carla_app.cpp b/source/frontend/C++/carla_app.cpp
similarity index 100%
rename from source/frontend/carla_app.cpp
rename to source/frontend/C++/carla_app.cpp
diff --git a/source/frontend/carla_app.hpp b/source/frontend/C++/carla_app.hpp
similarity index 100%
rename from source/frontend/carla_app.hpp
rename to source/frontend/C++/carla_app.hpp
diff --git a/source/frontend/carla_database.cpp b/source/frontend/C++/carla_database.cpp
similarity index 100%
rename from source/frontend/carla_database.cpp
rename to source/frontend/C++/carla_database.cpp
diff --git a/source/frontend/carla_database.hpp b/source/frontend/C++/carla_database.hpp
similarity index 100%
rename from source/frontend/carla_database.hpp
rename to source/frontend/C++/carla_database.hpp
diff --git a/source/frontend/carla_database_app.cpp b/source/frontend/C++/carla_database_app.cpp
similarity index 100%
rename from source/frontend/carla_database_app.cpp
rename to source/frontend/C++/carla_database_app.cpp
diff --git a/source/frontend/carla_host.cpp b/source/frontend/C++/carla_host.cpp
similarity index 100%
rename from source/frontend/carla_host.cpp
rename to source/frontend/C++/carla_host.cpp
diff --git a/source/frontend/carla_host.hpp b/source/frontend/C++/carla_host.hpp
similarity index 100%
rename from source/frontend/carla_host.hpp
rename to source/frontend/C++/carla_host.hpp
diff --git a/source/frontend/carla_settings.cpp b/source/frontend/C++/carla_settings.cpp
similarity index 100%
rename from source/frontend/carla_settings.cpp
rename to source/frontend/C++/carla_settings.cpp
diff --git a/source/frontend/carla_settings.hpp b/source/frontend/C++/carla_settings.hpp
similarity index 100%
rename from source/frontend/carla_settings.hpp
rename to source/frontend/C++/carla_settings.hpp
diff --git a/source/frontend/carla_settings_app.cpp b/source/frontend/C++/carla_settings_app.cpp
similarity index 100%
rename from source/frontend/carla_settings_app.cpp
rename to source/frontend/C++/carla_settings_app.cpp
diff --git a/source/frontend/carla_shared.cpp b/source/frontend/C++/carla_shared.cpp
similarity index 100%
rename from source/frontend/carla_shared.cpp
rename to source/frontend/C++/carla_shared.cpp
diff --git a/source/frontend/carla_shared.hpp b/source/frontend/C++/carla_shared.hpp
similarity index 100%
rename from source/frontend/carla_shared.hpp
rename to source/frontend/C++/carla_shared.hpp
diff --git a/source/frontend/carla_skin.cpp b/source/frontend/C++/carla_skin.cpp
similarity index 100%
rename from source/frontend/carla_skin.cpp
rename to source/frontend/C++/carla_skin.cpp
diff --git a/source/frontend/carla_skin.hpp b/source/frontend/C++/carla_skin.hpp
similarity index 100%
rename from source/frontend/carla_skin.hpp
rename to source/frontend/C++/carla_skin.hpp
diff --git a/source/frontend/carla_widgets.cpp b/source/frontend/C++/carla_widgets.cpp
similarity index 100%
rename from source/frontend/carla_widgets.cpp
rename to source/frontend/C++/carla_widgets.cpp
diff --git a/source/frontend/carla_widgets.hpp b/source/frontend/C++/carla_widgets.hpp
similarity index 100%
rename from source/frontend/carla_widgets.hpp
rename to source/frontend/C++/carla_widgets.hpp
diff --git a/source/frontend/carla_database.py b/source/frontend/carla_database.py
index b5c60bd5c..f3fb87060 100755
--- a/source/frontend/carla_database.py
+++ b/source/frontend/carla_database.py
@@ -1135,11 +1135,11 @@ class PluginRefreshW(QDialog):
             self.ui.ico_native.setPixmap(self.fIconNo)
             self.ui.ch_native.setEnabled(False)
             self.ui.ch_sf2.setEnabled(False)
-            self.ui.ch_sfz.setEnabled(False)
             if not hasNonNative:
                 self.ui.ch_ladspa.setEnabled(False)
                 self.ui.ch_dssi.setEnabled(False)
                 self.ui.ch_vst.setEnabled(False)
+                self.ui.ch_vst3.setEnabled(False)
 
         self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)