diff --git a/plugins/Makefile b/plugins/Makefile
index f58fc29..f9e79b8 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1087,7 +1087,11 @@ SURGEXT_FLAGS += -DSURGE_RACK_BASE_VERSION=XT1-0-1
 SURGEXT_FLAGS += -DSURGE_RACK_PLUG_VERSION=Cardinal
 SURGEXT_FLAGS += -DSURGE_RACK_SURGE_VERSION=Cardinal
 
+MINIPLUGIN_FILES += surgext/src/LFO.cpp
+MINIPLUGIN_FILES += surgext/src/Mixer.cpp
+MINIPLUGIN_FILES += surgext/src/ModMatrix.cpp
 MINIPLUGIN_FILES += surgext/src/VCO.cpp
+MINIPLUGIN_FILES += surgext/src/Waveshaper.cpp
 MINIPLUGIN_FILES += surgext/src/XTModule.cpp
 MINIPLUGIN_FILES += surgext/src/XTModuleWidget.cpp
 MINIPLUGIN_FILES += surgext/src/XTStyle.cpp
@@ -1843,9 +1847,9 @@ MINIRESOURCE_FILES += MockbaModular/res/CZOsc.svg
 MINIRESOURCE_FILES += MockbaModular/res/Empty_gray.svg
 MINIRESOURCE_FILES += MockbaModular/res/Empty_light.svg
 MINIRESOURCE_FILES += MockbaModular/res/Filtah.svg
-# MINIRESOURCE_FILES += MockbaModular/res/HSW_0.svg
-# MINIRESOURCE_FILES += MockbaModular/res/HSW_1.svg
-# MINIRESOURCE_FILES += MockbaModular/res/HSW_2.svg
+MINIRESOURCE_FILES += MockbaModular/res/HSW_0.svg
+MINIRESOURCE_FILES += MockbaModular/res/HSW_1.svg
+MINIRESOURCE_FILES += MockbaModular/res/HSW_2.svg
 MINIRESOURCE_FILES += MockbaModular/res/knob.svg
 MINIRESOURCE_FILES += MockbaModular/res/MaugOsc.svg
 MINIRESOURCE_FILES += MockbaModular/res/Mixah.svg
@@ -1856,41 +1860,48 @@ MINIRESOURCE_FILES += MockbaModular/res/screw.svg
 MINIRESOURCE_FILES += MockbaModular/res/selector.svg
 MINIRESOURCE_FILES += MockbaModular/res/Shapah.svg
 
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/fader_bg_25.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/fader_bg.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/fader_handle.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/knob-12.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/knob-14.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/knob-16.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/knob-9.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/knob-pointer-12.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/knob-pointer-14.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/knob-pointer-16.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/knob-pointer-9.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/mod-button.svg
-MINIRESOURCE_FILES += surgext/res/xt/mid/components/port.svg
-MINIRESOURCE_FILES += surgext/res/xt/light/String.svg
-MINIRESOURCE_FILES += surgext/res/xt/light/components/fader_bg_25.svg
+MINIRESOURCE_FILES += surgext/res/xt/fonts/quicksand/Quicksand-Regular.ttf
+MINIRESOURCE_FILES += surgext/res/xt/fonts/quicksand/Quicksand-Bold.ttf
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/fader_bg.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/fader_bg_25.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/fader_handle.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-9.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-12.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-14.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-16.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-pointer-9.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-pointer-12.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-pointer-14.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-pointer-16.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/mod-button.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/components/port.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/panels/other/EGLFO.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/panels/other/Matrix.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/panels/other/Mixer.svg
+MINIRESOURCE_FILES += surgext/res/xt/dark/panels/vco/BlankVCO.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/fader_bg.svg
+MINIRESOURCE_FILES += surgext/res/xt/light/components/fader_bg_25.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/fader_handle.svg
+MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-9.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-12.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-14.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-16.svg
-MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-9.svg
+MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-pointer-9.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-pointer-12.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-pointer-14.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-pointer-16.svg
-MINIRESOURCE_FILES += surgext/res/xt/light/components/knob-pointer-9.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/mod-button.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/components/port.svg
-MINIRESOURCE_FILES += surgext/res/xt/light/panels/fx/BlankNoDisplay.svg
-MINIRESOURCE_FILES += surgext/res/xt/light/panels/other/blank6hp.svg
+# MINIRESOURCE_FILES += surgext/res/xt/light/panels/other/blank6hp.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/panels/other/EGLFO.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/panels/other/Matrix.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/panels/other/Mixer.svg
-MINIRESOURCE_FILES += surgext/res/xt/light/panels/other/TotalBlank.svg
+# MINIRESOURCE_FILES += surgext/res/xt/light/panels/other/TotalBlank.svg
 MINIRESOURCE_FILES += surgext/res/xt/light/panels/vco/BlankVCO.svg
 
