diff --git a/plugins/Makefile b/plugins/Makefile
index d460c23..3e7390c 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -629,57 +629,57 @@ else
 PLUGIN_LIST = $(subst /plugin.json,,$(wildcard */plugin.json))
 endif
 
-PLUGIN_RESOURCES  = ../bin/Cardinal.lv2/resources/PluginManifests/Core.json
-PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/Cardinal.lv2/resources/%)
-PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/Cardinal.lv2/resources/PluginManifests/%.json)
+PLUGIN_RESOURCES  = ../bin/CardinalFX.lv2/resources/PluginManifests/Core.json
+PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.lv2/resources/%)
+PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.lv2/resources/PluginManifests/%.json)
 ifeq ($(MACOS),true)
-PLUGIN_RESOURCES += ../bin/Cardinal.vst/Contents/Resources/PluginManifests/Core.json
-PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/Cardinal.vst/Contents/Resources/%)
-PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/Cardinal.vst/Contents/Resources/PluginManifests/%.json)
+PLUGIN_RESOURCES += ../bin/CardinalFX.vst/Contents/Resources/PluginManifests/Core.json
+PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.vst/Contents/Resources/%)
+PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.vst/Contents/Resources/PluginManifests/%.json)
 else
-PLUGIN_RESOURCES += ../bin/Cardinal.vst/resources/PluginManifests/Core.json
-PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/Cardinal.vst/resources/%)
-PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/Cardinal.vst/resources/PluginManifests/%.json)
+PLUGIN_RESOURCES += ../bin/CardinalFX.vst/resources/PluginManifests/Core.json
+PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.vst/resources/%)
+PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.vst/resources/PluginManifests/%.json)
 endif
-PLUGIN_RESOURCES += ../bin/Cardinal.vst3/Contents/Resources/PluginManifests/Core.json
-PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/Cardinal.vst3/Contents/Resources/%)
-PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/Cardinal.vst3/Contents/Resources/PluginManifests/%.json)
+PLUGIN_RESOURCES += ../bin/CardinalFX.vst3/Contents/Resources/PluginManifests/Core.json
+PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.vst3/Contents/Resources/%)
+PLUGIN_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.vst3/Contents/Resources/PluginManifests/%.json)
 
 resources: $(PLUGIN_RESOURCES)
 
-../bin/Cardinal.%/Core.json: Core.json
+../bin/CardinalFX.%/Core.json: Core.json
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
-../bin/Cardinal.lv2/resources/%: %/res
+../bin/CardinalFX.lv2/resources/%: %/res
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
-../bin/Cardinal.vst/resources/%: %/res
+../bin/CardinalFX.vst/resources/%: %/res
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
-../bin/Cardinal.vst/Contents/Resources/%: %/res
+../bin/CardinalFX.vst/Contents/Resources/%: %/res
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
-../bin/Cardinal.vst3/Contents/Resources/%: %/res
+../bin/CardinalFX.vst3/Contents/Resources/%: %/res
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
-../bin/Cardinal.lv2/resources/PluginManifests/%.json: %/plugin.json
+../bin/CardinalFX.lv2/resources/PluginManifests/%.json: %/plugin.json
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
-../bin/Cardinal.vst/resources/PluginManifests/%.json: %/plugin.json
+../bin/CardinalFX.vst/resources/PluginManifests/%.json: %/plugin.json
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
-../bin/Cardinal.vst/Contents/Resources/PluginManifests/%.json: %/plugin.json
+../bin/CardinalFX.vst/Contents/Resources/PluginManifests/%.json: %/plugin.json
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
-../bin/Cardinal.vst3/Contents/Resources/PluginManifests/%.json: %/plugin.json
+../bin/CardinalFX.vst3/Contents/Resources/PluginManifests/%.json: %/plugin.json
 	-@mkdir -p "$(shell dirname $@)"
 	ln -sf $(abspath $<) $@
 
diff --git a/src/Makefile b/src/Makefile
index b7be576..0be0979 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -130,9 +130,9 @@ BASE_FLAGS += -Wno-unused-variable
 TARGET = rack.a
 
 all: $(TARGET)
-	$(MAKE) -C Cardinal
 	$(MAKE) -C CardinalFX
 	$(MAKE) -C CardinalSynth
+	$(MAKE) -C Cardinal
 
 resources:
 	$(MAKE) resources -C Cardinal
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 406d2dd..afd2c5f 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -228,65 +228,73 @@ BUILD_CXX_FLAGS += -DCARDINAL_PLUGIN_PREFIX='"$(PREFIX)"'
 # --------------------------------------------------------------
 # Enable all possible plugin types and setup resources
 
-ifeq ($(NAME),Cardinal)
+ifeq ($(NAME),CardinalFX)
 
