diff --git a/docs/LICENSES.md b/docs/LICENSES.md
index cb6501e..971bf3e 100644
--- a/docs/LICENSES.md
+++ b/docs/LICENSES.md
@@ -129,8 +129,15 @@ Below is a list of artwork licenses from plugins
 | BaconPlugs/*                            | GPL-3.0-or-later | No artwork specific license provided |
 | BaconPlugs/midi/*                       | CC-BY-SA-3.0-DE  | |
 | BaconPlugs/midi/beeth/*                 | ???              | Unused in Cardinal, taken from http://www.jsbach.net/ |
-| BaconPlugs/1f953.svg                    | CC-BY-4.0        | |
+| BaconPlugs/FiraMono-Regular.ttf         | OFL-1.1-RFN      | |
+| BaconPlugs/Monitorica-Bd.ttf            | CC-BY-SA-4.0     | |
 | BaconPlugs/Keypunch029.json             | OFL-1.1          | |
+| BaconPlugs/1f953.svg                    | CC-BY-4.0        | |
+| BaconPlugs/1f60d.svg                    | CC-BY-4.0        | |
+| BaconPlugs/HelpActive.svg               | CC0-1.0          | |
+| BaconPlugs/HelpActiveSmall.svg          | CC0-1.0          | |
+| BaconPlugs/SABROG-*.svg                 | CC0-1.0          | |
+| BaconPlugs/sabrog-*.svg                 | CC0-1.0          | |
 | Bidoo/*                                 | CC-BY-NC-ND-4.0  | [Special permission granted for runtime dark mode](https://github.com/sebastien-bouffier/Bidoo/issues/191) |
 | Befaco/components/*                     | CC-BY-NC-4.0     | |
 | Befaco/fonts/Segment7Standard.otf       | OFL-1.1-RFN      | |
diff --git a/plugins/BaconPlugs b/plugins/BaconPlugs
index adf84fc..a86d508 160000
--- a/plugins/BaconPlugs
+++ b/plugins/BaconPlugs
@@ -1 +1 @@
-Subproject commit adf84fc00a953f8e8a1b378531a08ee68b9a68d7
+Subproject commit a86d5081d12a72ae0d0c775c61813b695cde8a9c
diff --git a/plugins/Befaco b/plugins/Befaco
index adcc920..fcf9b56 160000
--- a/plugins/Befaco
+++ b/plugins/Befaco
@@ -1 +1 @@
-Subproject commit adcc9203245dae35ffc5a73020bdcc07ff90f557
+Subproject commit fcf9b564017d8eee63504771a3006bea81749ff8
diff --git a/plugins/Makefile b/plugins/Makefile
index 9c08858..5565bf0 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1671,7 +1671,7 @@ $(BUILD_DIR)/Axioma/%.cpp.o: Axioma/%.cpp
 $(BUILD_DIR)/BaconPlugs/%.cpp.o: BaconPlugs/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -std=gnu++17 -c -o $@ \
 		$(foreach m,$(BACON_CUSTOM),$(call custom_module_names,$(m),BaconPlugs)) \
 		-DpluginInstance=pluginInstance__Bacon \
 		-DDARK_BACON \
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index fd7571b..b19046a 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -1429,23 +1429,16 @@ static void initStatic__Bacon()
         p->addModel(modelPolyGnome);
         p->addModel(modelQuantEyes);
         p->addModel(modelSampleDelay);
-#ifdef BUILD_SORTACHORUS
-        p->addModel(modelSortaChorus);
-#endif
         p->addModel(modelChipNoise);
         p->addModel(modelChipWaves);
         p->addModel(modelChipYourWave);
         p->addModel(modelOpen303);
-#ifdef BUILD_GENERICLSFR
-        p->addModel(modelGenericLFSR);
-#endif
         p->addModel(modelKarplusStrongPoly);
         p->addModel(modelALingADing);
         p->addModel(modelBitulator);
-#ifdef BUILD_PHASER
-        p->addModel(modelPhaser);
-#endif
         p->addModel(modelPolyGenerator);
+        p->addModel(modelLintBuddy);
+        p->addModel(modelLuckyHold);
     }
 }
 
@@ -1479,6 +1472,7 @@ static void initStatic__Befaco()
         p->addModel(modelNoisePlethora);
         p->addModel(modelChannelStrip);
         p->addModel(modelPonyVCO);
+        p->addModel(modelMotionMTR);
 #undef modelADSR
 #undef modelMixer
     }
diff --git a/plugins/surgext-helper/surgext-helper.cpp b/plugins/surgext-helper/surgext-helper.cpp
index 1b7c527..c349e87 100644
--- a/plugins/surgext-helper/surgext-helper.cpp
+++ b/plugins/surgext-helper/surgext-helper.cpp
@@ -15,17 +15,23 @@
  * For a full copy of the GNU General Public License see the LICENSE file.
  */
 
+#include "../BaconPlugs/src/Style.hpp"
 #include "../surgext/src/XTStyle.h"
 
+using namespace baconpaul::rackplugs;
 using namespace sst::surgext_rack::style;
 
 void surgext_rack_initialize()
 {
+    BaconStyle::get()->activeStyle = rack::settings::darkMode ? BaconStyle::DARK : BaconStyle::LIGHT;
     XTStyle::initialize();
 }
 
 void surgext_rack_update_theme()
 {
+    BaconStyle::get()->activeStyle = rack::settings::darkMode ? BaconStyle::DARK : BaconStyle::LIGHT;
+    BaconStyle::get()->notifyStyleListeners();
+
     XTStyle::setGlobalStyle(rack::settings::darkMode ? XTStyle::Style::DARK : XTStyle::Style::LIGHT);
     XTStyle::notifyStyleListeners();
 }