+MINIRESOURCE_FILES += surgext/build/surge-data/configuration.xml
+MINIRESOURCE_FILES += surgext/build/surge-data/windows.wt
+
 # MINIRESOURCE_FILES += ValleyAudio/res/DexterPanelDark.svg
 # MINIRESOURCE_FILES += ValleyAudio/res/DexterPanelLight.svg
 # MINIRESOURCE_FILES += ValleyAudio/res/InterzonePanelDark.svg
diff --git a/plugins/plugins-mini.cpp b/plugins/plugins-mini.cpp
index 0f1b66a..598b537 100644
--- a/plugins/plugins-mini.cpp
+++ b/plugins/plugins-mini.cpp
@@ -532,61 +532,38 @@ static void initStatic__surgext()
     if (spl.ok())
     {
         p->addModel(modelVCOClassic);
-//         p->addModel(modelVCOModern);
-//         p->addModel(modelVCOWavetable);
-//         p->addModel(modelVCOWindow);
-//         p->addModel(modelVCOSine);
-//         p->addModel(modelVCOFM2);
-//         p->addModel(modelVCOFM3);
-//         p->addModel(modelVCOSHNoise);
-//         p->addModel(modelVCOAlias);
-//         p->addModel(modelVCOString);
-//         p->addModel(modelVCOTwist);
-        spl.removeModule("SurgeXTOSCModern");
-        spl.removeModule("SurgeXTOSCWavetable");
-        spl.removeModule("SurgeXTOSCWindow");
-        spl.removeModule("SurgeXTOSCSine");
+        p->addModel(modelVCOModern);
+        p->addModel(modelVCOSHNoise);
+        p->addModel(modelVCOSine);
+        p->addModel(modelVCOString);
+        p->addModel(modelVCOTwist);
+        /*
+        p->addModel(modelVCOAlias);
+        p->addModel(modelVCOFM2);
+        p->addModel(modelVCOFM3);
+        p->addModel(modelVCOWavetable);
+        p->addModel(modelVCOWindow);
+        */
+        spl.removeModule("SurgeXTOSCAlias");
         spl.removeModule("SurgeXTOSCFM2");
         spl.removeModule("SurgeXTOSCFM3");
-        spl.removeModule("SurgeXTOSCSHNoise");
-        spl.removeModule("SurgeXTOSCAlias");
-        spl.removeModule("SurgeXTOSCString");
-        spl.removeModule("SurgeXTOSCTwist");
+        spl.removeModule("SurgeXTOSCWavetable");
+        spl.removeModule("SurgeXTOSCWindow");
 
         // Add the ported ones
-//         p->addModel(modelSurgeVCF);
-//         p->addModel(modelSurgeDelay);
-//         p->addModel(modelSurgeDelayLineByFreq);
-//         p->addModel(modelSurgeWaveshaper);
-//         p->addModel(modelSurgeLFO);
-//         p->addModel(modelSurgeMixer);
-//         p->addModel(modelSurgeModMatrix);
-        spl.removeModule("SurgeXTVCF");
+        p->addModel(modelSurgeLFO);
+        p->addModel(modelSurgeMixer);
+        p->addModel(modelSurgeModMatrix);
+        p->addModel(modelSurgeWaveshaper);
+        /*
+        p->addModel(modelSurgeDelay);
+        p->addModel(modelSurgeDelayLineByFreq);
+        p->addModel(modelSurgeVCF);
+        */
         spl.removeModule("SurgeXTDelay");
         spl.removeModule("SurgeXTDelayLineByFreq");
-        spl.removeModule("SurgeXTWaveshaper");
-        spl.removeModule("SurgeXTLFO");
-        spl.removeModule("SurgeXTMixer");
-        spl.removeModule("SurgeXTModMatrix");
+        spl.removeModule("SurgeXTVCF");
 
-//         p->addModel(modelFXReverb);
-//         p->addModel(modelFXPhaser);
-//         p->addModel(modelFXRotarySpeaker);
-//         p->addModel(modelFXDistortion);
-//         p->addModel(modelFXFrequencyShifter);
-//         p->addModel(modelFXChorus);
-//         p->addModel(modelFXVocoder);
-//         p->addModel(modelFXReverb2);
-//         p->addModel(modelFXFlanger);
-//         p->addModel(modelFXRingMod);
-//         p->addModel(modelFXNeuron);
-//         p->addModel(modelFXResonator);
-//         p->addModel(modelFXChow);
-//         p->addModel(modelFXExciter);
-//         p->addModel(modelFXEnsemble);
-//         p->addModel(modelFXCombulator);
-//         p->addModel(modelFXSpringReverb);
-//         p->addModel(modelFXTreeMonster);
         spl.removeModule("SurgeXTFXChorus");
         spl.removeModule("SurgeXTFXChow");
         spl.removeModule("SurgeXTFXCombulator");