-all: jack lv2 resources
+all: jack vst2 lv2 resources
 
 CORE_RESOURCES = $(filter-out icon.png,$(subst ../Rack/res/,,$(wildcard ../Rack/res/*))) template.vcv
 
-PLUGIN_RESOURCES += $(CORE_RESOURCES:%=$(TARGET_DIR)/Cardinal.lv2/resources/%)
+PLUGIN_RESOURCES += $(CORE_RESOURCES:%=$(TARGET_DIR)/CardinalFX.lv2/resources/%)
 ifeq ($(MACOS),true)
-PLUGIN_RESOURCES += $(CORE_RESOURCES:%=$(TARGET_DIR)/Cardinal.vst/Contents/Resources/%)
+PLUGIN_RESOURCES += $(CORE_RESOURCES:%=$(TARGET_DIR)/CardinalFX.vst/Contents/Resources/%)
 else
-PLUGIN_RESOURCES += $(CORE_RESOURCES:%=$(TARGET_DIR)/Cardinal.vst/resources/%)
+PLUGIN_RESOURCES += $(CORE_RESOURCES:%=$(TARGET_DIR)/CardinalFX.vst/resources/%)
 endif
-PLUGIN_RESOURCES += $(CORE_RESOURCES:%=$(TARGET_DIR)/Cardinal.vst3/Contents/Resources/%)
+PLUGIN_RESOURCES += $(CORE_RESOURCES:%=$(TARGET_DIR)/CardinalFX.vst3/Contents/Resources/%)
 
-else
+else # CardinalFX
 
+ifeq ($(NAME),Cardinal)
+all: jack lv2 vst3 resources
+else
 all: jack lv2 vst2 vst3 resources
+endif
 
 PLUGIN_RESOURCES += $(TARGET_DIR)/$(NAME).lv2/resources
+PLUGIN_RESOURCES += $(TARGET_DIR)/$(NAME).vst3/Contents/Resources
+
+# Cardinal (full) is not available as VST2 due to lack of CV ports
+ifneq ($(NAME),Cardinal)
 ifeq ($(MACOS),true)
 PLUGIN_RESOURCES += $(TARGET_DIR)/$(NAME).vst/Contents/Resources
 else
 PLUGIN_RESOURCES += $(TARGET_DIR)/$(NAME).vst/resources
 endif
-PLUGIN_RESOURCES += $(TARGET_DIR)/$(NAME).vst3/Contents/Resources
-
 endif
 
+endif # CardinalFX
+
 # --------------------------------------------------------------
 
 resources: $(PLUGIN_RESOURCES)
 
-ifneq ($(NAME),Cardinal)
+ifneq ($(NAME),CardinalFX)
 lv2: resources
 vst2: resources
 vst3: resources
-$(TARGET_DIR)/$(NAME).%: $(TARGET_DIR)/Cardinal.%
+$(TARGET_DIR)/$(NAME).%: $(TARGET_DIR)/CardinalFX.%
 	-@mkdir -p "$(shell dirname $@)"
-	ln -sf $(abspath $<) $@
+	$(SILENT)ln -sf $(abspath $<) $@
 endif
 
-$(TARGET_DIR)/Cardinal.%/template.vcv: ../template.vcv
+$(TARGET_DIR)/CardinalFX.%/template.vcv: ../template.vcv
 	-@mkdir -p "$(shell dirname $@)"
-	ln -sf $(abspath $<) $@
+	$(SILENT)ln -sf $(abspath $<) $@
 
-$(TARGET_DIR)/Cardinal.lv2/resources/%: ../Rack/res/%
+$(TARGET_DIR)/CardinalFX.lv2/resources/%: ../Rack/res/%
 	-@mkdir -p "$(shell dirname $@)"
-	ln -sf $(abspath $<) $@
+	$(SILENT)ln -sf $(abspath $<) $@
 
-$(TARGET_DIR)/Cardinal.vst/resources/%: ../Rack/res/%
+$(TARGET_DIR)/CardinalFX.vst/resources/%: ../Rack/res/%
 	-@mkdir -p "$(shell dirname $@)"
-	ln -sf $(abspath $<) $@
+	$(SILENT)ln -sf $(abspath $<) $@
 
-$(TARGET_DIR)/Cardinal.vst/Contents/Resources/%: ../Rack/res/%
+$(TARGET_DIR)/CardinalFX.vst/Contents/Resources/%: ../Rack/res/%
 	-@mkdir -p "$(shell dirname $@)"
-	ln -sf $(abspath $<) $@
+	$(SILENT)ln -sf $(abspath $<) $@
 
-$(TARGET_DIR)/Cardinal.vst3/Contents/Resources/%: ../Rack/res/%
+$(TARGET_DIR)/CardinalFX.vst3/Contents/Resources/%: ../Rack/res/%
 	-@mkdir -p "$(shell dirname $@)"
-	ln -sf $(abspath $<) $@
+	$(SILENT)ln -sf $(abspath $<) $@
 
 # --------------------------------------------------------------