diff --git a/plugin.json b/plugin.json
index a7af857..b7a8fd6 100644
--- a/plugin.json
+++ b/plugin.json
@@ -1,6 +1,6 @@
 {
   "slug": "AudibleInstruments",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "license": "GPL-3.0-or-later",
   "name": "Audible Instruments",
   "author": "VCV",
diff --git a/src/Blinds.cpp b/src/Blinds.cpp
index 6711405..fdc5e1d 100644
--- a/src/Blinds.cpp
+++ b/src/Blinds.cpp
@@ -79,7 +79,7 @@ struct Blinds : Module {
 struct BlindsWidget : ModuleWidget {
 	BlindsWidget(Blinds* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Blinds.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Blinds.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(150, 0)));
diff --git a/src/Braids.cpp b/src/Braids.cpp
index 6a66063..7d3e996 100644
--- a/src/Braids.cpp
+++ b/src/Braids.cpp
@@ -299,7 +299,7 @@ struct BraidsLowCpuItem : MenuItem {
 struct BraidsWidget : ModuleWidget {
 	BraidsWidget(Braids* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Braids.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Braids.svg")));
 
 		{
 			BraidsDisplay* display = new BraidsDisplay();
diff --git a/src/Branches.cpp b/src/Branches.cpp
index e39da76..eaca6d1 100644
--- a/src/Branches.cpp
+++ b/src/Branches.cpp
@@ -133,7 +133,7 @@ struct Branches : Module {
 struct BranchesWidget : ModuleWidget {
 	BranchesWidget(Branches* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Branches.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Branches.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
diff --git a/src/Clouds.cpp b/src/Clouds.cpp
index ba9d9d6..8a4a7fc 100644
--- a/src/Clouds.cpp
+++ b/src/Clouds.cpp
@@ -315,7 +315,7 @@ struct CloudsWidget : ModuleWidget {
 
 	CloudsWidget(Clouds* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Clouds.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Clouds.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(240, 0)));
diff --git a/src/Elements.cpp b/src/Elements.cpp
index bea16ea..9a694b0 100644
--- a/src/Elements.cpp
+++ b/src/Elements.cpp
@@ -304,7 +304,7 @@ struct ElementsModalItem : MenuItem {
 struct ElementsWidget : ModuleWidget {
 	ElementsWidget(Elements* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Elements.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Elements.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(480, 0)));
diff --git a/src/Frames.cpp b/src/Frames.cpp
index 933eae0..4618727 100644
--- a/src/Frames.cpp
+++ b/src/Frames.cpp
@@ -281,8 +281,8 @@ struct Frames : Module {
 
 struct CKSSRot : SVGSwitch {
 	CKSSRot() {
-		addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CKSS_rot_0.svg")));
-		addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CKSS_rot_1.svg")));
+		addFrame(Svg::load(asset::plugin(pluginInstance, "res/CKSS_rot_0.svg")));
+		addFrame(Svg::load(asset::plugin(pluginInstance, "res/CKSS_rot_1.svg")));
 	}
 };
 
@@ -290,7 +290,7 @@ struct CKSSRot : SVGSwitch {
 struct FramesWidget : ModuleWidget {
 	FramesWidget(Frames* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Frames.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Frames.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));
diff --git a/src/Kinks.cpp b/src/Kinks.cpp
index e4547ca..3db3114 100644
--- a/src/Kinks.cpp
+++ b/src/Kinks.cpp
@@ -70,7 +70,7 @@ struct Kinks : Module {
 struct KinksWidget : ModuleWidget {
 	KinksWidget(Kinks* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Kinks.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Kinks.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(15, 365)));
diff --git a/src/Links.cpp b/src/Links.cpp
index 9b83ff8..7638d27 100644
--- a/src/Links.cpp
+++ b/src/Links.cpp
@@ -86,7 +86,7 @@ struct Links : Module {
 struct LinksWidget : ModuleWidget {
 	LinksWidget(Links* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Links.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Links.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(15, 365)));
diff --git a/src/Marbles.cpp b/src/Marbles.cpp
index 11044fc..daf67b7 100644
--- a/src/Marbles.cpp
+++ b/src/Marbles.cpp
@@ -528,7 +528,7 @@ struct CKD6Light : BASE {
 struct MarblesWidget : ModuleWidget {
 	MarblesWidget(Marbles* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Marbles.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Marbles.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
diff --git a/src/Plaits.cpp b/src/Plaits.cpp
index ebe2d7a..078ad94 100644
--- a/src/Plaits.cpp
+++ b/src/Plaits.cpp
@@ -272,7 +272,7 @@ struct PlaitsWidget : ModuleWidget {
 
 	PlaitsWidget(Plaits* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Plaits.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Plaits.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
diff --git a/src/Rings.cpp b/src/Rings.cpp
index 9c03768..bb6fc86 100644
--- a/src/Rings.cpp
+++ b/src/Rings.cpp
@@ -250,7 +250,7 @@ struct Rings : Module {
 struct RingsWidget : ModuleWidget {
 	RingsWidget(Rings* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Rings.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Rings.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(180, 0)));
diff --git a/src/Ripples.cpp b/src/Ripples.cpp
index b605180..48234f8 100644
--- a/src/Ripples.cpp
+++ b/src/Ripples.cpp
@@ -86,7 +86,7 @@ struct Ripples : Module {
 struct RipplesWidget : ModuleWidget {
 	RipplesWidget(Ripples* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Ripples.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Ripples.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
diff --git a/src/Shades.cpp b/src/Shades.cpp
index 7215423..a9fd0b4 100644
--- a/src/Shades.cpp
+++ b/src/Shades.cpp
@@ -68,7 +68,7 @@ struct Shades : Module {
 struct ShadesWidget : ModuleWidget {
 	ShadesWidget(Shades* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Shades.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Shades.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(15, 365)));
diff --git a/src/Shelves.cpp b/src/Shelves.cpp
index 157a2af..130c1fe 100644
--- a/src/Shelves.cpp
+++ b/src/Shelves.cpp
@@ -187,7 +187,7 @@ struct Shelves : Module {
 struct ShelvesWidget : ModuleWidget {
 	ShelvesWidget(Shelves* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Shelves.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Shelves.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
diff --git a/src/Stages.cpp b/src/Stages.cpp
index 91e88c9..742a3ca 100644
--- a/src/Stages.cpp
+++ b/src/Stages.cpp
@@ -395,7 +395,7 @@ struct Stages : Module {
 struct StagesWidget : ModuleWidget {
 	StagesWidget(Stages* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Stages.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Stages.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
diff --git a/src/Streams.cpp b/src/Streams.cpp
index 1f1a095..acbed49 100644
--- a/src/Streams.cpp
+++ b/src/Streams.cpp
@@ -329,7 +329,7 @@ struct Streams : Module {
 struct StreamsWidget : ModuleWidget {
 	StreamsWidget(Streams* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Streams.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Streams.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
diff --git a/src/Tides.cpp b/src/Tides.cpp
index a153559..5a1b580 100644
--- a/src/Tides.cpp
+++ b/src/Tides.cpp
@@ -202,13 +202,13 @@ struct TidesWidget : ModuleWidget {
 		box.size = Vec(15 * 14, 380);
 		{
 			tidesPanel = new SvgPanel();
-			tidesPanel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Tides.svg")));
+			tidesPanel->setBackground(Svg::load(asset::plugin(pluginInstance, "res/Tides.svg")));
 			tidesPanel->box.size = box.size;
 			addChild(tidesPanel);
 		}
 		{
 			sheepPanel = new SvgPanel();
-			sheepPanel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Sheep.svg")));
+			sheepPanel->setBackground(Svg::load(asset::plugin(pluginInstance, "res/Sheep.svg")));
 			sheepPanel->box.size = box.size;
 			addChild(sheepPanel);
 		}
diff --git a/src/Tides2.cpp b/src/Tides2.cpp
index da45650..c6e9f45 100644
--- a/src/Tides2.cpp
+++ b/src/Tides2.cpp
@@ -260,7 +260,7 @@ struct Tides2 : Module {
 struct Tides2Widget : ModuleWidget {
 	Tides2Widget(Tides2* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Tides2.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Tides2.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
diff --git a/src/Veils.cpp b/src/Veils.cpp
index a7505ef..4a6de02 100644
--- a/src/Veils.cpp
+++ b/src/Veils.cpp
@@ -78,7 +78,7 @@ struct Veils : Module {
 struct VeilsWidget : ModuleWidget {
 	VeilsWidget(Veils* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Veils.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Veils.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(150, 0)));
diff --git a/src/Warps.cpp b/src/Warps.cpp
index e6a3c5e..2246d3e 100644
--- a/src/Warps.cpp
+++ b/src/Warps.cpp
@@ -130,7 +130,7 @@ struct AlgorithmLight : RedGreenBlueLight {
 struct WarpsWidget : ModuleWidget {
 	WarpsWidget(Warps* module) {
 		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Warps.svg")));
+		setPanel(Svg::load(asset::plugin(pluginInstance, "res/Warps.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(120, 0)));