diff --git a/include/componentlibrary.hpp b/include/componentlibrary.hpp
index 74ce6e5e..3eb3ca48 100644
--- a/include/componentlibrary.hpp
+++ b/include/componentlibrary.hpp
@@ -292,35 +292,35 @@ struct RoundKnob : app::SvgKnob {
 struct RoundBlackKnob : RoundKnob {
 	RoundBlackKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBlackKnob.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBlackKnob-bg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBlackKnob_bg.svg")));
 	}
 };
 
 struct RoundSmallBlackKnob : RoundKnob {
 	RoundSmallBlackKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundSmallBlackKnob.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundSmallBlackKnob-bg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundSmallBlackKnob_bg.svg")));
 	}
 };
 
 struct RoundLargeBlackKnob : RoundKnob {
 	RoundLargeBlackKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundLargeBlackKnob.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundLargeBlackKnob-bg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundLargeBlackKnob_bg.svg")));
 	}
 };
 
 struct RoundBigBlackKnob : RoundKnob {
 	RoundBigBlackKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBigBlackKnob.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBigBlackKnob-bg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundBigBlackKnob_bg.svg")));
 	}
 };
 
 struct RoundHugeBlackKnob : RoundKnob {
 	RoundHugeBlackKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundHugeBlackKnob.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundHugeBlackKnob-bg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/RoundHugeBlackKnob_bg.svg")));
 	}
 };
 
@@ -332,45 +332,56 @@ struct RoundBlackSnapKnob : RoundBlackKnob {
 
 
 struct Davies1900hKnob : app::SvgKnob {
+	widget::SvgWidget* bg;
+
 	Davies1900hKnob() {
 		minAngle = -0.83 * M_PI;
 		maxAngle = 0.83 * M_PI;
+
+		bg = new widget::SvgWidget;
+		fb->addChildBelow(bg, tw);
 	}
 };
 
 struct Davies1900hWhiteKnob : Davies1900hKnob {
 	Davies1900hWhiteKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hWhite.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hWhite_bg.svg")));
 	}
 };
 
 struct Davies1900hBlackKnob : Davies1900hKnob {
 	Davies1900hBlackKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hBlack.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hBlack_bg.svg")));
 	}
 };
 
 struct Davies1900hRedKnob : Davies1900hKnob {
 	Davies1900hRedKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hRed.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hRed_bg.svg")));
 	}
 };
 
 struct Davies1900hLargeWhiteKnob : Davies1900hKnob {
 	Davies1900hLargeWhiteKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeWhite.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeWhite_bg.svg")));
 	}
 };
 
 struct Davies1900hLargeBlackKnob : Davies1900hKnob {
 	Davies1900hLargeBlackKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeBlack.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeBlack_bg.svg")));
 	}
 };
 
 struct Davies1900hLargeRedKnob : Davies1900hKnob {
 	Davies1900hLargeRedKnob() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeRed.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Davies1900hLargeRed_bg.svg")));
 	}
 };
 
@@ -394,216 +405,216 @@ struct Rogan : app::SvgKnob {
 struct Rogan6PSWhite : Rogan {
 	Rogan6PSWhite() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PSWhite.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PSWhite-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan6PSWhite_fg.svg")));
 	}
 };
 
 struct Rogan5PSGray : Rogan {
 	Rogan5PSGray() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PSGray.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PSGray-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan5PSGray_fg.svg")));
 	}
 };
 
 struct Rogan3PSBlue : Rogan {
 	Rogan3PSBlue() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSBlue.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSBlue-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSBlue_fg.svg")));
 	}
 };
 
 struct Rogan3PSRed : Rogan {
 	Rogan3PSRed() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSRed.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSRed-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSRed_fg.svg")));
 	}
 };
 
 struct Rogan3PSGreen : Rogan {
 	Rogan3PSGreen() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSGreen.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSGreen-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSGreen_fg.svg")));
 	}
 };
 
 struct Rogan3PSWhite : Rogan {
 	Rogan3PSWhite() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSWhite.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSWhite-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PSWhite_fg.svg")));
 	}
 };
 
 struct Rogan3PBlue : Rogan {
 	Rogan3PBlue() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PBlue.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PBlue-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PBlue_fg.svg")));
 	}
 };
 
 struct Rogan3PRed : Rogan {
 	Rogan3PRed() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PRed.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PRed-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PRed_fg.svg")));
 	}
 };
 
 struct Rogan3PGreen : Rogan {
 	Rogan3PGreen() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PGreen.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PGreen-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PGreen_fg.svg")));
 	}
 };
 
 struct Rogan3PWhite : Rogan {
 	Rogan3PWhite() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PWhite.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PWhite-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan3PWhite_fg.svg")));
 	}
 };
 
 struct Rogan2SGray : Rogan {
 	Rogan2SGray() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2SGray.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2S-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2SGray-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2S_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2SGray_fg.svg")));
 	}
 };
 
 struct Rogan2PSBlue : Rogan {
 	Rogan2PSBlue() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSBlue.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSBlue-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSBlue_fg.svg")));
 	}
 };
 
 struct Rogan2PSRed : Rogan {
 	Rogan2PSRed() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSRed.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSRed-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSRed_fg.svg")));
 	}
 };
 
 struct Rogan2PSGreen : Rogan {
 	Rogan2PSGreen() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSGreen.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSGreen-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSGreen_fg.svg")));
 	}
 };
 
 struct Rogan2PSWhite : Rogan {
 	Rogan2PSWhite() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSWhite.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSWhite-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PSWhite_fg.svg")));
 	}
 };
 
 struct Rogan2PBlue : Rogan {
 	Rogan2PBlue() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PBlue.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PBlue-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PBlue_fg.svg")));
 	}
 };
 
 struct Rogan2PRed : Rogan {
 	Rogan2PRed() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PRed.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PRed-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PRed_fg.svg")));
 	}
 };
 
 struct Rogan2PGreen : Rogan {
 	Rogan2PGreen() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PGreen.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PGreen-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PGreen_fg.svg")));
 	}
 };
 
 struct Rogan2PWhite : Rogan {
 	Rogan2PWhite() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PWhite.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PWhite-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan2PWhite_fg.svg")));
 	}
 };
 
 struct Rogan1PSBlue : Rogan {
 	Rogan1PSBlue() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSBlue.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSBlue-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSBlue_fg.svg")));
 	}
 };
 
 struct Rogan1PSRed : Rogan {
 	Rogan1PSRed() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSRed.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSRed-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSRed_fg.svg")));
 	}
 };
 
 struct Rogan1PSGreen : Rogan {
 	Rogan1PSGreen() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSGreen.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSGreen-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSGreen_fg.svg")));
 	}
 };
 
 struct Rogan1PSWhite : Rogan {
 	Rogan1PSWhite() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSWhite.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSWhite-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PS_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PSWhite_fg.svg")));
 	}
 };
 
 struct Rogan1PBlue : Rogan {
 	Rogan1PBlue() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PBlue.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PBlue-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PBlue_fg.svg")));
 	}
 };
 
 struct Rogan1PRed : Rogan {
 	Rogan1PRed() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PRed.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PRed-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PRed_fg.svg")));
 	}
 };
 
 struct Rogan1PGreen : Rogan {
 	Rogan1PGreen() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PGreen.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PGreen-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PGreen_fg.svg")));
 	}
 };
 
 struct Rogan1PWhite : Rogan {
 	Rogan1PWhite() {
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PWhite.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PWhite-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1P_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rogan1PWhite_fg.svg")));
 	}
 };
 
@@ -622,8 +633,8 @@ struct SynthTechAlco : app::SvgKnob {
 		minAngle = -0.82 * M_PI;
 		maxAngle = 0.82 * M_PI;
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco-bg.svg")));
-		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco-fg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco_bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco_fg.svg")));
 	}
 };
 
@@ -638,7 +649,7 @@ struct Trimpot : app::SvgKnob {
 		fb->addChildBelow(bg, tw);
 
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/Trimpot.svg")));
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Trimpot-bg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/Trimpot_bg.svg")));
 	}
 };
 
@@ -652,15 +663,22 @@ struct BefacoBigKnob : app::SvgKnob {
 
 		bg = new widget::SvgWidget;
 		fb->addChildBelow(bg, tw);
-		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoBigKnob-bg.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoBigKnob_bg.svg")));
 	}
 };
 
 struct BefacoTinyKnob : app::SvgKnob {
+	widget::SvgWidget* bg;
+
 	BefacoTinyKnob() {
 		minAngle = -0.75 * M_PI;
 		maxAngle = 0.75 * M_PI;
-		setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoTinyKnob.svg")));
+
+		bg = new widget::SvgWidget;
+		fb->addChildBelow(bg, tw);
+
+		setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoTinyPointBlack.svg")));
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg")));
 	}
 };
 
@@ -1020,7 +1038,7 @@ struct AudioButton_ADAT : app::AudioButton {
 
 struct AudioButton_USB_B : app::AudioButton {
 	AudioButton_USB_B() {
-		addFrame(Svg::load(asset::system("res/ComponentLibrary/USB-B.svg")));
+		addFrame(Svg::load(asset::system("res/ComponentLibrary/USB_B.svg")));
 		shadow->opacity = 0.0;
 	}
 };
diff --git a/res/ComponentLibrary/BefacoBigKnob-bg.svg b/res/ComponentLibrary/BefacoBigKnob_bg.svg
similarity index 100%
rename from res/ComponentLibrary/BefacoBigKnob-bg.svg
rename to res/ComponentLibrary/BefacoBigKnob_bg.svg
diff --git a/res/ComponentLibrary/BefacoPush_0.svg b/res/ComponentLibrary/BefacoPush_0.svg
index 2f666ae1..c9a42037 100644
--- a/res/ComponentLibrary/BefacoPush_0.svg
+++ b/res/ComponentLibrary/BefacoPush_0.svg
@@ -1,82 +1,62 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="28"
-   height="28"
-   viewBox="0 0 7.4083333 7.4083333"
-   version="1.1"
-   id="svg11543"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="BefacoPush_0.svg">
-  <defs
-     id="defs11537" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-9.6628075"
-     inkscape:cy="-9.0802029"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata11540">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-33.337496,-58.194645)">
-    <g
-       id="g6703"
-       transform="matrix(0.22180737,0,0,-0.22180737,-187.44188,317.8558)"
-       style="stroke-width:1.59046912">
-      <path
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.19285178;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 1012.0498,1137.8572 c -8.871,0 -16.088,7.232 -16.088,16.119 0,8.871 7.217,16.088 16.088,16.088 8.888,0 16.119,-7.217 16.119,-16.088 0,-8.887 -7.231,-16.119 -16.119,-16.119"
-         id="path4505"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1012.1123,1140.4229 c -7.465,0 -13.538,6.073 -13.538,13.538 0,7.465 6.073,13.539 13.538,13.539 7.465,0 13.538,-6.074 13.538,-13.539 0,-7.465 -6.073,-13.538 -13.538,-13.538"
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.19285178;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6735"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1012.0654,1163.9658 c 5.525,0 10.005,-4.479 10.005,-10.005 0,-5.525 -4.48,-10.005 -10.005,-10.005 -5.526,0 -10.006,4.48 -10.006,10.005 0,5.526 4.48,10.005 10.006,10.005"
-         style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#940a1d;stroke-width:1.59046912;stroke-opacity:1"
-         id="path6743"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg11543" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px"
+	 viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-9.6628075" inkscape:cy="-9.0802029" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-724.53448" y1="-1881.95129" x2="-699.03503" y2="-1881.95129" gradientTransform="matrix(0 1 -1 0 -1867.95129 725.78479)">
+		<stop  offset="0" style="stop-color:#828181"/>
+		<stop  offset="1" style="stop-color:#575757"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" d="M14.00027,26.74973c-7.03042,0-12.75027-5.7193-12.75027-12.74918
+		c0-7.03097,5.71985-12.75027,12.75027-12.75027S26.75,6.96957,26.75,14.00055C26.75,21.03042,21.0307,26.74973,14.00027,26.74973z"
+		/>
+</g>
+<linearGradient id="SVGID_00000060724526275470693390000008245162449035415988_" gradientUnits="userSpaceOnUse" x1="939.74719" y1="4807.72949" x2="963.97021" y2="4807.72949" gradientTransform="matrix(0 1 1 0 -4793.72949 -937.84595)">
+	<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<circle fill="url(#SVGID_00000060724526275470693390000008245162449035415988_)" cx="14" cy="14.01277" r="12.11152"/>
+<circle fill="#E0E0E0" cx="14" cy="14.01277" r="11.39265"/>
+<linearGradient id="SVGID_00000062902810955147947180000017029953182049938343_" gradientUnits="userSpaceOnUse" x1="61.01232" y1="647.34302" x2="61.01232" y2="644.3183" gradientTransform="matrix(1 0 0 1 -47.00625 -631.83069)">
+	<stop  offset="0" style="stop-color:#FFFBFD"/>
+	<stop  offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path fill="url(#SVGID_00000062902810955147947180000017029953182049938343_)" d="M2.7326,12.48763l-0.46873,0.45474
+	c-0.47991,0.63159-0.47648,1.50659,0.00837,2.13439l0.43448,0.40306l22.58141,0.03255l0.43901-0.41921
+	c0.50169-0.62492,0.50533-1.51351,0.00878-2.14253l-0.4478-0.43746L2.7326,12.48763z"/>
+<linearGradient id="SVGID_00000058574683125002154270000012606513362735587759_" gradientUnits="userSpaceOnUse" x1="-1928.27295" y1="1097.93713" x2="-1909.20764" y2="1097.93713" gradientTransform="matrix(0 -1 1 0 -1083.93701 -1904.74036)">
+	<stop  offset="0" style="stop-color:#B0AEAE"/>
+	<stop  offset="1" style="stop-color:#616161"/>
+</linearGradient>
+<circle fill="url(#SVGID_00000058574683125002154270000012606513362735587759_)" cx="14.00016" cy="13.99996" r="9.53265"/>
+<circle cx="14.00016" cy="13.99996" r="8.90881"/>
+<path opacity="0.21" enable-background="new    " d="M14.00016,5.67525c4.59611,0,8.322,4.12593,8.322,9.21553
+	s-3.72589,10.13178-8.322,10.13178s-8.32199-5.04219-8.32199-10.13178S9.40405,5.67525,14.00016,5.67525z"/>
+<g id="g5959-5_00000131326188693635625900000004001466656428662701_" transform="translate(301.93513,1189.951)">
+	
+		<linearGradient id="path5961-3_00000064345341073832872280000009516200862616110519_" gradientUnits="userSpaceOnUse" x1="-1010.00134" y1="1724.43445" x2="-994.90259" y2="1724.43445" gradientTransform="matrix(-3.267949e-07 1 1 3.267949e-07 -2012.36963 -173.37532)">
+		<stop  offset="0" style="stop-color:#FF6666"/>
+		<stop  offset="1" style="stop-color:#800B0B"/>
+	</linearGradient>
+	
+		<path id="path5961-3_00000119825455375359423010000002599034882912654976_" inkscape:connector-curvature="0" fill="url(#path5961-3_00000064345341073832872280000009516200862616110519_)" d="
+		M-295.48431-1175.82727c0-4.16907,3.38092-7.54883,7.54993-7.54883c4.16846,0,7.5488,3.37976,7.5488,7.54883
+		c0,4.17078-3.38034,7.54993-7.5488,7.54993C-292.10342-1168.27734-295.48431-1171.65649-295.48431-1175.82727"/>
+</g>
+<g id="g5959-5_00000147210384021934568110000000685333243184859048_" transform="translate(301.93513,1189.951)">
+	
+		<linearGradient id="path5961-3_00000037690977164241640150000010190239438185047199_" gradientUnits="userSpaceOnUse" x1="425.26129" y1="4588.58203" x2="438.45428" y2="4588.58203" gradientTransform="matrix(0 1 1 0 -4876.51709 -1607.68445)">
+		<stop  offset="0" style="stop-color:#ED0F0F"/>
+		<stop  offset="1" style="stop-color:#BF0000"/>
+	</linearGradient>
+	
+		<path id="path5961-3_00000012461119498048617630000008979488342204509061_" inkscape:connector-curvature="0" fill="url(#path5961-3_00000037690977164241640150000010190239438185047199_)" d="
+		M-287.93448-1182.42322c3.64288,0,6.59604,2.95422,6.59604,6.59705c0,3.64233-2.95316,6.59595-6.59604,6.59595
+		c-3.64432,0-6.59698-2.95374-6.59698-6.59595C-294.53146-1179.46899-291.5788-1182.42322-287.93448-1182.42322"/>
+</g>
+</svg>
diff --git a/res/ComponentLibrary/BefacoPush_1.svg b/res/ComponentLibrary/BefacoPush_1.svg
index 114bf0ea..a1898377 100644
--- a/res/ComponentLibrary/BefacoPush_1.svg
+++ b/res/ComponentLibrary/BefacoPush_1.svg
@@ -1,82 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="28"
-   height="28"
-   viewBox="0 0 7.4083333 7.4083333"
-   version="1.1"
-   id="svg11543"
-   sodipodi:docname="BefacoPush_1.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <defs
-     id="defs11537" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="-17.941458"
-     inkscape:cy="4.1420904"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g6703"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata11540">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-33.337496,-58.194645)">
-    <g
-       id="g6703"
-       transform="matrix(0.22180737,0,0,-0.22180737,-187.44188,317.8558)"
-       style="stroke-width:1.59046912">
-      <path
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.19285178;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 1012.0498,1137.8572 c -8.871,0 -16.088,7.232 -16.088,16.119 0,8.871 7.217,16.088 16.088,16.088 8.888,0 16.119,-7.217 16.119,-16.088 0,-8.887 -7.231,-16.119 -16.119,-16.119"
-         id="path4505"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1012.1123,1140.4229 c -7.465,0 -13.538,6.073 -13.538,13.538 0,7.465 6.073,13.539 13.538,13.539 7.465,0 13.538,-6.074 13.538,-13.539 0,-7.465 -6.073,-13.538 -13.538,-13.538"
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.19285178;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6735"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1012.0654,1163.9658 c 5.525,0 10.005,-4.479 10.005,-10.005 0,-5.525 -4.48,-10.005 -10.005,-10.005 -5.526,0 -10.006,4.48 -10.006,10.005 0,5.526 4.48,10.005 10.006,10.005"
-         style="fill:#d10000;fill-opacity:1;fill-rule:nonzero;stroke:#940a1d;stroke-width:1.59046912;stroke-opacity:1"
-         id="path6743"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg11543" inkscape:version="0.92.2 5c3e80d, 2017-08-06" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px"
+	 viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="g6703" inkscape:cx="-17.941458" inkscape:cy="4.1420904" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="7.9195959" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-601.53479" y1="1788.22693" x2="-576.03479" y2="1788.22693" gradientTransform="matrix(0 1 1 0 -1774.22693 602.78479)">
+		<stop  offset="0" style="stop-color:#828181"/>
+		<stop  offset="1" style="stop-color:#575757"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" d="M14.00027,26.75c-7.03057,0-12.75054-5.71943-12.75054-12.74946
+		C1.24973,6.96942,6.9697,1.25,14.00027,1.25s12.75,5.71942,12.75,12.75055C26.75028,21.03057,21.03085,26.75,14.00027,26.75z"/>
+</g>
+<linearGradient id="SVGID_00000026137127552045628170000004162031340276253580_" gradientUnits="userSpaceOnUse" x1="1062.74695" y1="-4089.4541" x2="1086.97058" y2="-4089.4541" gradientTransform="matrix(0 1 -1 0 -4075.4541 -1060.84595)">
+	<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<circle fill="url(#SVGID_00000026137127552045628170000004162031340276253580_)" cx="14" cy="14.01277" r="12.11178"/>
+<circle fill="#E0E0E0" cx="14" cy="14.01277" r="11.39289"/>
+<linearGradient id="SVGID_00000137120905002176455720000010894904806647922361_" gradientUnits="userSpaceOnUse" x1="61.01232" y1="-52.0675" x2="61.01232" y2="-49.04269" gradientTransform="matrix(1 0 0 -1 -47.00625 -36.5551)">
+	<stop  offset="0" style="stop-color:#FFFBFD"/>
+	<stop  offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path fill="url(#SVGID_00000137120905002176455720000010894904806647922361_)" d="M2.73236,12.48759l-0.46874,0.45475
+	c-0.47992,0.6316-0.47649,1.50662,0.00837,2.13444l0.43449,0.40307l22.58189,0.03255l0.43902-0.41922
+	c0.5017-0.62494,0.50534-1.51354,0.00878-2.14257l-0.44781-0.43747L2.73236,12.48759z"/>
+<linearGradient id="SVGID_00000028309948460634324000000006323571304921970849_" gradientUnits="userSpaceOnUse" x1="-1239.27319" y1="-379.66159" x2="-1220.20752" y2="-379.66159" gradientTransform="matrix(0 -1 -1 0 -365.66144 -1215.74036)">
+	<stop  offset="0" style="stop-color:#B0AEAE"/>
+	<stop  offset="1" style="stop-color:#616161"/>
+</linearGradient>
+<circle fill="url(#SVGID_00000028309948460634324000000006323571304921970849_)" cx="14.00016" cy="13.99996" r="9.53286"/>
+<circle cx="14.00016" cy="13.99996" r="8.909"/>
+<g id="g5959-5_00000042732476470205716760000000230960623602230158_" transform="translate(301.93513,1189.951)">
+	
+		<linearGradient id="path5961-3_00000026847566776357124890000007338403634406475196_" gradientUnits="userSpaceOnUse" x1="-585.06622" y1="-2196.10986" x2="-569.96716" y2="-2196.10986" gradientTransform="matrix(-3.267949e-07 1 -1 -3.267949e-07 -2484.04492 -598.31073)">
+		<stop  offset="0.00559" style="stop-color:#EB4949"/>
+		<stop  offset="1" style="stop-color:#630707"/>
+	</linearGradient>
+	
+		<path id="path5961-3_00000054954474776463557800000015392739432081370011_" inkscape:connector-curvature="0" fill="url(#path5961-3_00000026847566776357124890000007338403634406475196_)" d="
+		M-295.48447-1175.82727c0-4.16919,3.38098-7.54895,7.55008-7.54895c4.16855,0,7.54895,3.37976,7.54895,7.54895
+		c0,4.1709-3.3804,7.55005-7.54895,7.55005C-292.10349-1168.27722-295.48447-1171.65649-295.48447-1175.82727"/>
+</g>
+<g id="g5959-5_00000164492803040164543640000015885706361014237109_" transform="translate(301.93513,1189.951)">
+	
+		<linearGradient id="path5961-3_00000047757347148197034590000005213192580435936389_" gradientUnits="userSpaceOnUse" x1="850.19629" y1="-5060.25732" x2="863.38959" y2="-5060.25732" gradientTransform="matrix(0 1 -1 0 -5348.19238 -2032.61963)">
+		<stop  offset="0.00559" style="stop-color:#D90D0D"/>
+		<stop  offset="1" style="stop-color:#A80000"/>
+	</linearGradient>
+	
+		<path id="path5961-3_00000098187068806846494410000009899385548973612424_" inkscape:connector-curvature="0" fill="url(#path5961-3_00000047757347148197034590000005213192580435936389_)" d="
+		M-287.93448-1182.42334c3.64294,0,6.59616,2.95422,6.59616,6.59717c0,3.64233-2.95322,6.59607-6.59616,6.59607
+		c-3.64438,0-6.59711-2.95374-6.59711-6.59607C-294.53159-1179.46912-291.57886-1182.42334-287.93448-1182.42334"/>
+</g>
+<g opacity="0.43">
+	<path d="M14.00613,7.02255c4.16315,0,7.54028,3.2481,7.6017,7.27588c0.00055-0.03822,0.00572-0.07529,0.00572-0.11364
+		c0-4.2029-3.40592-7.60998-7.60742-7.60998S6.39866,9.9819,6.39866,14.1848c0,0.03835,0.00517,0.07541,0.00572,0.11364
+		C6.46579,10.27065,9.84298,7.02255,14.00613,7.02255z"/>
+	<path opacity="0.28" d="M6.40438,14.29844c-0.00055,0.03713-0.00572,0.07304-0.00572,0.11029
+		c0,4.07922,3.40598,7.38611,7.60748,7.38611C9.84298,21.79483,6.46579,18.44838,6.40438,14.29844z"/>
+	<path opacity="0.28" d="M14.00613,21.79483c4.2015,0,7.60742-3.30689,7.60742-7.38611c0-0.03725-0.00517-0.07316-0.00572-0.11029
+		C21.54642,18.44838,18.16929,21.79483,14.00613,21.79483z"/>
+</g>
+</svg>
diff --git a/res/ComponentLibrary/BefacoSlidePot.svg b/res/ComponentLibrary/BefacoSlidePot.svg
index 6f226e76..c2644335 100644
--- a/res/ComponentLibrary/BefacoSlidePot.svg
+++ b/res/ComponentLibrary/BefacoSlidePot.svg
@@ -1,75 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="8.5913172"
-   height="104"
-   viewBox="0 0 2.2731193 27.516666"
-   version="1.1"
-   id="svg1579"
-   sodipodi:docname="BefacoSlidePot.svg"
-   inkscape:version="0.92.1 r">
-  <defs
-     id="defs1573" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-45.207049"
-     inkscape:cy="13.722615"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g1558"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     units="px"
-     inkscape:window-width="1600"
-     inkscape:window-height="882"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata1576">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-157.03322,-91.343367)">
-    <g
-       transform="matrix(0.25661767,0,0,-0.25661767,-287.89299,711.01086)"
-       id="g1558">
-      <g
-         transform="matrix(1,0,0,0.85245901,1737.2207,2414.7499)"
-         id="g6763">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6765"
-           style="fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 0,0 H 2.036 C 3.92,0 5.447,-2.028 5.447,-4.529 v -116.729 c 0,-2.502 -1.527,-4.529 -3.411,-4.529 H 0 c -1.884,0 -3.411,2.027 -3.411,4.529 V -4.529 C -3.411,-2.028 -1.884,0 0,0" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg1579" inkscape:version="0.92.1 r" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="8.59132px" height="104px"
+	 viewBox="0 0 8.59132 104" enable-background="new 0 0 8.59132 104" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="g1558" inkscape:cx="-45.207049" inkscape:cy="13.722615" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="882" inkscape:window-maximized="0" inkscape:window-width="1600" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="1.979899" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<path d="M4.29567,104L4.29567,104C1.92323,104,0,102.07677,0,99.70434V4.29566C0,1.92323,1.92323,0,4.29566,0h0.00001
+	C6.6681,0,8.59134,1.92323,8.59134,4.29566v95.40868C8.59134,102.07677,6.6681,104,4.29567,104z"/>
+</svg>
diff --git a/res/ComponentLibrary/BefacoSlidePotHandle.svg b/res/ComponentLibrary/BefacoSlidePotHandle.svg
index 9d56b7ea..1d35f955 100644
--- a/res/ComponentLibrary/BefacoSlidePotHandle.svg
+++ b/res/ComponentLibrary/BefacoSlidePotHandle.svg
@@ -1,10 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="11.7" height="19.27" version="1.1" viewBox="0 0 3.0961798 5.0990109" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(-156.6 -100.2)">
-  <g transform="matrix(.2566 0 0 -.2566 -287.9 711)">
-   <g transform="translate(1744 2370)">
-    <path d="m0 0c-.072-5.55-1.296-9.915-5.786-9.935-4.598-.02-6.277 4.247-6.277 9.843 0 5.502 1.494 10.03 6.178 10.03 4.422 0 5.956-4.44 5.885-9.935" fill="#ff0000"/>
-   </g>
-  </g>
- </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="11.7px" height="19.27px" viewBox="0 0 11.7 19.27" enable-background="new 0 0 11.7 19.27" xml:space="preserve">
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.85" y1="0.00002" x2="5.85" y2="19.26998">
+		<stop  offset="0" style="stop-color:#C40D0D"/>
+		<stop  offset="1" style="stop-color:#730000"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" d="M5.99089,0.00002c-4.54181,0-5.99048,4.39062-5.99048,9.72565
+		c0,5.42615,1.62805,9.56366,6.08649,9.54425c4.35376-0.01935,5.54059-4.25189,5.61041-9.63348V9.63356
+		C11.76616,4.30532,10.27874,0.00002,5.99089,0.00002z"/>
+	
+		<linearGradient id="SVGID_00000005981792839563570410000005624999559760348816_" gradientUnits="userSpaceOnUse" x1="5.85" y1="0.31135" x2="5.85" y2="18.60765">
+		<stop  offset="0" style="stop-color:#ED0000"/>
+		<stop  offset="1" style="stop-color:#A10000"/>
+	</linearGradient>
+	<path fill="url(#SVGID_00000005981792839563570410000005624999559760348816_)" d="M5.98196,0.31135
+		c-4.25385,0-5.61068,4.16878-5.61068,9.23423c0,5.15198,1.52483,9.08043,5.7006,9.062
+		c4.07773-0.01837,5.18931-4.03705,5.25471-9.14672V9.45813C11.39107,4.39911,9.99795,0.31135,5.98196,0.31135z"/>
+	
+		<linearGradient id="SVGID_00000166637737070165468880000001400135779107130813_" gradientUnits="userSpaceOnUse" x1="51.79285" y1="150.06172" x2="51.79285" y2="156.50661" gradientTransform="matrix(0 -1 -0.50871 0 87.35653 61.24197)">
+		<stop  offset="0" style="stop-color:#FDFDFF"/>
+		<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+	</linearGradient>
+	
+		<ellipse opacity="0.29" fill="url(#SVGID_00000166637737070165468880000001400135779107130813_)" cx="9.37883" cy="9.44912" rx="1.6393" ry="5.64087"/>
+	
+		<linearGradient id="SVGID_00000065062046531620287420000014186053846948254592_" gradientUnits="userSpaceOnUse" x1="103.38602" y1="-136.56932" x2="103.38602" y2="-130.93109" gradientTransform="matrix(0 1 0.50871 0 70.1237 -93.8822)">
+		<stop  offset="0" style="stop-color:#FDFDFF"/>
+		<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+	</linearGradient>
+	
+		<ellipse opacity="0.29" fill="url(#SVGID_00000065062046531620287420000014186053846948254592_)" cx="2.08318" cy="9.50382" rx="1.43412" ry="5.64087"/>
+</g>
+</svg>
diff --git a/res/ComponentLibrary/BefacoSwitch_0.svg b/res/ComponentLibrary/BefacoSwitch_0.svg
index 403bb97e..1f8e096f 100644
--- a/res/ComponentLibrary/BefacoSwitch_0.svg
+++ b/res/ComponentLibrary/BefacoSwitch_0.svg
@@ -1,102 +1,115 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="27.993454"
-   height="31.564199"
-   viewBox="0 0 7.4066014 8.3513613"
-   version="1.1"
-   id="svg10799"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="BefacoSwitch_0.svg">
-  <defs
-     id="defs10793" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="-55.968488"
-     inkscape:cy="5.6835659"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g3201"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata10796">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-78.695511,-76.621942)">
-    <g
-       id="g3201"
-       transform="matrix(0.22389288,0,0,-0.22685285,-171.54356,342.70568)"
-       style="stroke-width:1.565341">
-      <path
-         d="m 1134.1982,1138.7744 c -8.807,0 -15.938,7.132 -15.938,15.938 0,8.806 7.131,15.968 15.938,15.968 8.806,0 15.969,-7.162 15.969,-15.968 0,-8.806 -7.163,-15.938 -15.969,-15.938"
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6575"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1134.2607,1142.4248 c -6.783,0 -12.303,5.52 -12.303,12.304 0,6.783 5.52,12.302 12.303,12.302 6.784,0 12.304,-5.519 12.304,-12.302 0,-6.784 -5.52,-12.304 -12.304,-12.304"
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6583"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 1134.3145,1145.7148 c -5.0639,0 -9.2344,4.1731 -9.2344,9.2364 0,5.0632 4.1705,9.2343 9.2344,9.2343 5.0643,0 9.2363,-4.1711 9.2363,-9.2343 0,-5.0633 -4.172,-9.2364 -9.2363,-9.2364 z"
-         id="path5904"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g5918"
-         transform="matrix(1,0,0,-1,0,2309.0568)"
-         style="stroke-width:1.565341">
-        <path
-           d="m 1130.6064,1154.4414 v -3.023 c 2.259,-2.464 6.448,-2.248 7.659,0.144 l -0.038,2.966 z"
-           style="fill:#656565;fill-opacity:1;stroke:#656565;stroke-width:1.565341;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path5912"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 1129.6875,1153.2109 c 2.403,-2.906 7.479,-2.26 9.573,0.089 0.736,0.826 2.032,3.75 2.032,8.37 0,4.62 -0.91,8.369 -2.032,8.369 h -9.483 c -1.122,0 -2.032,-3.749 -2.032,-8.369 0,-4.62 0.82,-7.745 1.972,-8.459"
-           style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#e40000;stroke-width:0.97833812;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path5914"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 1134.5156,1159.2344 c 3.783,0 6.851,3.067 6.851,6.851 0,3.784 -3.068,6.85 -6.851,6.85 -3.784,0 -6.851,-3.066 -6.851,-6.85 0,-3.784 3.067,-6.851 6.851,-6.851"
-           style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.565341"
-           id="path5916"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg10799" inkscape:version="0.92.2 5c3e80d, 2017-08-06" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="27.99345px"
+	 height="31.5642px" viewBox="0 0 27.99345 31.5642" enable-background="new 0 0 27.99345 31.5642" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="g3201" inkscape:cx="-55.968488" inkscape:cy="5.6835659" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="7.9195959" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g>
+	<g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-601.75171" y1="1790.22363" x2="-576.25226" y2="1790.22363" gradientTransform="matrix(0 1 1 0 -1776.22693 604.78479)">
+			<stop  offset="0" style="stop-color:#828181"/>
+			<stop  offset="1" style="stop-color:#575757"/>
+		</linearGradient>
+		<path fill="url(#SVGID_1_)" d="M13.99699,28.53252c-7.03042,0-12.75027-5.7193-12.75027-12.74918
+			c0-7.03097,5.71985-12.75027,12.75027-12.75027s12.74973,5.7193,12.74973,12.75028
+			C26.74673,22.81322,21.02743,28.53252,13.99699,28.53252z"/>
+	</g>
+	
+		<linearGradient id="SVGID_00000096777038531252213230000009804720766335326622_" gradientUnits="userSpaceOnUse" x1="1062.53003" y1="-4087.45093" x2="1086.75305" y2="-4087.45093" gradientTransform="matrix(0 1 -1 0 -4073.4541 -1058.84595)">
+		<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#7A7A7A"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000096777038531252213230000009804720766335326622_)" cx="13.99672" cy="15.79557" r="12.11152"/>
+	<circle fill="#E0E0E0" cx="13.99672" cy="15.79557" r="11.39265"/>
+	
+		<linearGradient id="SVGID_00000152252859137990743480000007651465109097556108_" gradientUnits="userSpaceOnUse" x1="61.00904" y1="-49.85027" x2="61.00904" y2="-46.82552" gradientTransform="matrix(1 0 0 -1 -47.00625 -32.5551)">
+		<stop  offset="0" style="stop-color:#FFFBFD"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path fill="url(#SVGID_00000152252859137990743480000007651465109097556108_)" d="M2.72933,14.27042L2.2606,14.72517
+		c-0.47991,0.63159-0.47648,1.50659,0.00837,2.13439l0.43448,0.40306l22.58141,0.03255l0.43901-0.41921
+		c0.50169-0.62492,0.50533-1.51351,0.00878-2.14253l-0.4478-0.43746L2.72933,14.27042z"/>
+	
+		<linearGradient id="SVGID_00000125568419862787530720000009955595133921108374_" gradientUnits="userSpaceOnUse" x1="-1239.05579" y1="-377.65833" x2="-1219.99048" y2="-377.65833" gradientTransform="matrix(0 -1 -1 0 -363.66144 -1213.74036)">
+		<stop  offset="0" style="stop-color:#B0AEAE"/>
+		<stop  offset="1" style="stop-color:#616161"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000125568419862787530720000009955595133921108374_)" cx="13.99689" cy="15.78276" r="9.53265"/>
+	<circle fill="#1F1F1F" cx="13.99689" cy="15.78276" r="8.90881"/>
+	<path opacity="0.28" d="M13.99764,26.80466c-4.54871,0-8.23616-4.01955-8.23616-8.97792s3.68746-9.87056,8.23616-9.87056
+		s8.23616,4.91218,8.23616,9.87056S18.54635,26.80466,13.99764,26.80466z"/>
+	
+		<linearGradient id="SVGID_00000160170103584361779110000012459129992462676407_" gradientUnits="userSpaceOnUse" x1="-1883.01038" y1="27.0931" x2="-1883.01038" y2="10.44352" gradientTransform="matrix(-1 0 0 -1 -1869.01343 34.55115)">
+		<stop  offset="0" style="stop-color:#FFFEFE"/>
+		<stop  offset="1" style="stop-color:#545454"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000160170103584361779110000012459129992462676407_)" cx="13.99689" cy="15.78284" r="8.32479"/>
+	<circle fill="#E0E0E0" cx="13.99689" cy="15.78284" r="7.41801"/>
+	<g opacity="0.43">
+		<path opacity="0.28" fill="#404040" d="M5.68113,15.90713c-0.0006,0.04062-0.00626,0.0799-0.00626,0.12065
+			c0,4.46236,3.72589,8.07986,8.32202,8.07986C9.44272,24.10764,5.74832,20.44687,5.68113,15.90713z"/>
+		<path opacity="0.28" fill="#404040" d="M13.9969,24.10764c4.59613,0,8.32196-3.6175,8.32196-8.07986
+			c0-0.04075-0.00566-0.08003-0.00626-0.12065C22.24541,20.44687,18.55108,24.10764,13.9969,24.10764z"/>
+	</g>
+	
+		<linearGradient id="SVGID_00000026141003703015952050000003453255544830421139_" gradientUnits="userSpaceOnUse" x1="-1883.01038" y1="12.75301" x2="-1883.01038" y2="24.78362" gradientTransform="matrix(-1 0 0 -1 -1869.01343 34.55115)">
+		<stop  offset="0" style="stop-color:#FFFEFE"/>
+		<stop  offset="1" style="stop-color:#706C6C"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000026141003703015952050000003453255544830421139_)" cx="13.99689" cy="15.78284" r="6.01531"/>
+	<circle cx="13.99689" cy="15.78276" r="5.30972"/>
+</g>
+<path opacity="0.28" d="M14.0028,31.5642c-3.28014,0-5.93923-3.19316-5.93923-7.13211s2.65908-7.84122,5.93923-7.84122
+	s5.93923,3.90227,5.93923,7.84122S17.28295,31.5642,14.0028,31.5642z"/>
+<linearGradient id="SVGID_00000065773025901285426760000012969200050422914733_" gradientUnits="userSpaceOnUse" x1="13.99672" y1="-72.39881" x2="13.99672" y2="-79.82219" gradientTransform="matrix(1 0 0 -1 0 -60.44819)">
+	<stop  offset="0" style="stop-color:#858484"/>
+	<stop  offset="1" style="stop-color:#363636"/>
+</linearGradient>
+<circle fill="url(#SVGID_00000065773025901285426760000012969200050422914733_)" cx="13.99672" cy="15.66231" r="3.71169"/>
+<linearGradient id="SVGID_00000012444713953208277950000016664908420957321654_" gradientUnits="userSpaceOnUse" x1="107.93118" y1="230.67648" x2="107.93118" y2="233.87488" gradientTransform="matrix(-1 0 0 0.50871 121.93398 -105.02132)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.2" fill="url(#SVGID_00000012444713953208277950000016664908420957321654_)" cx="14.0028" cy="13.14042" rx="1.34428" ry="0.81353"/>
+<linearGradient id="SVGID_00000150823890337663003440000017085013996016341916_" gradientUnits="userSpaceOnUse" x1="13.99672" y1="-73.4698" x2="13.99672" y2="-90.36673" gradientTransform="matrix(1 0 0 -1 0 -60.44819)">
+	<stop  offset="0" style="stop-color:#C40D0D"/>
+	<stop  offset="1" style="stop-color:#730000"/>
+</linearGradient>
+<path fill="url(#SVGID_00000150823890337663003440000017085013996016341916_)" d="M19.79414,21.25261
+	c0.30488,0.73767,0.4752,1.54511,0.4752,2.39285c0,3.46396-2.80819,6.27308-6.27214,6.27308
+	c-3.46542,0-6.27308-2.80912-6.27308-6.27308c0-0.6346,0.09608-1.24649,0.27139-1.8239H7.99357l1.28498-5.0383h0.00885
+	c0.49105-2.15182,2.40796-3.76165,4.70965-3.76165c2.30083,0,4.21774,1.60983,4.70885,3.76165h0.00906L19.79414,21.25261z"/>
+<linearGradient id="SVGID_00000057133146055382674790000003113578813706256522_" gradientUnits="userSpaceOnUse" x1="13.99672" y1="20.13625" x2="13.99672" y2="18.24235">
+	<stop  offset="0" style="stop-color:#000000"/>
+	<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+</linearGradient>
+<polygon fill="url(#SVGID_00000057133146055382674790000003113578813706256522_)" points="16.1491,20.13625 11.84435,20.13625 
+	10.75339,18.24235 17.24006,18.24235 "/>
+<path fill="#ED0000" d="M19.61207,21.80263h-2.99556c-0.74298,0.52054-1.64333,0.83124-2.61928,0.83124
+	c-0.97632,0-1.87692-0.3107-2.61997-0.83124H8.31707l1.21577-4.76696h0.00838c0.4646-2.03593,2.27828-3.55906,4.45601-3.55906
+	c2.17692,0,3.99059,1.52314,4.45526,3.55906h0.00857L19.61207,21.80263z"/>
+<g id="g5959-5_00000078752244077516203560000005940171760620210358_" transform="translate(301.93513,1189.951)">
+	
+		<linearGradient id="path5961-3_00000168093514703044495810000000730023832126520232_" gradientUnits="userSpaceOnUse" x1="835.43243" y1="-5190.39795" x2="847.302" y2="-5190.39795" gradientTransform="matrix(0 1 1 0 4902.45947 -2007.78955)">
+		<stop  offset="0" style="stop-color:#ED0000"/>
+		<stop  offset="1" style="stop-color:#A10000"/>
+	</linearGradient>
+	
+		<path id="path5961-3_00000008146676893465136370000017095637066882825642_" inkscape:connector-curvature="0" fill="url(#path5961-3_00000168093514703044495810000000730023832126520232_)" d="
+		M-287.93866-1172.35706c-3.27747,0-5.93436,2.65784-5.93436,5.93518c0,3.27698,2.65692,5.93433,5.93436,5.93433
+		c3.27875,0,5.93524-2.65735,5.93524-5.93433C-282.00345-1169.69922-284.65991-1172.35706-287.93866-1172.35706"/>
+</g>
+<linearGradient id="SVGID_00000175312440177604282810000005772420987047474309_" gradientUnits="userSpaceOnUse" x1="107.93177" y1="241.89079" x2="107.93177" y2="248.21619" gradientTransform="matrix(-1 0 0 0.50871 121.93398 -105.02132)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.2" fill="url(#SVGID_00000175312440177604282810000005772420987047474309_)" cx="14.0022" cy="19.64066" rx="3.07161" ry="1.60891"/>
+<linearGradient id="SVGID_00000074411448893173401000000013713554947691289987_" gradientUnits="userSpaceOnUse" x1="107.93177" y1="232.93652" x2="107.93177" y2="237.85429" gradientTransform="matrix(-1 0 0 0.50871 121.93398 -105.02132)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.2" fill="url(#SVGID_00000074411448893173401000000013713554947691289987_)" cx="14.0022" cy="14.72747" rx="2.24601" ry="1.25087"/>
+</svg>
diff --git a/res/ComponentLibrary/BefacoSwitch_1.svg b/res/ComponentLibrary/BefacoSwitch_1.svg
index 7c1d70bb..81a80352 100644
--- a/res/ComponentLibrary/BefacoSwitch_1.svg
+++ b/res/ComponentLibrary/BefacoSwitch_1.svg
@@ -1,87 +1,94 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="27.993454"
-   height="31.564199"
-   viewBox="0 0 7.4066014 8.3513613"
-   version="1.1"
-   id="svg10799"
-   sodipodi:docname="BefacoSwitch_1.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <defs
-     id="defs10793" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="-55.968488"
-     inkscape:cy="5.6835659"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g3201"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata10796">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-78.695511,-76.621942)">
-    <g
-       id="g3201"
-       transform="matrix(0.22389288,0,0,-0.22685285,-171.54356,342.70568)"
-       style="stroke-width:1.565341">
-      <path
-         d="m 1134.1982,1138.7744 c -8.807,0 -15.938,7.132 -15.938,15.938 0,8.806 7.131,15.968 15.938,15.968 8.806,0 15.969,-7.162 15.969,-15.968 0,-8.806 -7.163,-15.938 -15.969,-15.938"
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6575"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1134.2607,1142.4248 c -6.783,0 -12.303,5.52 -12.303,12.304 0,6.783 5.52,12.302 12.303,12.302 6.784,0 12.304,-5.519 12.304,-12.302 0,-6.784 -5.52,-12.304 -12.304,-12.304"
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6583"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 1134.3145,1145.7148 c -5.0639,0 -9.2344,4.1731 -9.2344,9.2364 0,5.0632 4.1705,9.2343 9.2344,9.2343 5.0643,0 9.2363,-4.1711 9.2363,-9.2343 0,-5.0633 -4.172,-9.2364 -9.2363,-9.2364 z"
-         id="path5904"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1134.2137,1161.5779 c 3.783,0 6.851,-3.067 6.851,-6.851 0,-3.784 -3.068,-6.85 -6.851,-6.85 -3.784,0 -6.851,3.066 -6.851,6.85 0,3.784 3.067,6.851 6.851,6.851"
-         style="opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#e40000;stroke-width:0.97833812;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path5916-1"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg10799" inkscape:version="0.92.2 5c3e80d, 2017-08-06" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="27.99345px"
+	 height="31.5642px" viewBox="0 0 27.99345 31.5642" enable-background="new 0 0 27.99345 31.5642" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="g3201" inkscape:cx="-55.968488" inkscape:cy="5.6835659" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="7.9195959" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g>
+	<g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-601.75244" y1="1790.22437" x2="-576.25299" y2="1790.22437" gradientTransform="matrix(0 1 1 0 -1776.22693 604.78479)">
+			<stop  offset="0" style="stop-color:#828181"/>
+			<stop  offset="1" style="stop-color:#575757"/>
+		</linearGradient>
+		<path fill="url(#SVGID_1_)" d="M13.99775,28.53183c-7.03042,0-12.75027-5.7193-12.75027-12.74918
+			c0-7.03097,5.71985-12.75027,12.75027-12.75027s12.74973,5.7193,12.74973,12.75028
+			C26.74748,22.81252,21.02818,28.53183,13.99775,28.53183z"/>
+	</g>
+	
+		<linearGradient id="SVGID_00000177448608292375377970000010583154378472933771_" gradientUnits="userSpaceOnUse" x1="1062.5293" y1="-4087.45166" x2="1086.75232" y2="-4087.45166" gradientTransform="matrix(0 1 -1 0 -4073.4541 -1058.84595)">
+		<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#7A7A7A"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000177448608292375377970000010583154378472933771_)" cx="13.99748" cy="15.79487" r="12.11152"/>
+	<circle fill="#E0E0E0" cx="13.99748" cy="15.79487" r="11.39265"/>
+	
+		<linearGradient id="SVGID_00000141433765422241850470000006862703889665185176_" gradientUnits="userSpaceOnUse" x1="61.0098" y1="-49.84957" x2="61.0098" y2="-46.82483" gradientTransform="matrix(1 0 0 -1 -47.00625 -32.5551)">
+		<stop  offset="0" style="stop-color:#FFFBFD"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path fill="url(#SVGID_00000141433765422241850470000006862703889665185176_)" d="M2.73008,14.26973l-0.46873,0.45474
+		c-0.47991,0.63159-0.47648,1.50659,0.00837,2.13439l0.43448,0.40306l22.58141,0.03255l0.43901-0.41921
+		c0.50169-0.62493,0.50533-1.51351,0.00878-2.14253l-0.4478-0.43746L2.73008,14.26973z"/>
+	
+		<linearGradient id="SVGID_00000163767366196474391490000017020097554559494552_" gradientUnits="userSpaceOnUse" x1="-1239.05518" y1="-377.65909" x2="-1219.98987" y2="-377.65909" gradientTransform="matrix(0 -1 -1 0 -363.66144 -1213.74036)">
+		<stop  offset="0" style="stop-color:#B0AEAE"/>
+		<stop  offset="1" style="stop-color:#616161"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000163767366196474391490000017020097554559494552_)" cx="13.99764" cy="15.78206" r="9.53265"/>
+	<circle fill="#1F1F1F" cx="13.99765" cy="15.78206" r="8.90881"/>
+	<path opacity="0.28" d="M13.99764,26.80466c-4.54871,0-8.23616-4.01955-8.23616-8.97792s3.68746-9.87056,8.23616-9.87056
+		s8.23616,4.91218,8.23616,9.87056S18.54635,26.80466,13.99764,26.80466z"/>
+	
+		<linearGradient id="SVGID_00000042713375363964943920000000796008281846487473_" gradientUnits="userSpaceOnUse" x1="-1883.01111" y1="27.0938" x2="-1883.01111" y2="10.44422" gradientTransform="matrix(-1 0 0 -1 -1869.01343 34.55115)">
+		<stop  offset="0" style="stop-color:#FFFEFE"/>
+		<stop  offset="1" style="stop-color:#545454"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000042713375363964943920000000796008281846487473_)" cx="13.99765" cy="15.78214" r="8.32479"/>
+	<circle fill="#E0E0E0" cx="13.99764" cy="15.78214" r="7.41801"/>
+	<g opacity="0.43">
+		<path opacity="0.28" fill="#404040" d="M5.68189,15.90644c-0.0006,0.04062-0.00626,0.0799-0.00626,0.12065
+			c0,4.46236,3.72589,8.07986,8.32202,8.07986C9.44347,24.10695,5.74907,20.44617,5.68189,15.90644z"/>
+		<path opacity="0.28" fill="#404040" d="M13.99765,24.10695c4.59613,0,8.32196-3.6175,8.32196-8.07986
+			c0-0.04075-0.00566-0.08003-0.00626-0.12065C22.24617,20.44617,18.55183,24.10695,13.99765,24.10695z"/>
+	</g>
+	
+		<linearGradient id="SVGID_00000102510288053454173700000005707932717238391180_" gradientUnits="userSpaceOnUse" x1="-1883.01111" y1="12.7537" x2="-1883.01111" y2="24.78432" gradientTransform="matrix(-1 0 0 -1 -1869.01343 34.55115)">
+		<stop  offset="0" style="stop-color:#FFFEFE"/>
+		<stop  offset="1" style="stop-color:#706C6C"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000102510288053454173700000005707932717238391180_)" cx="13.99764" cy="15.78214" r="6.01531"/>
+	<circle cx="13.99764" cy="15.78206" r="5.30972"/>
+</g>
+<path opacity="0.28" d="M13.99764,26.80466c-3.62677,0-6.56685-3.30703-6.56685-7.38646s2.94008-8.12086,6.56685-8.12086
+	s6.56685,4.04143,6.56685,8.12086S17.62441,26.80466,13.99764,26.80466z"/>
+<g id="g5959-5_00000116229361678302812390000006750583222789351330_" transform="translate(301.93513,1189.951)">
+	
+		<linearGradient id="path5961-3_00000178900892709292273200000000881509412734063290_" gradientUnits="userSpaceOnUse" x1="850.30243" y1="-5058.25488" x2="862.84766" y2="-5058.25488" gradientTransform="matrix(0 1 -1 0 -5346.19238 -2030.61963)">
+		<stop  offset="0" style="stop-color:#C40D0D"/>
+		<stop  offset="1" style="stop-color:#730000"/>
+	</linearGradient>
+	
+		<path id="path5961-3_00000082334349351498388840000006389373100410683031_" inkscape:connector-curvature="0" fill="url(#path5961-3_00000178900892709292273200000000881509412734063290_)" d="
+		M-287.93701-1180.31726c3.46399,0,6.27216,2.8092,6.27216,6.27307c0,3.4635-2.80817,6.27222-6.27216,6.27222
+		c-3.46539,0-6.27307-2.80872-6.27307-6.27222C-294.21008-1177.50806-291.4024-1180.31726-287.93701-1180.31726"/>
+</g>
+<g id="g5959-5_00000162344511339057239080000009210374022558534547_" transform="translate(301.93513,1189.951)">
+	
+		<linearGradient id="path5961-3_00000065044475808001945410000006194964417860424119_" gradientUnits="userSpaceOnUse" x1="850.96594" y1="-5058.25488" x2="862.18414" y2="-5058.25488" gradientTransform="matrix(0 1 -1 0 -5346.19238 -2030.61963)">
+		<stop  offset="0" style="stop-color:#ED0000"/>
+		<stop  offset="1" style="stop-color:#A10000"/>
+	</linearGradient>
+	
+		<path id="path5961-3_00000040549344429558566400000013863772396515404699_" inkscape:connector-curvature="0" fill="url(#path5961-3_00000065044475808001945410000006194964417860424119_)" d="
+		M-287.93707-1179.65369c3.0976,0,5.60867,2.51196,5.60867,5.6095c0,3.09717-2.51108,5.60864-5.60867,5.60864
+		c-3.09882,0-5.6095-2.5116-5.6095-5.60864C-293.54657-1177.14172-291.03586-1179.65369-287.93707-1179.65369"/>
+</g>
+<linearGradient id="SVGID_00000139257767095504750290000003169624171939604145_" gradientUnits="userSpaceOnUse" x1="107.93649" y1="227.02478" x2="107.93649" y2="233.71024" gradientTransform="matrix(-1 0 0 0.50871 121.93398 -105.02132)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.3" fill="url(#SVGID_00000139257767095504750290000003169624171939604145_)" cx="13.99749" cy="12.16971" rx="3.24645" ry="1.70049"/>
+</svg>
diff --git a/res/ComponentLibrary/BefacoSwitch_2.svg b/res/ComponentLibrary/BefacoSwitch_2.svg
index 03252858..e7fe8bbc 100644
--- a/res/ComponentLibrary/BefacoSwitch_2.svg
+++ b/res/ComponentLibrary/BefacoSwitch_2.svg
@@ -1,101 +1,121 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="27.993454"
-   height="31.564199"
-   viewBox="0 0 7.4066014 8.3513613"
-   version="1.1"
-   id="svg10799"
-   sodipodi:docname="BefacoSwitch_2.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <defs
-     id="defs10793" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="-55.968488"
-     inkscape:cy="5.6835659"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g3201"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata10796">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-78.695511,-76.621942)">
-    <g
-       id="g3201"
-       transform="matrix(0.22389288,0,0,-0.22685285,-171.54356,342.70568)"
-       style="stroke-width:1.565341">
-      <path
-         d="m 1134.1982,1138.7744 c -8.807,0 -15.938,7.132 -15.938,15.938 0,8.806 7.131,15.968 15.938,15.968 8.806,0 15.969,-7.162 15.969,-15.968 0,-8.806 -7.163,-15.938 -15.969,-15.938"
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6575"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 1134.2607,1142.4248 c -6.783,0 -12.303,5.52 -12.303,12.304 0,6.783 5.52,12.302 12.303,12.302 6.784,0 12.304,-5.519 12.304,-12.302 0,-6.784 -5.52,-12.304 -12.304,-12.304"
-         style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path6583"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#909290;stroke-width:1.17400575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 1134.3145,1145.7148 c -5.0639,0 -9.2344,4.1731 -9.2344,9.2364 0,5.0632 4.1705,9.2343 9.2344,9.2343 5.0643,0 9.2363,-4.1711 9.2363,-9.2343 0,-5.0633 -4.172,-9.2364 -9.2363,-9.2364 z"
-         id="path5904"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g5870"
-         style="stroke-width:1.565341">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6631"
-           style="fill:#656565;fill-opacity:1;stroke:#656565;stroke-width:1.565341;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1130.6064,1154.4414 v -3.023 c 2.259,-2.464 6.448,-2.248 7.659,0.144 l -0.038,2.966 z" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path6635"
-           style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#e40000;stroke-width:0.97833812;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1129.6875,1153.2109 c 2.403,-2.906 7.479,-2.26 9.573,0.089 0.736,0.826 2.032,3.75 2.032,8.37 0,4.62 -0.91,8.369 -2.032,8.369 h -9.483 c -1.122,0 -2.032,-3.749 -2.032,-8.369 0,-4.62 0.82,-7.745 1.972,-8.459" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path6643"
-           style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.565341"
-           d="m 1134.5156,1159.2344 c 3.783,0 6.851,3.067 6.851,6.851 0,3.784 -3.068,6.85 -6.851,6.85 -3.784,0 -6.851,-3.066 -6.851,-6.85 0,-3.784 3.067,-6.851 6.851,-6.851" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg10799" inkscape:version="0.92.2 5c3e80d, 2017-08-06" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="27.99345px"
+	 height="31.5642px" viewBox="0 0 27.99345 31.5642" enable-background="new 0 0 27.99345 31.5642" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="g3201" inkscape:cx="-55.968488" inkscape:cy="5.6835659" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="7.9195959" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g id="layer1_00000000198211678668501290000005832002857958326656_" transform="translate(-78.695511,-76.621942)" inkscape:groupmode="layer" inkscape:label="Layer 1">
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-569.36255" y1="-1881.94885" x2="-543.8631" y2="-1881.94885" gradientTransform="matrix(0 1 -1 0 -1789.25586 649.01575)">
+				<stop  offset="0" style="stop-color:#828181"/>
+				<stop  offset="1" style="stop-color:#575757"/>
+			</linearGradient>
+			<path fill="url(#SVGID_1_)" d="M92.69327,105.15265c-7.03042,0-12.75027-5.7193-12.75027-12.74919
+				c0-7.03098,5.71984-12.75027,12.75027-12.75027c7.0304,0,12.74973,5.7193,12.74973,12.75027
+				C105.44299,99.43335,99.72368,105.15265,92.69327,105.15265z"/>
+		</g>
+		
+			<linearGradient id="SVGID_00000096033846235475085060000005685174985656436140_" gradientUnits="userSpaceOnUse" x1="1094.91919" y1="4807.72705" x2="1119.14233" y2="4807.72705" gradientTransform="matrix(0 1 1 0 -4715.03418 -1014.61505)">
+			<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#7A7A7A"/>
+		</linearGradient>
+		<circle fill="url(#SVGID_00000096033846235475085060000005685174985656436140_)" cx="92.69299" cy="92.4157" r="12.11152"/>
+		<circle fill="#E0E0E0" cx="92.69299" cy="92.4157" r="11.39265"/>
+		
+			<linearGradient id="SVGID_00000122688006920120907340000002040064285886702514_" gradientUnits="userSpaceOnUse" x1="218.40083" y1="645.12402" x2="218.40083" y2="642.0993" gradientTransform="matrix(1 0 0 1 -125.70176 -551.20874)">
+			<stop  offset="0" style="stop-color:#FFFBFD"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path fill="url(#SVGID_00000122688006920120907340000002040064285886702514_)" d="M81.42559,90.89055l-0.46873,0.45473
+			c-0.47992,0.63159-0.47649,1.50659,0.00838,2.1344l0.43448,0.40306l22.58141,0.03255l0.43902-0.4192
+			c0.50167-0.62492,0.50533-1.51351,0.00878-2.14252l-0.44781-0.43745L81.42559,90.89055z"/>
+		
+			<linearGradient id="SVGID_00000005979762883723240410000004410624491557282438_" gradientUnits="userSpaceOnUse" x1="-1768.66296" y1="1097.93469" x2="-1749.59766" y2="1097.93469" gradientTransform="matrix(0 -1 1 0 -1005.24152 -1666.72742)">
+			<stop  offset="0" style="stop-color:#B0AEAE"/>
+			<stop  offset="1" style="stop-color:#616161"/>
+		</linearGradient>
+		<circle fill="url(#SVGID_00000005979762883723240410000004410624491557282438_)" cx="92.69316" cy="92.40289" r="9.53265"/>
+		<circle fill="#1F1F1F" cx="92.69316" cy="92.40289" r="8.90881"/>
+		<path opacity="0.28" d="M92.69315,103.42661c-4.54871,0-8.23617-4.01955-8.23617-8.97793s3.68746-9.87055,8.23617-9.87055
+			s8.23617,4.91218,8.23617,9.87055S97.24186,103.42661,92.69315,103.42661z"/>
+		
+			<linearGradient id="SVGID_00000098905286084164444540000017112241281358558891_" gradientUnits="userSpaceOnUse" x1="-2537.62012" y1="568.18066" x2="-2537.62012" y2="584.83026" gradientTransform="matrix(-1 0 0 1 -2444.927 -484.10248)">
+			<stop  offset="0" style="stop-color:#FFFEFE"/>
+			<stop  offset="1" style="stop-color:#545454"/>
+		</linearGradient>
+		<circle fill="url(#SVGID_00000098905286084164444540000017112241281358558891_)" cx="92.69316" cy="92.40296" r="8.32479"/>
+		<circle fill="#E0E0E0" cx="92.69316" cy="92.40296" r="7.418"/>
+		<g opacity="0.43">
+			<path opacity="0.28" fill="#404040" enable-background="new    " d="M84.3774,92.52726
+				c-0.0006,0.04062-0.00626,0.0799-0.00626,0.12066c0,4.46236,3.72589,8.07986,8.32202,8.07986
+				C88.13898,100.72778,84.44458,97.06699,84.3774,92.52726z"/>
+			<path opacity="0.28" fill="#404040" enable-background="new    " d="M92.69316,100.72778
+				c4.59614,0,8.32195-3.6175,8.32195-8.07986c0-0.04075-0.00565-0.08002-0.00626-0.12066
+				C100.94167,97.06699,97.24734,100.72778,92.69316,100.72778z"/>
+		</g>
+		
+			<linearGradient id="SVGID_00000017474192377491363070000005097647118775521442_" gradientUnits="userSpaceOnUse" x1="-2537.62012" y1="582.52075" x2="-2537.62012" y2="570.49017" gradientTransform="matrix(-1 0 0 1 -2444.927 -484.10248)">
+			<stop  offset="0" style="stop-color:#FFFEFE"/>
+			<stop  offset="1" style="stop-color:#706C6C"/>
+		</linearGradient>
+		<circle fill="url(#SVGID_00000017474192377491363070000005097647118775521442_)" cx="92.69316" cy="92.40296" r="6.0153"/>
+		<circle cx="92.69316" cy="92.40289" r="5.30972"/>
+	</g>
+	<path opacity="0.28" enable-background="new    " d="M92.69907,101.31169c-3.46091,0-6.26654-3.03219-6.26654-6.77258
+		s2.80563-7.44595,6.26654-7.44595s6.26654,3.70555,6.26654,7.44595C98.9656,98.27951,96.15997,101.31169,92.69907,101.31169z"/>
+	
+		<linearGradient id="SVGID_00000173841473616139590440000011334509903753384595_" gradientUnits="userSpaceOnUse" x1="-546.67249" y1="-464.57468" x2="-546.67249" y2="-471.60535" gradientTransform="matrix(-1 0 0 -0.50871 -453.97949 -149.52449)">
+		<stop  offset="0" style="stop-color:#FDFDFF"/>
+		<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+	</linearGradient>
+	
+		<ellipse opacity="0.3" fill="url(#SVGID_00000173841473616139590440000011334509903753384595_)" enable-background="new    " cx="92.69299" cy="88.59759" rx="3.41408" ry="1.78829"/>
+	
+		<linearGradient id="SVGID_00000054226272456759400040000014712870464784151741_" gradientUnits="userSpaceOnUse" x1="171.3885" y1="20.64064" x2="171.3885" y2="13.21726" gradientTransform="matrix(1 0 0 -1 -78.69551 109.89751)">
+		<stop  offset="0" style="stop-color:#858484"/>
+		<stop  offset="1" style="stop-color:#363636"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_00000054226272456759400040000014712870464784151741_)" cx="92.69299" cy="92.96857" r="3.71169"/>
+	
+		<linearGradient id="SVGID_00000007427000494204956140000009716862983452049313_" gradientUnits="userSpaceOnUse" x1="171.3885" y1="31.18517" x2="171.3885" y2="14.28824" gradientTransform="matrix(1 0 0 -1 -78.69551 109.89751)">
+		<stop  offset="0" style="stop-color:#C40D0D"/>
+		<stop  offset="1" style="stop-color:#730000"/>
+	</linearGradient>
+	<path fill="url(#SVGID_00000007427000494204956140000009716862983452049313_)" d="M98.49041,87.37827
+		c0.30488-0.73766,0.4752-1.54511,0.4752-2.39285c0-3.46395-2.80819-6.27307-6.27215-6.27307
+		c-3.46542,0-6.27307,2.80911-6.27307,6.27307c0,0.63461,0.09608,1.2465,0.27139,1.82391h-0.00193l1.28498,5.03831h0.00886
+		c0.49104,2.1518,2.40795,3.76164,4.70965,3.76164c2.30083,0,4.21774-1.60983,4.70885-3.76164h0.00906L98.49041,87.37827z"/>
+	
+		<linearGradient id="SVGID_00000122701979859449626500000017053120607821679246_" gradientUnits="userSpaceOnUse" x1="171.38849" y1="13.14113" x2="171.38849" y2="15.03504" gradientTransform="matrix(1 0 0 -1 -78.69551 109.89751)">
+		<stop  offset="0" style="stop-color:#000000"/>
+		<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+	</linearGradient>
+	<polygon fill="url(#SVGID_00000122701979859449626500000017053120607821679246_)" points="94.84536,96.75639 90.54061,96.75639 
+		89.44965,94.86247 95.93632,94.86247 	"/>
+	<path fill="#A10000" d="M98.30832,86.82825h-2.99556c-0.74298-0.52055-1.64333-0.83125-2.61927-0.83125
+		c-0.97633,0-1.87693,0.3107-2.61998,0.83125h-3.06018l1.21577,4.76696h0.00838c0.4646,2.03593,2.27828,3.55907,4.45601,3.55907
+		c2.1769,0,3.99059-1.52314,4.45525-3.55907h0.00857L98.30832,86.82825z"/>
+	<g id="g5959-5_00000027568132763150582770000010271738654999267467_" transform="translate(301.93513,1189.951)">
+		
+			<linearGradient id="path5961-3_00000016073084953729364910000007033200708977864360_" gradientUnits="userSpaceOnUse" x1="573.66992" y1="4588.57959" x2="585.53943" y2="4588.57959" gradientTransform="matrix(0 1 1 0 -4797.82129 -1684.45361)">
+			<stop  offset="0" style="stop-color:#ED0000"/>
+			<stop  offset="1" style="stop-color:#A10000"/>
+		</linearGradient>
+		
+			<path id="path5961-3_00000105414180127451178630000009338259304507439507_" inkscape:connector-curvature="0" fill="url(#path5961-3_00000016073084953729364910000007033200708977864360_)" d="
+			M-209.24153-1110.78369c3.27744,0,5.93437,2.65784,5.93436,5.9353c0,3.27686-2.65692,5.9342-5.93436,5.9342
+			c-3.27876,0-5.93524-2.65735-5.93524-5.9342C-215.17677-1108.12585-212.52029-1110.78369-209.24153-1110.78369"/>
+	</g>
+	
+		<linearGradient id="SVGID_00000181777226527991237120000003508934055755581860_" gradientUnits="userSpaceOnUse" x1="-546.67798" y1="-450.28708" x2="-546.67798" y2="-456.61252" gradientTransform="matrix(-1 0 0 -0.50871 -453.97949 -149.52449)">
+		<stop  offset="0" style="stop-color:#FDFDFF"/>
+		<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+	</linearGradient>
+	
+		<ellipse opacity="0.3" fill="url(#SVGID_00000181777226527991237120000003508934055755581860_)" enable-background="new    " cx="92.69846" cy="81.14996" rx="3.0716" ry="1.60891"/>
+</g>
+</svg>
diff --git a/res/ComponentLibrary/BefacoTinyKnob.svg b/res/ComponentLibrary/BefacoTinyKnob.svg
deleted file mode 100644
index b3db71a3..00000000
--- a/res/ComponentLibrary/BefacoTinyKnob.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="9.0000019mm"
-   height="9.0000801mm"
-   viewBox="0 0 9.0000016 9.00008"
-   version="1.1"
-   id="svg113936"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="BefacoTinyKnob.svg">
-  <defs
-     id="defs113930" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-45.569736"
-     inkscape:cy="83.754679"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata113933">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-111.86932,-85.795053)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#d4d4d4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.28209424"
-       d="m 120.10511,92.798549 c 1.38512,-2.062815 0.83525,-4.854005 -1.22757,-6.23803 -2.0617,-1.384026 -4.86062,-0.840773 -6.24463,1.222041 -1.38514,2.062814 -0.83306,4.866126 1.22866,6.251255 2.06282,1.384023 4.8595,0.827547 6.24354,-1.235266"
-       id="path109730" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.28209424"
-       d="m 120.02026,91.143448 c -0.46281,2.022043 -2.47716,3.285957 -4.49919,2.823148 -2.02205,-0.462813 -3.28598,-2.47714 -2.82314,-4.499182 0.46281,-2.020944 2.47713,-3.285958 4.49918,-2.82315 2.02093,0.462812 3.28594,2.477141 2.82315,4.499184"
-       id="path109732" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#7f7878;stroke-width:0.11481237;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-       d="m 120.02026,91.143463 c -0.46281,2.022042 -2.47715,3.285956 -4.49919,2.823145 -2.02204,-0.462811 -3.28595,-2.47714 -2.82314,-4.499183 0.46281,-2.020941 2.47714,-3.285957 4.49918,-2.823145 2.02094,0.46281 3.28596,2.47714 2.82315,4.499183 z m 0,0"
-       id="path109734" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.28209424"
-       d="m 116.20648,88.009558 c -0.11239,-0.07603 -0.14328,-0.229201 -0.0672,-0.342701 0.0761,-0.113495 0.23029,-0.143251 0.34379,-0.06722 0.11356,0.07603 0.14325,0.229201 0.0672,0.342701 -0.076,0.113495 -0.23031,0.14325 -0.34379,0.06722"
-       id="path109736" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#000000;stroke-width:0.46912277;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="m 116.20647,88.009571 c -0.11239,-0.07603 -0.14326,-0.229202 -0.0672,-0.3427 0.076,-0.113495 0.23032,-0.14325 0.34381,-0.06722 0.11356,0.07602 0.14325,0.229201 0.0672,0.3427 -0.076,0.113495 -0.2303,0.143251 -0.3438,0.06722 z m 0,0"
-       id="path109738" />
-  </g>
-</svg>
diff --git a/res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg b/res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg
new file mode 100644
index 00000000..84e4eedf
--- /dev/null
+++ b/res/ComponentLibrary/BefacoTinyKnobWhite_bg.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg113936" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="25.51182px"
+	 height="25.51204px" viewBox="0 0 25.51182 25.51204" enable-background="new 0 0 25.51182 25.51204" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-45.569736" inkscape:cy="83.754679" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="2.8" pagecolor="#ffffff" showgrid="false">
+	</sodipodi:namedview>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-3107.95068" y1="-1423.47583" x2="-3082.43945" y2="-1423.47583" gradientTransform="matrix(0 1 -1 0 -1623.33704 477.78479)">
+		<stop  offset="0" style="stop-color:#828181"/>
+		<stop  offset="1" style="stop-color:#575757"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" d="M-199.86099-2604.65454c-7.03368,0-12.75618-5.72192-12.75618-12.75513
+		c0-7.03418,5.7225-12.7561,12.75618-12.7561c7.03366,0,12.75563,5.72192,12.75563,12.7561
+		C-187.10536-2610.37646-192.82732-2604.65454-199.86099-2604.65454z"/>
+</g>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-1443.92017" y1="4596.48291" x2="-1419.18237" y2="4596.48291" gradientTransform="matrix(0 1 1 0 -4796.34375 -1185.84595)">
+	<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<circle fill="url(#SVGID_2_)" cx="-199.86127" cy="-2617.39722" r="12.36891"/>
+<circle fill="#E0E0E0" cx="-199.86127" cy="-2617.39722" r="11.63478"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-152.84882" y1="-1733.42078" x2="-152.84882" y2="-1736.50964" gradientTransform="matrix(1 0 0 1 -47.00625 -882.44495)">
+	<stop  offset="0" style="stop-color:#FFFBFD"/>
+	<stop  offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M-211.36813-2618.95459l-0.4787,0.46436c-0.49011,0.64502-0.48662,1.53857,0.00854,2.17969
+	l0.44371,0.41162l23.06136,0.0332l0.44835-0.42798c0.51234-0.63818,0.51607-1.54565,0.00896-2.18823l-0.45732-0.44678
+	L-211.36813-2618.95459z"/>
+<path opacity="0.3" enable-background="new    " d="M-199.8611-2625.91187c5.88124,0,10.64893,4.5332,10.64893,10.12524
+	s-4.76768,11.13208-10.64893,11.13208s-10.64893-5.54004-10.64893-11.13208S-205.74234-2625.91187-199.8611-2625.91187z"/>
+<linearGradient id="path109732_4_" gradientUnits="userSpaceOnUse" x1="-1158.01184" y1="4163.81787" x2="-1137.4491" y2="4163.81787" gradientTransform="matrix(0 1 1 0 -4363.6792 -1469.66663)">
+	<stop  offset="0" style="stop-color:#828181"/>
+	<stop  offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<path id="path109732_00000021825409866966656510000016532748346234210446_" inkscape:connector-curvature="0" fill="url(#path109732_4_)" d="
+	M-202.15471-2607.37695c-5.53403-1.2666-8.99316-6.77954-7.72653-12.31372c1.26665-5.53394,6.77956-8.99316,12.31357-7.72632
+	c5.53101,1.2666,8.99315,6.77954,7.72653,12.31348C-191.1078-2609.57251-196.6207-2606.11035-202.15471-2607.37695"/>
+<linearGradient id="path109732_5_" gradientUnits="userSpaceOnUse" x1="-1157.78967" y1="4163.81787" x2="-1137.67126" y2="4163.81787" gradientTransform="matrix(0 1 1 0 -4363.6792 -1469.66663)">
+	<stop  offset="0" style="stop-color:#FFFCFC"/>
+	<stop  offset="1" style="stop-color:#C2C2C2"/>
+</linearGradient>
+<path id="path109732_00000173144871293985343460000011737323852663088514_" inkscape:connector-curvature="0" opacity="0.79" fill="url(#path109732_5_)" enable-background="new    " d="
+	M-202.10515-2607.59351c-5.4144-1.23926-8.79877-6.63306-7.55952-12.04761c1.23927-5.41431,6.63303-8.79883,12.04742-7.55933
+	c5.41145,1.23926,8.79878,6.63281,7.55952,12.04736C-191.297-2609.7417-196.69075-2606.35425-202.10515-2607.59351"/>
+<linearGradient id="path109732_6_" gradientUnits="userSpaceOnUse" x1="-199.86127" y1="2652.79126" x2="-199.86127" y2="2633.78271" gradientTransform="matrix(1 0 0 -1 0 25.88983)">
+	<stop  offset="0" style="stop-color:#FFFCFC"/>
+	<stop  offset="1" style="stop-color:#C2C2C2"/>
+</linearGradient>
+<path id="path109732_00000181783666915822318410000002835915533121502593_" inkscape:connector-curvature="0" fill="url(#path109732_6_)" d="
+	M-201.9814-2608.13428c-5.11581-1.1709-8.31355-6.26709-7.14264-11.38306c1.17093-5.11572,6.26723-8.31348,11.38304-7.14258
+	c5.11302,1.1709,8.31354,6.26733,7.14264,11.38306C-191.7693-2610.16382-196.86559-2606.96338-201.9814-2608.13428"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-248.20474" y1="4584.77637" x2="-248.20474" y2="4567.14893" gradientTransform="matrix(-1 0 0 -0.50871 -448.06601 -294.26236)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.9" fill="url(#SVGID_4_)" enable-background="new    " cx="-199.86127" cy="-2622.11694" rx="6.70728" ry="4.48364"/>
+<circle fill="#383838" cx="-199.90283" cy="-2624.48608" r="1.36888"/>
+<g>
+	
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-602.39905" y1="1786.59705" x2="-576.88782" y2="1786.59705" gradientTransform="matrix(0 1 1 0 -1773.84119 602.39905)">
+		<stop  offset="0" style="stop-color:#828181"/>
+		<stop  offset="1" style="stop-color:#575757"/>
+	</linearGradient>
+	<path fill="url(#SVGID_5_)" d="M12.75617,25.51125C5.7225,25.51125,0,19.7893,0,12.75617C0,5.72195,5.7225,0,12.75617,0
+		S25.5118,5.72195,25.5118,12.75618C25.5118,19.7893,19.78985,25.51125,12.75617,25.51125z"/>
+</g>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="1061.63147" y1="-4090.59595" x2="1086.36938" y2="-4090.59595" gradientTransform="matrix(0 1 -1 0 -4077.83984 -1061.23169)">
+	<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<circle fill="url(#SVGID_6_)" cx="12.7559" cy="12.76867" r="12.36893"/>
+<circle fill="#E0E0E0" cx="12.7559" cy="12.76867" r="11.63479"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="59.76835" y1="-53.62673" x2="59.76835" y2="-50.53769" gradientTransform="matrix(1 0 0 -1 -47.00625 -39.32658)">
+	<stop  offset="0" style="stop-color:#FFFBFD"/>
+	<stop  offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path fill="url(#SVGID_7_)" d="M1.24903,11.21111l-0.47869,0.46441c-0.49011,0.64501-0.48661,1.53861,0.00855,2.17976
+	l0.44371,0.41163l23.06135,0.03324l0.44834-0.42812c0.51235-0.63821,0.51607-1.54568,0.00897-2.18806l-0.45732-0.44676
+	L1.24903,11.21111z"/>
+<path opacity="0.3" d="M12.75607,4.25394c5.88124,0,10.64893,4.53325,10.64893,10.1253s-4.76769,11.13201-10.64893,11.13201
+	S2.10714,19.97129,2.10714,14.37924S6.87483,4.25394,12.75607,4.25394z"/>
+<linearGradient id="path109732_7_" gradientUnits="userSpaceOnUse" x1="1347.53967" y1="-3657.9314" x2="1368.10242" y2="-3657.9314" gradientTransform="matrix(0 1 -1 0 -3645.17529 -1345.05237)">
+	<stop  offset="0" style="stop-color:#828181"/>
+	<stop  offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<path id="path109732_3_" inkscape:connector-curvature="0" fill="url(#path109732_7_)" d="M10.46245,22.78881
+	c-5.53401-1.26663-8.99316-6.7796-7.72653-12.31359c1.26665-5.53403,6.77955-8.99322,12.31357-7.7265
+	c5.53101,1.26663,8.99316,6.77951,7.72653,12.31357C21.50937,20.59325,15.99647,24.0554,10.46245,22.78881"/>
+<linearGradient id="path109732_8_" gradientUnits="userSpaceOnUse" x1="1347.76184" y1="-3657.9314" x2="1367.88013" y2="-3657.9314" gradientTransform="matrix(0 1 -1 0 -3645.17529 -1345.05237)">
+	<stop  offset="0" style="stop-color:#FFFCFC"/>
+	<stop  offset="1" style="stop-color:#C2C2C2"/>
+</linearGradient>
+<path id="path109732_2_" inkscape:connector-curvature="0" opacity="0.79" fill="url(#path109732_8_)" d="M10.51202,22.57224
+	c-5.4144-1.23925-8.79878-6.63306-7.55952-12.04744c1.23927-5.41442,6.63302-8.79884,12.04742-7.5595
+	c5.41146,1.23925,8.79878,6.63298,7.55952,12.04742C21.32017,20.42413,15.92642,23.81145,10.51202,22.57224"/>
+<linearGradient id="path109732_9_" gradientUnits="userSpaceOnUse" x1="12.7559" y1="3.26427" x2="12.7559" y2="22.27308">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#D9D9D9"/>
+</linearGradient>
+<path id="path109732_1_" inkscape:connector-curvature="0" fill="url(#path109732_9_)" d="M10.63577,22.0316
+	c-5.11581-1.17091-8.31355-6.26727-7.14264-11.38306c1.17093-5.11583,6.26723-8.3136,11.38304-7.14262
+	c5.11303,1.17091,8.31355,6.26719,7.14264,11.38304C20.84787,20.00195,15.75158,23.20247,10.63577,22.0316"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="107.17808" y1="216.72316" x2="107.17808" y2="234.3501" gradientTransform="matrix(-1 0 0 0.50871 119.93398 -106.68469)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.9" fill="url(#SVGID_8_)" cx="12.7559" cy="8.04881" rx="6.70728" ry="4.48353"/>
+</svg>
diff --git a/res/ComponentLibrary/BefacoTinyPointBlack.svg b/res/ComponentLibrary/BefacoTinyPointBlack.svg
new file mode 100644
index 00000000..a2feb9c2
--- /dev/null
+++ b/res/ComponentLibrary/BefacoTinyPointBlack.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg113936" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="25.51182px"
+	 height="25.51204px" viewBox="0 0 25.51182 25.51204" enable-background="new 0 0 25.51182 25.51204" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-45.569736" inkscape:cy="83.754679" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="2.8" pagecolor="#ffffff" showgrid="false">
+	</sodipodi:namedview>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-3231.95068" y1="1573.3656" x2="-3206.43945" y2="1573.3656" gradientTransform="matrix(0 1 1 0 -1773.22693 601.78479)">
+		<stop  offset="0" style="stop-color:#828181"/>
+		<stop  offset="1" style="stop-color:#575757"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" d="M-199.86099-2604.65454c-7.03368,0-12.75618-5.72192-12.75618-12.75513
+		c0-7.03418,5.7225-12.7561,12.75618-12.7561c7.03366,0,12.75563,5.72192,12.75563,12.7561
+		C-187.10536-2610.37646-192.82732-2604.65454-199.86099-2604.65454z"/>
+</g>
+<linearGradient id="SVGID_00000163756832458353665030000016954553139522886016_" gradientUnits="userSpaceOnUse" x1="-1567.92004" y1="-3878.59302" x2="-1543.18225" y2="-3878.59302" gradientTransform="matrix(0 1 -1 0 -4078.4541 -1061.84595)">
+	<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<circle fill="url(#SVGID_00000163756832458353665030000016954553139522886016_)" cx="-199.86127" cy="-2617.39722" r="12.36893"/>
+<circle fill="#E0E0E0" cx="-199.86127" cy="-2617.39722" r="11.63479"/>
+<linearGradient id="SVGID_00000038373751003378923960000014917148967012210327_" gradientUnits="userSpaceOnUse" x1="-152.84882" y1="2575.31055" x2="-152.84882" y2="2578.39966" gradientTransform="matrix(1 0 0 -1 -47.00625 -40.5551)">
+	<stop  offset="0" style="stop-color:#FFFBFD"/>
+	<stop  offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path fill="url(#SVGID_00000038373751003378923960000014917148967012210327_)" d="M-211.36813-2618.95459l-0.4787,0.46436
+	c-0.49011,0.64502-0.48662,1.53857,0.00854,2.17969l0.44371,0.41162l23.06136,0.0332l0.44835-0.42798
+	c0.51234-0.63818,0.51607-1.54565,0.00896-2.18823l-0.45732-0.44678L-211.36813-2618.95459z"/>
+<path opacity="0.3" d="M-199.8611-2625.91187c5.88124,0,10.64893,4.5332,10.64893,10.12524s-4.76768,11.13208-10.64893,11.13208
+	s-10.64893-5.54004-10.64893-11.13208S-205.74234-2625.91187-199.8611-2625.91187z"/>
+<linearGradient id="path109732_00000158729101081678673360000014002578431016822691_" gradientUnits="userSpaceOnUse" x1="-1282.01184" y1="-3445.92847" x2="-1261.4491" y2="-3445.92847" gradientTransform="matrix(0 1 -1 0 -3645.78955 -1345.66663)">
+	<stop  offset="0" style="stop-color:#828181"/>
+	<stop  offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<path id="path109732_00000021825409866966656510000016532748346234210446_" inkscape:connector-curvature="0" fill="url(#path109732_00000158729101081678673360000014002578431016822691_)" d="
+	M-202.15471-2607.37695c-5.53403-1.2666-8.99316-6.77954-7.72653-12.31372c1.26665-5.53394,6.77956-8.99316,12.31357-7.72632
+	c5.53101,1.2666,8.99315,6.77954,7.72653,12.31348C-191.1078-2609.57251-196.6207-2606.11035-202.15471-2607.37695"/>
+<linearGradient id="path109732_00000175302281901943014170000006434874881375337391_" gradientUnits="userSpaceOnUse" x1="-1281.78967" y1="-3445.92847" x2="-1261.67139" y2="-3445.92847" gradientTransform="matrix(0 1 -1 0 -3645.78955 -1345.66663)">
+	<stop  offset="0" style="stop-color:#FFFCFC"/>
+	<stop  offset="1" style="stop-color:#C2C2C2"/>
+</linearGradient>
+<path id="path109732_00000173144871293985343460000011737323852663088514_" inkscape:connector-curvature="0" opacity="0.79" fill="url(#path109732_00000175302281901943014170000006434874881375337391_)" d="
+	M-202.10515-2607.59351c-5.4144-1.23926-8.79877-6.63306-7.55952-12.04761c1.23927-5.41431,6.63303-8.79883,12.04742-7.55933
+	c5.41145,1.23926,8.79878,6.63281,7.55952,12.04736C-191.297-2609.7417-196.69075-2606.35425-202.10515-2607.59351"/>
+<linearGradient id="path109732_00000077325102806122345610000011367863969882764445_" gradientUnits="userSpaceOnUse" x1="-199.86127" y1="-2626.90161" x2="-199.86127" y2="-2607.89282">
+	<stop  offset="0" style="stop-color:#FFFCFC"/>
+	<stop  offset="1" style="stop-color:#C2C2C2"/>
+</linearGradient>
+<path id="path109732_00000181783666915822318410000002835915533121502593_" inkscape:connector-curvature="0" fill="url(#path109732_00000077325102806122345610000011367863969882764445_)" d="
+	M-201.9814-2608.13428c-5.11581-1.1709-8.31355-6.26709-7.14264-11.38306c1.17093-5.11572,6.26723-8.31348,11.38304-7.14258
+	c5.11302,1.1709,8.31354,6.26733,7.14264,11.38306C-191.7693-2610.16382-196.86559-2606.96338-201.9814-2608.13428"/>
+<linearGradient id="SVGID_00000120557510071053191120000015428050495932456324_" gradientUnits="userSpaceOnUse" x1="319.79526" y1="-4952.91504" x2="319.79526" y2="-4935.28809" gradientTransform="matrix(-1 0 0 0.50871 119.93398 -106.98647)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.9" fill="url(#SVGID_00000120557510071053191120000015428050495932456324_)" cx="-199.86127" cy="-2622.11694" rx="6.70728" ry="4.48353"/>
+<circle fill="#383838" cx="-199.90283" cy="-2624.48608" r="1.36886"/>
+<circle fill="#383838" cx="12.71435" cy="5.68004" r="1.36886"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hBlack.svg b/res/ComponentLibrary/Davies1900hBlack.svg
index 492f5a44..85f30596 100644
--- a/res/ComponentLibrary/Davies1900hBlack.svg
+++ b/res/ComponentLibrary/Davies1900hBlack.svg
@@ -1,106 +1,160 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="36.001503"
-   viewBox="0 0 9.5249996 9.5253972"
-   version="1.1"
-   id="svg16908"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="Davies1900hBlack.svg">
-  <defs
-     id="defs16902">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6367">
-      <path
-         d="M 0,3193 H 2089 V 0 H 0 Z"
-         id="path6365"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-86.209372"
-     inkscape:cy="9.5126135"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata16905">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-230.09585,-123.23243)">
-    <g
-       id="g2012"
-       transform="matrix(0.26457966,0,0,-0.26457966,-112.8694,754.07)"
-       style="stroke-width:1.33335185">
-      <g
-         transform="translate(1332.2646,2366.2998)"
-         id="g6443"
-         style="stroke-width:1.33335185">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6445"
-           style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33335185"
-           d="m 0,0 c 0,-9.941 -8.06,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.06,18 0,9.941 0,0" />
-      </g>
-      <g
-         transform="translate(1332.1631,2368.2021)"
-         id="g6447"
-         style="stroke-width:1.33335185">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6449"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.33335185"
-           d="m 0,0 c -0.79,1.279 -2.12,2.537 -2.86,4.327 -0.74,1.784 -0.691,3.609 -1.033,5.067 -0.805,0.997 -1.711,1.902 -2.709,2.708 -1.459,0.341 -3.282,0.293 -5.068,1.033 -1.79,0.742 -3.048,2.069 -4.325,2.86 -0.625,0.066 -1.26,0.104 -1.902,0.104 -0.644,0 -1.279,-0.038 -1.903,-0.104 -1.279,-0.791 -2.537,-2.118 -4.327,-2.86 -1.784,-0.74 -3.607,-0.692 -5.067,-1.033 -0.997,-0.806 -1.904,-1.711 -2.708,-2.708 -0.342,-1.458 -0.294,-3.283 -1.035,-5.067 -0.74,-1.79 -2.069,-3.048 -2.858,-4.327 -0.066,-0.625 -0.103,-1.26 -0.103,-1.902 0,-0.643 0.037,-1.278 0.103,-1.905 0.789,-1.277 2.118,-2.535 2.858,-4.325 0.741,-1.784 0.693,-3.609 1.035,-5.066 0.804,-0.998 1.711,-1.904 2.708,-2.709 1.46,-0.342 3.283,-0.293 5.067,-1.032 1.79,-0.743 3.048,-2.071 4.327,-2.861 0.624,-0.065 1.259,-0.103 1.903,-0.103 0.642,0 1.277,0.038 1.902,0.103 1.277,0.79 2.535,2.118 4.325,2.861 1.786,0.739 3.609,0.69 5.068,1.032 0.998,0.805 1.904,1.711 2.709,2.709 0.342,1.457 0.293,3.282 1.033,5.066 0.74,1.79 2.07,3.048 2.86,4.325 0.065,0.627 0.102,1.262 0.102,1.905 C 0.102,-1.26 0.065,-0.625 0,0" />
-      </g>
-      <g
-         transform="translate(1314.8633,2384.2314)"
-         id="g6451"
-         style="stroke-width:1.33335185">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6453"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.33335185"
-           d="M 0,0 C -0.195,0.045 -0.393,0.069 -0.598,0.069 -0.804,0.069 -1.002,0.045 -1.196,0 V -18.157 H 0 Z" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="36px" height="36.0015px"
+	 viewBox="0 0 36 36.0015" enable-background="new 0 0 36 36.0015" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-86.209372" inkscape:cy="9.5126135" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<path opacity="0.24" fill="#616161" enable-background="new    " d="M31.33626,28.50767
+	c0.94378-1.19824,2.59279-1.8888,3.20455-3.3678c0.60577-1.46436,0.14915-3.61169,0.31944-5.11584
+	c0.04309-0.14209,0.07434-0.28857,0.08844-0.43799c0.10132-1.07202,0.09863-2.14209-0.00214-3.19653
+	c-0.01251-0.1311-0.04285-0.25854-0.07782-0.38428c0.00037,0.00146,0.0014,0.00269,0.00177,0.00391
+	c-0.17993-1.5144,0.38249-3.46186-0.23067-4.94013c-0.6062-1.46167-2.32915-2.36261-3.27165-3.54474
+	c-0.06946-0.12988-0.15009-0.25464-0.24481-0.36963c-0.67426-0.81738-1.42877-1.57593-2.25848-2.26294
+	c-0.11487-0.09497-0.23981-0.17603-0.36993-0.24585c-1.18616-0.93872-1.64957-2.47831-3.11368-3.08403
+	c-1.45319-0.60107-3.80355-0.24019-5.29843-0.40718c-0.15094-0.04785-0.30737-0.08057-0.46674-0.0957
+	c-1.07227-0.10132-2.14221-0.09863-3.19684,0.0022c-0.1369,0.01294-0.27039,0.0437-0.40137,0.0813
+	c-1.5108,0.17847-3.41772-0.39687-4.89136,0.21421C9.66292,1.96383,8.7264,3.70396,7.54256,4.64732
+	C7.41713,4.71543,7.29598,4.79258,7.18483,4.88438c-0.81738,0.67407-1.57617,1.42871-2.26306,2.2583
+	C4.82839,7.25547,4.74935,7.37852,4.68032,7.50621C3.73446,8.69957,1.9292,9.7917,1.31909,11.26655
+	c-0.61169,1.47876,0.02004,3.24405-0.15837,4.75894c-0.03333,0.12256-0.05969,0.23853-0.07178,0.36597
+	c-0.10132,1.07227-0.09863,2.14209,0.00214,3.19678c0.0127,0.13306,0.0412,0.25708,0.07709,0.38477
+	c0.17883,1.52173-0.37153,3.48624,0.24456,4.97184c0.61316,1.47827,2.34931,2.37826,3.2942,3.57553
+	c0.06555,0.11768,0.12085,0.19775,0.2074,0.30249c0.67426,0.81738,1.42871,1.57617,2.25842,2.26294
+	c0.10925,0.09058,0.20642,0.15576,0.32959,0.22339c1.20251,0.94946,1.87585,2.58559,3.36181,3.20034
+	c1.47888,0.61182,3.66974,0.16294,5.18445,0.34141c0.13098,0.03735,0.23627,0.05493,0.37305,0.06787
+	c1.07214,0.10132,2.14209,0.09863,3.19666-0.0022c0.13617-0.01294,0.24738-0.03613,0.37775-0.07324
+	c1.52179-0.17896,3.42021,0.3978,4.90562-0.21841c1.47827-0.61304,2.4446-2.37558,3.64186-3.3204
+	c0.11902-0.06592,0.20349-0.12378,0.30945-0.21118c0.81732-0.67432,1.57605-1.42871,2.26288-2.25854
+	C31.2037,28.72886,31.26992,28.62681,31.33626,28.50767z M8.18319,4.42955c-0.00018,0-0.00037,0-0.00061,0
+	C8.18276,4.42955,8.183,4.42955,8.18319,4.42955z"/>
+<path opacity="0.71" d="M35.48765,16.19807c-0.0719-0.69063-0.48818-1.26847-1.04468-1.68373
+	c-0.60457-0.45114-1.2788-1.46717-1.81588-2.73001c-0.53743-1.26403-0.80142-2.45542-0.70638-3.20375
+	c0.08746-0.68866-0.03938-1.38927-0.48657-1.92024c-0.69955-0.83063-1.48005-1.60087-2.33626-2.29743
+	c-0.53972-0.43909-1.24463-0.55548-1.93306-0.45471c-0.74639,0.10926-1.94299-0.13261-3.21719-0.64628
+	c-1.27499-0.51431-2.305-1.17081-2.7665-1.76767c-0.42566-0.5505-1.01391-0.95614-1.70732-1.0146
+	c-1.0997-0.09271-2.19604-0.07981-3.27596,0.0326c-0.69068,0.0719-1.26849,0.4883-1.68378,1.04485
+	c-0.45112,0.60456-1.46695,1.2788-2.72992,1.81561C10.52023,3.91017,9.3289,4.17417,8.5806,4.07928
+	c-0.68869-0.08733-1.38932,0.03939-1.92029,0.4866c-0.83063,0.6996-1.60093,1.48005-2.29749,2.3362
+	C3.92375,7.44174,3.80732,8.14659,3.90809,8.83497c0.10926,0.7464-0.13246,1.94299-0.64634,3.21733
+	c-0.51429,1.27509-1.17099,2.30538-1.76785,2.76677c-0.55034,0.42542-0.9559,1.0134-1.01432,1.70654
+	c-0.0927,1.09982-0.0798,2.19635,0.03267,3.27645c0.07192,0.69065,0.48826,1.26847,1.04478,1.68376
+	c0.60452,0.45111,1.27871,1.46698,1.81576,2.72997c0.53742,1.2638,0.80145,2.45531,0.70644,3.2037
+	C3.9918,28.10814,4.1186,28.80875,4.5658,29.33971c0.69949,0.83051,1.47994,1.6008,2.33607,2.29726
+	c0.53976,0.43909,1.2447,0.55554,1.93317,0.4548c0.74644-0.10922,1.94304,0.13251,3.21721,0.64642
+	c1.27527,0.51422,2.30554,1.17103,2.76693,1.76791c0.4254,0.55032,1.01335,0.95586,1.70646,1.01431
+	c1.09987,0.09276,2.1964,0.07985,3.27646-0.03271c0.69054-0.07197,1.26835-0.48813,1.68351-1.04461
+	c0.45105-0.60459,1.46704-1.27883,2.73012-1.81594c1.26385-0.53743,2.45512-0.80143,3.20346-0.70644
+	c0.68883,0.08744,1.38964-0.03928,1.92069-0.48663c0.83054-0.69964,1.60074-1.48019,2.29725-2.33636
+	c0.43902-0.53966,0.55544-1.24446,0.45466-1.93281c-0.10927-0.7464,0.13245-1.94296,0.64634-3.2171
+	c0.51423-1.27506,1.17089-2.30532,1.76777-2.76687c0.5504-0.4256,0.95598-1.01376,1.01442-1.70706
+	C35.61299,18.37432,35.60009,17.27804,35.48765,16.19807z M34.74654,19.42172c-0.0369,0.43378-0.25581,0.82686-0.58541,1.05159
+	c-0.75164,0.51191-1.53243,1.67236-2.14213,3.18411c-0.60914,1.51049-0.8521,2.88729-0.66662,3.77768
+	c0.08134,0.39027-0.03387,0.82504-0.30839,1.16284c-0.6624,0.81577-1.40758,1.5735-2.21484,2.25229
+	c-0.26337,0.22158-0.58583,0.34527-0.90792,0.34828c-0.08159,0.00076-0.16295-0.00655-0.24185-0.02147
+	c-0.18783-0.03585-0.39733-0.05283-0.62274-0.05072c-0.85285,0.00798-1.96955,0.28753-3.14421,0.78724
+	c-1.49895,0.63705-2.64428,1.43891-3.14235,2.19987c-0.21678,0.33121-0.6033,0.55596-1.03366,0.60139
+	c-0.52702,0.05542-1.06241,0.08592-1.59116,0.09087c-0.52105,0.00488-1.04833-0.01493-1.56706-0.05905
+	c-0.43372-0.03709-0.82686-0.25581-1.05152-0.58566c-0.5121-0.75177-1.67274-1.53255-3.18443-2.14219
+	c-1.18418-0.47764-2.30591-0.73624-3.15851-0.72827c-0.22434,0.0021-0.43259,0.02298-0.61891,0.06183
+	c-0.07861,0.01639-0.15988,0.02497-0.24166,0.02574c-0.32499,0.00304-0.65218-0.11557-0.92137-0.33419
+	c-0.8159-0.66259-1.57362-1.40777-2.25229-2.21503c-0.27845-0.33112-0.40048-0.76089-0.32656-1.14958
+	c0.17005-0.89346-0.09845-2.26649-0.73653-3.76732c-0.63749-1.49882-1.43941-2.64421-2.20013-3.14222
+	c-0.33127-0.21677-0.55602-0.60317-0.6012-1.03341c-0.11009-1.04861-0.1208-2.11128-0.0317-3.15847
+	c0.0369-0.43378,0.25575-0.82686,0.58535-1.05133c0.75171-0.51191,1.53249-1.67261,2.14219-3.18437
+	c0.60914-1.51049,0.8521-2.88729,0.66662-3.77742c-0.08134-0.39027,0.034-0.82504,0.30839-1.16309
+	c0.66322-0.81653,1.40846-1.57426,2.21509-2.25204c0.26337-0.22158,0.58571-0.34526,0.9076-0.34828
+	c0.08172-0.00076,0.16307,0.00655,0.24197,0.02146C8.50827,4.85868,8.7177,4.87565,8.94298,4.87355
+	c0.8526-0.00798,1.9693-0.28753,3.14459-0.78725c1.49914-0.63755,2.64446-1.43941,3.14228-2.19987
+	c0.2169-0.33146,0.60324-0.55621,1.0336-0.60139c0.52708-0.05542,1.06247-0.08593,1.59128-0.09087
+	c0.52118-0.00488,1.04845,0.01493,1.56713,0.05905c0.43385,0.03709,0.82692,0.25581,1.05152,0.58566
+	c0.51191,0.75152,1.67255,1.5323,3.18418,2.14194c1.18424,0.47764,2.30604,0.7365,3.15877,0.72852
+	c0.22433-0.0021,0.43253-0.02298,0.61884-0.06183c0.07861-0.01639,0.15988-0.02497,0.24166-0.02574
+	c0.32499-0.00304,0.65225,0.11557,0.92125,0.33394c0.8159,0.66284,1.57375,1.40802,2.25229,2.21503
+	c0.27851,0.33112,0.40061,0.76114,0.32669,1.14983c-0.16999,0.89346,0.09846,2.26648,0.73646,3.76707
+	c0.6373,1.49882,1.43922,2.64421,2.20012,3.14222c0.33127,0.21677,0.55602,0.60318,0.6012,1.03366
+	C34.82499,17.31212,34.83563,18.37453,34.74654,19.42172z"/>
+<path opacity="0.6" d="M33.68905,15.8788c-0.89914-0.5886-1.7831-1.82713-2.48918-3.48763
+	c-0.70686-1.66251-0.98549-3.15964-0.78465-4.21546c0.03037-0.15983-0.03026-0.35364-0.15834-0.50592
+	c-0.64682-0.76919-1.36945-1.47986-2.14776-2.11225c-0.12903-0.10456-0.28002-0.16172-0.42503-0.16036
+	c-0.03073,0.00029-0.06125,0.00335-0.09073,0.00943c-0.2362,0.04916-0.49521,0.07557-0.76978,0.07814
+	c-0.95193,0.00891-2.17931-0.26991-3.4561-0.7848c-1.67463-0.67525-2.93005-1.53644-3.535-2.42441
+	c-0.09317-0.13696-0.27582-0.23244-0.47673-0.24974c-0.49353-0.04183-0.99625-0.06086-1.49376-0.0562
+	c-0.50496,0.00473-1.0155,0.03399-1.51748,0.08665c-0.19816,0.02079-0.37654,0.11838-0.46576,0.25478
+	c-0.58835,0.89889-1.82701,1.78265-3.48769,2.48887c-1.26681,0.53869-2.48876,0.84018-3.44081,0.84909
+	c-0.2769,0.00259-0.53775-0.0192-0.77515-0.06444C8.14702,5.57924,8.11651,5.5765,8.08591,5.57678
+	C7.94367,5.57811,7.7961,5.63705,7.67024,5.74299C6.90093,6.38936,6.19032,7.11193,5.55786,7.89056
+	C5.43096,8.047,5.37298,8.2447,5.40668,8.40645c0.21918,1.05188-0.03178,2.55245-0.7066,4.22588
+	c-0.67544,1.67469-1.53663,2.9303-2.42485,3.53512c-0.13664,0.09317-0.23213,0.27556-0.24918,0.47616
+	c-0.08494,0.99843-0.07477,2.01163,0.03027,3.01182c0.02079,0.19797,0.11832,0.37629,0.25458,0.46539
+	c0.89889,0.58861,1.78284,1.82713,2.48912,3.48763c0.70699,1.66302,0.98562,3.16015,0.78471,4.21596
+	c-0.03038,0.15957,0.03032,0.35313,0.15828,0.50542c0.6472,0.76969,1.3697,1.48036,2.14764,2.11225
+	c0.12928,0.10481,0.28033,0.16197,0.42529,0.16061c0.03067-0.00029,0.06112-0.00335,0.0906-0.00943
+	c0.23633-0.04916,0.49534-0.07557,0.76996-0.07814c0.95218-0.00891,2.17949,0.26966,3.45585,0.78455
+	c1.67462,0.67525,2.93011,1.53644,3.53525,2.42467c0.09311,0.13696,0.27582,0.23244,0.47667,0.24974
+	c0.4936,0.04183,0.99632,0.06086,1.49377,0.0562c0.5049-0.00473,1.01543-0.03399,1.51729-0.08665
+	c0.1981-0.02104,0.37673-0.11864,0.46589-0.25478c0.5886-0.89939,1.82725-1.78316,3.48788-2.48887
+	c1.26593-0.53868,2.48775-0.84017,3.44031-0.84908c0.2769-0.00259,0.53775,0.0192,0.77534,0.06444
+	c0.0282,0.00529,0.0587,0.00803,0.08925,0.00775c0.14236-0.00133,0.29012-0.06027,0.41591-0.16621
+	c0.77006-0.64764,1.48061-1.37021,2.11206-2.14782c0.12709-0.15619,0.18501-0.35388,0.15125-0.51563
+	c-0.21912-1.05214,0.03184-2.55271,0.7066-4.22613c0.67538-1.67443,1.5365-2.93005,2.4248-3.53487
+	c0.13658-0.09316,0.23219-0.27582,0.24924-0.47641c0.08494-0.99843,0.07477-2.01163-0.03026-3.01156
+	C33.92278,16.14621,33.82525,15.96789,33.68905,15.8788z"/>
+<g opacity="0.47">
+	<path fill="#242424" d="M17.86197,1.96959c0.49755-0.00466,1.00025,0.01437,1.49381,0.0562
+		c0.2009,0.01731,0.38352,0.11279,0.47669,0.24975c0.60496,0.88797,1.86039,1.74916,3.53501,2.42441
+		c1.27679,0.51489,2.50419,0.79371,3.45609,0.7848c0.27458-0.00257,0.53361-0.02898,0.76978-0.07814
+		c0.02951-0.00608,0.06003-0.00914,0.09073-0.00943c0.14501-0.00136,0.29603,0.0558,0.42503,0.16036
+		c0.77835,0.6324,1.50095,1.34307,2.14781,2.11225c0.12804,0.15228,0.1887,0.34609,0.15833,0.50592
+		c-0.20087,1.05581,0.07777,2.55294,0.78463,4.21546c0.7061,1.6605,1.59007,2.89902,2.48917,3.48763
+		c0.13623,0.0891,0.23377,0.26742,0.25457,0.46564c0.10503,0.99994,0.11521,2.01313,0.03025,3.01157
+		c-0.01707,0.2006-0.11269,0.38325-0.24926,0.47641c-0.88828,0.60483-1.74941,1.86044-2.42479,3.53487
+		c-0.67476,1.67342-0.9257,3.17399-0.70658,4.22613c0.03373,0.16175-0.02414,0.35945-0.15123,0.51563
+		c-0.63146,0.77761-1.342,1.50018-2.11208,2.14782c-0.12583,0.10594-0.27355,0.16488-0.41595,0.16621
+		c-0.03054,0.00029-0.06102-0.00246-0.08921-0.00775c-0.23757-0.04523-0.49844-0.06703-0.77537-0.06444
+		c-0.95251,0.00891-2.17438,0.3104-3.44026,0.84908c-1.66063,0.70571-2.89931,1.58948-3.4879,2.48887
+		c-0.08918,0.13614-0.26781,0.23374-0.46589,0.25478c-0.50189,0.05266-1.0124,0.08192-1.51732,0.08665
+		c-0.49745,0.00465-1.00014-0.01437-1.49372-0.0562c-0.2009-0.01731-0.38356-0.11279-0.47672-0.24974
+		c-0.60509-0.88823-1.86063-1.74941-3.53525-2.42466c-1.27634-0.5149-2.50365-0.79346-3.45585-0.78456
+		c-0.2746,0.00257-0.53364,0.02898-0.76993,0.07814c-0.02948,0.00608-0.05996,0.00914-0.09063,0.00943
+		c-0.14495,0.00136-0.29597-0.0558-0.42527-0.16061c-0.7779-0.6319-1.50045-1.34257-2.14764-2.11225
+		c-0.12798-0.15229-0.18862-0.34584-0.15828-0.50542c0.20094-1.05581-0.07774-2.55294-0.78471-4.21596
+		c-0.70627-1.6605-1.59023-2.89902-2.4891-3.48763c-0.13627-0.0891-0.23382-0.26742-0.2546-0.46539
+		c-0.105-1.00019-0.11518-2.01339-0.03025-3.01182c0.01706-0.2006,0.11255-0.38299,0.24918-0.47616
+		c0.88821-0.60482,1.74938-1.86044,2.42487-3.53512c0.67478-1.67342,0.92573-3.17399,0.70659-4.22588
+		C5.37296,8.2447,5.43094,8.047,5.55786,7.89056c0.63247-0.77863,1.34306-1.5012,2.1124-2.14757
+		c0.12583-0.10594,0.27344-0.16488,0.41563-0.16621C8.11649,5.5765,8.147,5.57924,8.17508,5.58453
+		c0.23743,0.04524,0.49823,0.06703,0.77513,0.06444c0.95208-0.00891,2.17403-0.3104,3.44081-0.84909
+		c1.66074-0.70621,2.89934-1.58998,3.48769-2.48887c0.08922-0.13639,0.26765-0.23399,0.4658-0.25478
+		C16.84647,2.00358,17.35701,1.97431,17.86197,1.96959 M17.85471,1.19416c-0.52881,0.00495-1.0642,0.03545-1.59128,0.09087
+		c-0.43036,0.04517-0.8167,0.26993-1.0336,0.60139c-0.49782,0.76046-1.64315,1.56232-3.14228,2.19987
+		c-1.17529,0.49972-2.29198,0.77927-3.14459,0.78725C8.71768,4.87565,8.50825,4.85868,8.3206,4.82282
+		C8.2417,4.80791,8.16035,4.80059,8.07863,4.80136c-0.32189,0.00301-0.64424,0.12669-0.9076,0.34828
+		c-0.80664,0.67777-1.55188,1.4355-2.21509,2.25204C4.68154,7.73973,4.5662,8.1745,4.64754,8.56476
+		c0.18548,0.89013-0.05748,2.26693-0.66662,3.77742c-0.60969,1.51176-1.39048,2.67246-2.14219,3.18437
+		c-0.3296,0.22447-0.54845,0.61755-0.58535,1.05133c-0.08909,1.04719-0.07839,2.10986,0.0317,3.15847
+		c0.04517,0.43024,0.26993,0.81664,0.6012,1.03341c0.76071,0.49801,1.56264,1.64339,2.20013,3.14222
+		c0.63807,1.50084,0.90658,2.87387,0.73653,3.76732c-0.07392,0.38869,0.04811,0.81846,0.32656,1.14958
+		c0.67866,0.80726,1.43639,1.55244,2.25229,2.21503c0.26919,0.21862,0.59639,0.33723,0.92137,0.33419
+		c0.08178-0.00076,0.16305-0.00935,0.24166-0.02574c0.18632-0.03885,0.39457-0.05973,0.61891-0.06183
+		c0.8526-0.00798,1.97433,0.25063,3.15851,0.72827c1.51169,0.60963,2.67233,1.39042,3.18443,2.14219
+		c0.22466,0.32986,0.6178,0.54858,1.05152,0.58566c0.51873,0.04412,1.04601,0.06393,1.56706,0.05905
+		c0.52875-0.00495,1.06414-0.03545,1.59116-0.09087c0.43036-0.04543,0.81689-0.27018,1.03366-0.60139
+		c0.49807-0.76097,1.64339-1.56283,3.14235-2.19987c1.17466-0.49971,2.29135-0.77926,3.14421-0.78724
+		c0.22541-0.00211,0.4349,0.01486,0.62274,0.05072c0.0789,0.01491,0.16026,0.02223,0.24185,0.02147
+		c0.32208-0.00301,0.64455-0.1267,0.90792-0.34828c0.80726-0.67879,1.55243-1.43652,2.21484-2.25229
+		c0.27452-0.33781,0.38973-0.77258,0.30839-1.16284c-0.18548-0.89038,0.05748-2.26719,0.66662-3.77767
+		c0.60969-1.51176,1.39048-2.6722,2.14212-3.18411c0.3296-0.22473,0.54851-0.6178,0.58541-1.05158
+		c0.08909-1.04719,0.07846-2.10961-0.0317-3.15822c-0.04517-0.43049-0.26993-0.81689-0.6012-1.03366
+		c-0.7609-0.49801-1.56283-1.64339-2.20012-3.14222c-0.63801-1.50059-0.90645-2.87361-0.73646-3.76707
+		c0.07392-0.38869-0.04818-0.81871-0.32669-1.14983c-0.67854-0.80701-1.43639-1.55219-2.25229-2.21503
+		c-0.269-0.21837-0.59626-0.33698-0.92125-0.33394c-0.08178,0.00077-0.16305,0.00935-0.24166,0.02574
+		c-0.18632,0.03885-0.39451,0.05973-0.61884,0.06183c-0.85273,0.00798-1.97453-0.25088-3.15877-0.72852
+		c-1.51163-0.60963-2.67226-1.39042-3.18418-2.14194c-0.2246-0.32986-0.61768-0.54858-1.05152-0.58566
+		C18.90317,1.20909,18.37589,1.18929,17.85471,1.19416L17.85471,1.19416z"/>
+</g>
+<path fill="#E3E3E3" d="M17.92744,2.35119L17.92744,2.35119c-0.3887,0-0.70381,0.31511-0.70381,0.70381v14.53657
+	c0,0.3887,0.31511,0.70381,0.70381,0.70381l0,0c0.3887,0,0.70381-0.31511,0.70381-0.70381V3.055
+	C18.63125,2.66629,18.31614,2.35119,17.92744,2.35119z"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hBlack_bg.svg b/res/ComponentLibrary/Davies1900hBlack_bg.svg
new file mode 100644
index 00000000..55f155eb
--- /dev/null
+++ b/res/ComponentLibrary/Davies1900hBlack_bg.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="36px" height="36.0015px"
+	 viewBox="0 0 36 36.0015" enable-background="new 0 0 36 36.0015" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-86.209372" inkscape:cy="9.5126135" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="18" y1="0" x2="18" y2="36">
+	<stop  offset="0" style="stop-color:#8C898A"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<circle fill="url(#SVGID_1_)" cx="18" cy="18" r="18"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="112.00653" y1="214.49179" x2="112.00653" y2="234.1516" gradientTransform="matrix(-1 0 0 0.50871 129.93398 -104.22826)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.6" fill="url(#SVGID_2_)" cx="17.92744" cy="9.88719" rx="8.02018" ry="5.0006"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hLargeBlack.svg b/res/ComponentLibrary/Davies1900hLargeBlack.svg
index 20c574a5..1c28b07a 100644
--- a/res/ComponentLibrary/Davies1900hLargeBlack.svg
+++ b/res/ComponentLibrary/Davies1900hLargeBlack.svg
@@ -1,106 +1,128 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="54"
-   height="54.002251"
-   viewBox="0 0 14.2875 14.288095"
-   version="1.1"
-   id="svg16908"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="Davies1900hLargeBlack.svg">
-  <defs
-     id="defs16902">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6367">
-      <path
-         d="M 0,3193 H 2089 V 0 H 0 Z"
-         id="path6365"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-76.991733"
-     inkscape:cy="7.9974093"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata16905">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-230.09585,-118.46974)">
-    <g
-       id="g2012"
-       transform="matrix(0.39686949,0,0,-0.39686949,-284.35202,1064.7261)"
-       style="stroke-width:0.88890123">
-      <g
-         transform="translate(1332.2646,2366.2998)"
-         id="g6443"
-         style="stroke-width:0.88890123">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6445"
-           style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.88890123"
-           d="m 0,0 c 0,-9.941 -8.06,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.06,18 0,9.941 0,0" />
-      </g>
-      <g
-         transform="translate(1332.1631,2368.2021)"
-         id="g6447"
-         style="stroke-width:0.88890123">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6449"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88890123"
-           d="m 0,0 c -0.79,1.279 -2.12,2.537 -2.86,4.327 -0.74,1.784 -0.691,3.609 -1.033,5.067 -0.805,0.997 -1.711,1.902 -2.709,2.708 -1.459,0.341 -3.282,0.293 -5.068,1.033 -1.79,0.742 -3.048,2.069 -4.325,2.86 -0.625,0.066 -1.26,0.104 -1.902,0.104 -0.644,0 -1.279,-0.038 -1.903,-0.104 -1.279,-0.791 -2.537,-2.118 -4.327,-2.86 -1.784,-0.74 -3.607,-0.692 -5.067,-1.033 -0.997,-0.806 -1.904,-1.711 -2.708,-2.708 -0.342,-1.458 -0.294,-3.283 -1.035,-5.067 -0.74,-1.79 -2.069,-3.048 -2.858,-4.327 -0.066,-0.625 -0.103,-1.26 -0.103,-1.902 0,-0.643 0.037,-1.278 0.103,-1.905 0.789,-1.277 2.118,-2.535 2.858,-4.325 0.741,-1.784 0.693,-3.609 1.035,-5.066 0.804,-0.998 1.711,-1.904 2.708,-2.709 1.46,-0.342 3.283,-0.293 5.067,-1.032 1.79,-0.743 3.048,-2.071 4.327,-2.861 0.624,-0.065 1.259,-0.103 1.903,-0.103 0.642,0 1.277,0.038 1.902,0.103 1.277,0.79 2.535,2.118 4.325,2.861 1.786,0.739 3.609,0.69 5.068,1.032 0.998,0.805 1.904,1.711 2.709,2.709 0.342,1.457 0.293,3.282 1.033,5.066 0.74,1.79 2.07,3.048 2.86,4.325 0.065,0.627 0.102,1.262 0.102,1.905 C 0.102,-1.26 0.065,-0.625 0,0" />
-      </g>
-      <g
-         transform="translate(1314.8633,2384.2314)"
-         id="g6451"
-         style="stroke-width:0.88890123">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6453"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88890123"
-           d="M 0,0 C -0.195,0.045 -0.393,0.069 -0.598,0.069 -0.804,0.069 -1.002,0.045 -1.196,0 V -18.157 H 0 Z" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="54px" height="54.00225px"
+	 viewBox="0 0 54 54.00225" enable-background="new 0 0 54 54.00225" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-76.991733" inkscape:cy="7.9974093" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<path opacity="0.6" fill="#1A1A1A" enable-background="new    " d="M27.02268,0.73659v2.03027
+	c1.27875,0.00146,2.53516,0.104,3.75995,0.29834c0.46338,0.07373,0.85632,0.36035,1.12384,0.74561
+	c2.21851,3.19629,6.10315,5.08032,9.98499,4.84155c0.52692-0.03223,1.05591,0.10986,1.44531,0.46606
+	c1.80054,1.64844,3.35272,3.56396,4.5885,5.68701c0.26941,0.46289,0.29169,1.0188,0.13892,1.53223
+	c-1.12714,3.78711-0.12201,8.07324,2.58411,10.9585c0.32593,0.34741,0.52509,0.802,0.49414,1.27759
+	c-0.16333,2.51123-0.70642,4.91748-1.57739,7.1604c-0.17554,0.4519-0.55823,0.78076-1.01154,0.95312
+	c-3.80048,1.44556-6.62811,5.00684-7.17157,9.03711c-0.06476,0.48096-0.29797,0.92871-0.69806,1.20312
+	c-1.9472,1.33643-4.09882,2.39307-6.3974,3.11743c-0.52441,0.16504-1.08594,0.05493-1.55981-0.22363
+	c-3.47559-2.04443-7.97785-2.04443-11.45343,0c-0.47388,0.27856-1.0354,0.38867-1.55981,0.22363
+	c-2.2984-0.72388-4.44958-1.78076-6.39502-3.11694c-0.40002-0.2749-0.63318-0.72266-0.6983-1.20361
+	c-0.54541-4.03027-3.37311-7.5918-7.17151-9.03711c-0.45312-0.17236-0.83563-0.50098-1.01105-0.95288
+	c-0.87109-2.24292-1.41443-4.64942-1.57953-7.16065c-0.03131-0.47559,0.16766-0.93018,0.49359-1.27759
+	c2.7063-2.88525,3.71338-7.17139,2.58453-10.9585c-0.15302-0.51343-0.13086-1.06958,0.13861-1.53223
+	c1.23566-2.1228,2.78772-4.03857,4.58807-5.68652c0.38959-0.35669,0.91882-0.49878,1.44611-0.46655
+	c3.88336,0.23877,7.76623-1.64526,9.98456-4.84155c0.26746-0.38525,0.66058-0.67188,1.12396-0.74536
+	c1.22595-0.19458,2.48102-0.29712,3.75989-0.29858V0.73659C12.48216,0.74879,0.736,12.50416,0.736,27.00001
+	c0,14.50562,11.75848,26.26636,26.26398,26.26636c14.50562,0,26.2641-11.76074,26.2641-26.26636
+	C53.26408,12.50441,41.51774,0.74879,27.02268,0.73659z"/>
+<g id="path109720_24_" inkscape:connector-curvature="0" opacity="0.33" enable-background="new    ">
+	<g>
+		<path d="M26.99993,3.51607c1.22003,0,2.45315,0.09756,3.66509,0.28996c0.31782,0.05046,0.52821,0.29271,0.62533,0.43263
+			c2.21967,3.19763,6.02818,5.18403,9.93928,5.18403c0.23562,0,0.47189-0.00719,0.70781-0.02171
+			c0.03308-0.00203,0.06617-0.00306,0.0992-0.00306c0.31888,0,0.60076,0.09727,0.7937,0.27389
+			c1.75971,1.61091,3.2558,3.46506,4.44672,5.51095c0.20056,0.34455,0.12889,0.73739,0.06831,0.94091
+			c-1.2006,4.03361-0.11887,8.62042,2.75585,11.68545c0.2017,0.21505,0.30843,0.47598,0.29281,0.71591
+			c-0.15568,2.39318-0.66981,4.72728-1.52811,6.93746c-0.08791,0.22636-0.29897,0.41728-0.57905,0.52381
+			c-4.06512,1.54603-7.06721,5.32912-7.64818,9.63787c-0.04012,0.2975-0.17833,0.54719-0.37921,0.68505
+			c-1.9082,1.30967-3.99364,2.32585-6.1984,3.02034c-0.09016,0.0284-0.18601,0.0428-0.28489,0.0428
+			c-0.21794,0-0.44938-0.06837-0.66929-0.19772c-1.82046-1.07078-3.9322-1.63676-6.10694-1.63676s-4.28649,0.56598-6.10696,1.63676
+			c-0.21992,0.12935-0.45137,0.19772-0.6693,0.19772c-0.09888,0-0.19474-0.0144-0.28492-0.04281
+			c-2.20529-0.69465-4.28985-1.71067-6.19578-3.01983c-0.201-0.13808-0.3394-0.38806-0.3797-0.68586
+			c-0.58306-4.30856-3.5851-8.09152-7.64805-9.63754c-0.27988-0.1065-0.49079-0.2973-0.57863-0.52349
+			c-0.85789-2.20901-1.37275-4.5434-1.53028-6.93834c-0.01577-0.23977,0.09076-0.5005,0.29228-0.71534
+			c2.87636-3.06649,3.95825-7.65344,2.75622-11.6858c-0.06065-0.20347-0.13247-0.59625,0.06806-0.94072
+			c1.19086-2.04576,2.68682-3.89977,4.44634-5.51054c0.19313-0.1768,0.47526-0.27417,0.79441-0.27417
+			c0.03302,0,0.06611,0.00103,0.09922,0.00307c0.23627,0.01452,0.47211,0.0217,0.70804,0.0217
+			c3.91094,0,7.7192-1.98642,9.93865-5.18406c0.09708-0.13986,0.30741-0.38202,0.62539-0.43248
+			C24.54806,3.61367,25.78114,3.51607,26.99993,3.51607 M26.99993,2.76607c-1.28691,0-2.54927,0.10367-3.78251,0.29935
+			c-0.46337,0.07352-0.85647,0.36013-1.12399,0.74556c-2.09207,3.01413-5.66515,4.86171-9.32252,4.86171
+			c-0.2206,0-0.44111-0.0067-0.66202-0.02029c-0.04843-0.00298-0.09689-0.00448-0.14524-0.00448
+			c-0.47806,0-0.94699,0.14704-1.30084,0.47097c-1.80037,1.64817-3.35239,3.56364-4.58809,5.68643
+			c-0.26946,0.46289-0.29163,1.01901-0.13862,1.53229c1.12885,3.78689,0.12182,8.07323-2.5845,10.95844
+			c-0.32595,0.34749-0.52491,0.80227-0.49364,1.27767c0.16517,2.51117,0.70847,4.91771,1.57953,7.16062
+			c0.1755,0.45189,0.55795,0.78055,1.01104,0.95295c3.79847,1.44538,6.62614,5.00687,7.17154,9.03715
+			c0.06508,0.48089,0.29829,0.92872,0.69829,1.20348c1.94542,1.33629,4.09663,2.39298,6.39509,3.11698
+			c0.16765,0.0528,0.33909,0.07746,0.51025,0.07746c0.36421,0,0.72715-0.11164,1.04953-0.30125
+			c1.73779-1.02215,3.73227-1.53323,5.72673-1.53323s3.98891,0.51107,5.7267,1.53322
+			c0.32237,0.18962,0.68531,0.30126,1.04953,0.30126c0.17116,0,0.3426-0.02466,0.51024-0.07746
+			c2.29866-0.72406,4.45023-1.78086,6.39746-3.11731c0.40004-0.27456,0.63323-0.72235,0.69807-1.20319
+			c0.54342-4.03026,3.37107-7.59172,7.17152-9.03709c0.45332-0.17241,0.83599-0.5012,1.01157-0.95331
+			c0.87096-2.24279,1.41405-4.64924,1.5774-7.16028c0.03094-0.47545-0.16824-0.93016-0.49419-1.27768
+			c-2.70606-2.8852-3.71122-7.17153-2.58406-10.95841c0.15279-0.51329,0.13046-1.06934-0.13896-1.53218
+			c-1.23578-2.12296-2.78795-4.03857-4.58848-5.68684c-0.35365-0.32374-0.82233-0.4707-1.30013-0.4707
+			c-0.04836,0-0.0968,0.00151-0.14524,0.00449c-0.22057,0.01357-0.44147,0.02029-0.66176,0.02029
+			c-3.65639,0-7.23074-1.84738-9.32317-4.86171c-0.26755-0.38543-0.66045-0.6721-1.12384-0.74567
+			C29.55049,2.8697,28.28661,2.76607,26.99993,2.76607L26.99993,2.76607z"/>
+	</g>
+</g>
+<g id="path109720_15_" inkscape:connector-curvature="0" opacity="0.1">
+	<path fill="#FFFFFF" d="M27,6.02426c0.74651,0,1.50209,0.04102,2.24578,0.12207c0.75726,0.08252,1.48725,0.50586,2.05547,1.19214
+		c2.05435,2.48169,5.19908,3.96314,8.41215,3.96314c0.0855,0,0.17151-0.00098,0.25709-0.00317l0.0519-0.00073
+		c0.55985,0,1.09537,0.22046,1.50799,0.62061c1.22828,1.19067,2.30643,2.52637,3.20454,3.97021
+		c0.31184,0.50122,0.40833,1.10767,0.26473,1.66406c-0.87377,3.3855-0.00654,7.13867,2.26324,9.79517
+		c0.38327,0.44849,0.56183,1.0271,0.50277,1.62891c-0.15583,1.58838-0.49282,3.15357-1.00161,4.65186
+		c-0.22486,0.66211-0.73924,1.20801-1.4483,1.53687c-3.1218,1.44751-5.46496,4.44238-6.11509,7.81592
+		c-0.1266,0.65698-0.4899,1.20532-1.02308,1.54346c-1.34915,0.85645-2.79754,1.55688-4.30498,2.08154
+		c-0.23154,0.08057-0.47222,0.12134-0.71536,0.12134c-0.35114,0-0.69938-0.0874-1.00722-0.25293
+		c-1.55588-0.83618-3.33667-1.27832-5.14985-1.27832c-1.81336,0-3.59429,0.44214-5.15021,1.27856
+		c-0.30769,0.16528-0.65592,0.25269-1.00703,0.25269c-0.2432,0-0.48391-0.04077-0.71553-0.12134
+		c-1.50687-0.52466-2.95429-1.22437-4.30217-2.08032c-0.5335-0.33887-0.8973-0.8877-1.02441-1.54541
+		c-0.65173-3.37329-2.99482-6.36792-6.11475-7.81519c-0.70874-0.32886-1.22286-0.87451-1.44767-1.53638
+		c-0.50884-1.4978-0.84639-3.06372-1.00326-4.65381c-0.05846-0.59253,0.1244-1.18579,0.50175-1.6272
+		c2.27122-2.65747,3.13872-6.41089,2.26394-9.79565c-0.14378-0.55615-0.04739-1.16284,0.2645-1.66406
+		c0.8978-1.44336,1.97575-2.77905,3.20377-3.96973c0.41301-0.40039,0.94897-0.62085,1.50918-0.62085l0.05194,0.00073
+		c0.08578,0.0022,0.17141,0.00317,0.25713,0.00317c3.21307,0,6.35757-1.48169,8.41153-3.96314
+		c0.56791-0.68628,1.29773-1.10938,2.05501-1.19189C25.49921,6.06552,26.25492,6.02426,27,6.02426 M27,5.27426
+		c-0.78646,0-1.56266,0.04346-2.32729,0.12671c-1.01355,0.11035-1.90151,0.67383-2.55159,1.45923
+		c-1.90757,2.30469-4.83893,3.69141-7.83377,3.69141c-0.07956,0-0.15904-0.00098-0.23867-0.00293
+		c-0.02348-0.00049-0.04697-0.00098-0.07039-0.00098c-0.75951,0-1.48426,0.30225-2.03115,0.83228
+		c-1.26579,1.22729-2.38271,2.60742-3.31866,4.11206c-0.41827,0.67236-0.55193,1.48144-0.35377,2.24805
+		c0.81537,3.15479,0.00987,6.64258-2.10796,9.12061c-0.51749,0.60547-0.75618,1.39551-0.67799,2.18823
+		c0.1648,1.67041,0.51766,3.28516,1.0395,4.82129c0.30273,0.89136,0.98827,1.57935,1.8421,1.97559
+		c2.91277,1.35107,5.08415,4.12012,5.69408,7.2771c0.16186,0.83765,0.63857,1.57886,1.35878,2.03613
+		c1.38668,0.88062,2.88077,1.60669,4.45763,2.15552c0.31282,0.10889,0.63809,0.16309,0.96207,0.16309
+		c0.47051,0,0.93836-0.11426,1.36209-0.34204c1.4747-0.79272,3.13502-1.18921,4.79515-1.18921
+		c1.66013,0,3.32007,0.39624,4.79477,1.18896c0.42374,0.22778,0.89176,0.34229,1.36229,0.34229
+		c0.32398,0,0.64912-0.0542,0.96195-0.16309c1.57748-0.54907,3.0723-1.27539,4.46034-2.15649
+		c0.71982-0.45679,1.19625-1.19751,1.35759-2.03491c0.6084-3.15698,2.77983-5.92603,5.69413-7.27734
+		c0.85425-0.39624,1.54018-1.08447,1.84297-1.97607c0.52152-1.53589,0.87403-3.1499,1.03786-4.81983
+		c0.07782-0.79321-0.16123-1.5835-0.67899-2.18945c-2.11739-2.47803-2.92142-5.96582-2.10724-9.12036
+		c0.19786-0.7666,0.06405-1.57568-0.35413-2.2478c-0.93609-1.50488-2.05325-2.88525-3.31932-4.11255
+		c-0.54657-0.53003-1.27095-0.83203-2.03001-0.83203c-0.02345,0-0.04689,0.00049-0.0704,0.00098
+		c-0.07942,0.00195-0.15924,0.00293-0.23859,0.00293c-2.99408,0-5.92635-1.38647-7.83442-3.69141
+		c-0.65026-0.7854-1.5383-1.34912-2.55204-1.45947C28.56251,5.31747,27.78602,5.27426,27,5.27426L27,5.27426z"/>
+</g>
+<path id="path109722_3_" inkscape:connector-curvature="0" fill="#E3E3E3" d="M27.95065,1.74111
+	c0,0.52557-0.42744,0.94836-0.95066,0.94836s-0.94833-0.42279-0.94833-0.94836c0-0.52555,0.42511-0.94835,0.94833-0.94835
+	S27.95065,1.21556,27.95065,1.74111"/>
+<path opacity="0.71" fill="#171717" d="M27.00003,6.02426c-0.74512,0-1.5008,0.04126-2.24616,0.12231
+	c-0.75726,0.08252-1.48706,0.50562-2.05499,1.19189c-2.05395,2.48145-5.19842,3.96314-8.4115,3.96314
+	c-0.08575,0-0.17139-0.00098-0.25714-0.00317l-0.05194-0.00073c-0.56018,0-1.09619,0.22046-1.50916,0.62085
+	c-1.22802,1.19067-2.30595,2.52637-3.20379,3.96973c-0.31189,0.50122-0.40826,1.10791-0.26447,1.66406
+	c0.87476,3.38477,0.00727,7.13818-2.26397,9.79565c-0.37733,0.44141-0.5602,1.03467-0.50177,1.6272
+	c0.15691,1.59009,0.49444,3.15601,1.00329,4.65381c0.22478,0.66187,0.73889,1.20752,1.44763,1.53638
+	c3.11993,1.44727,5.46307,4.44189,6.11475,7.81519c0.12714,0.65771,0.49091,1.20654,1.02441,1.54541
+	c1.3479,0.85596,2.79535,1.55566,4.30219,2.08032c0.23163,0.08057,0.47235,0.12134,0.71552,0.12134
+	c0.35114,0,0.69934-0.0874,1.00702-0.25269c1.55597-0.83643,3.33686-1.27856,5.15027-1.27856
+	c1.81317,0,3.59393,0.44214,5.14984,1.27832c0.3078,0.16553,0.65607,0.25293,1.0072,0.25293
+	c0.24317,0,0.48383-0.04077,0.71534-0.12134c1.50744-0.52466,2.95587-1.2251,4.30499-2.08154
+	c0.5332-0.33813,0.89648-0.88647,1.02307-1.54346c0.65015-3.37354,2.99329-6.36841,6.11511-7.81592
+	c0.70905-0.32886,1.22345-0.87476,1.44831-1.53687c0.50879-1.49829,0.84576-3.06348,1.00158-4.65186
+	c0.05909-0.60181-0.1195-1.18042-0.50274-1.62891c-2.26978-2.65649-3.13703-6.40967-2.26325-9.79517
+	c0.14362-0.5564,0.04712-1.16284-0.26471-1.66406c-0.89813-1.44385-1.97625-2.77954-3.20459-3.97021
+	c-0.4126-0.40015-0.94812-0.62061-1.50793-0.62061l-0.05194,0.00073c-0.08557,0.0022-0.17157,0.00317-0.25708,0.00317
+	c-3.21308,0-6.35779-1.48145-8.41217-3.96314c-0.56818-0.68628-1.29816-1.10962-2.05542-1.19214
+	C28.5021,6.06527,27.74655,6.02426,27.00003,6.02426L27.00003,6.02426z"/>
+<path id="path109724_5_" inkscape:connector-curvature="0" fill="#E3E3E3" d="M27.18946,27.00234h-0.37662
+	c-0.42039,0-0.76119-0.3408-0.76119-0.76119V7.28285c0-0.42039,0.3408-0.76119,0.76119-0.76119h0.37662
+	c0.42039,0,0.76119,0.3408,0.76119,0.76119v18.9583C27.95065,26.66154,27.60986,27.00234,27.18946,27.00234z"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hLargeBlack_bg.svg b/res/ComponentLibrary/Davies1900hLargeBlack_bg.svg
new file mode 100644
index 00000000..1bbd8cbd
--- /dev/null
+++ b/res/ComponentLibrary/Davies1900hLargeBlack_bg.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="54px" height="54.00225px"
+	 viewBox="0 0 54 54.00225" enable-background="new 0 0 54 54.00225" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-76.991733" inkscape:cy="7.9974093" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="path109718_1_" gradientUnits="userSpaceOnUse" x1="27" y1="0" x2="27" y2="54.00236">
+	<stop  offset="0" style="stop-color:#686667"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path id="path109718_5_" inkscape:connector-curvature="0" fill="url(#path109718_1_)" d="M54,26.99999
+	c0,14.91202-12.08797,27.00237-27.00001,27.00237S0,41.91201,0,26.99999C0,12.09032,12.08796,0,26.99999,0S54,12.09032,54,26.99999"
+	/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="120.93398" y1="216.0406" x2="120.93398" y2="239.55823" gradientTransform="matrix(-1 0 0 0.50871 147.93398 -99.80668)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.3" fill="url(#SVGID_1_)" cx="27" cy="16.07793" rx="12.03752" ry="5.98187"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hLargeRed.svg b/res/ComponentLibrary/Davies1900hLargeRed.svg
index dbefb649..936e2c8b 100644
--- a/res/ComponentLibrary/Davies1900hLargeRed.svg
+++ b/res/ComponentLibrary/Davies1900hLargeRed.svg
@@ -1,106 +1,129 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="54"
-   height="54.002399"
-   viewBox="0 0 14.2875 14.288134"
-   version="1.1"
-   id="svg16908"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="Davies1900hLargeRed.svg">
-  <defs
-     id="defs16902">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6367">
-      <path
-         d="M 0,3193 H 2089 V 0 H 0 Z"
-         id="path6365"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-60.437162"
-     inkscape:cy="-3.2255292"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata16905">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-230.79391,-120.57842)">
-    <g
-       id="g1996"
-       transform="matrix(0.39687059,0,0,-0.39687059,-331.13222,1066.8374)"
-       style="stroke-width:0.88889879">
-      <g
-         transform="translate(1451.8926,2366.2998)"
-         id="g6467"
-         style="stroke-width:0.88889879">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6469"
-           style="fill:#830100;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.88889879"
-           d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0" />
-      </g>
-      <g
-         transform="translate(1451.791,2368.2021)"
-         id="g6471"
-         style="stroke-width:0.88889879">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6473"
-           style="fill:#ff030a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88889879"
-           d="m 0,0 c -0.79,1.279 -2.12,2.537 -2.86,4.327 -0.74,1.784 -0.691,3.609 -1.033,5.067 -0.805,0.997 -1.711,1.902 -2.709,2.708 -1.459,0.341 -3.282,0.293 -5.068,1.033 -1.79,0.742 -3.048,2.069 -4.325,2.86 -0.625,0.066 -1.26,0.104 -1.902,0.104 -0.644,0 -1.279,-0.038 -1.903,-0.104 -1.279,-0.791 -2.537,-2.118 -4.327,-2.86 -1.784,-0.74 -3.607,-0.692 -5.067,-1.033 -0.997,-0.806 -1.904,-1.711 -2.708,-2.708 -0.342,-1.458 -0.294,-3.283 -1.035,-5.067 -0.74,-1.79 -2.069,-3.048 -2.858,-4.327 -0.066,-0.625 -0.103,-1.26 -0.103,-1.902 0,-0.643 0.037,-1.278 0.103,-1.905 0.789,-1.277 2.118,-2.535 2.858,-4.325 0.741,-1.784 0.693,-3.609 1.035,-5.066 0.804,-0.998 1.711,-1.904 2.708,-2.709 1.46,-0.342 3.283,-0.293 5.067,-1.032 1.79,-0.743 3.048,-2.071 4.327,-2.861 0.624,-0.065 1.259,-0.103 1.903,-0.103 0.642,0 1.277,0.038 1.902,0.103 1.277,0.79 2.535,2.118 4.325,2.861 1.786,0.739 3.609,0.69 5.068,1.032 0.998,0.805 1.904,1.711 2.709,2.709 0.342,1.457 0.293,3.282 1.033,5.066 0.74,1.79 2.07,3.048 2.86,4.325 0.065,0.627 0.102,1.262 0.102,1.905 C 0.102,-1.26 0.065,-0.625 0,0" />
-      </g>
-      <g
-         transform="translate(1434.4912,2384.2314)"
-         id="g6475"
-         style="stroke-width:0.88889879">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6477"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88889879"
-           d="M 0,0 C -0.195,0.045 -0.393,0.069 -0.598,0.069 -0.804,0.069 -1.002,0.045 -1.196,0 V -18.157 H 0 Z" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="54px" height="54.0024px"
+	 viewBox="0 0 54 54.0024" enable-background="new 0 0 54 54.0024" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-60.437162" inkscape:cy="-3.2255292" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<path opacity="0.51" fill="#A30404" enable-background="new    " d="M27.02268,0.73659v2.03027
+	c1.27875,0.00146,2.53516,0.104,3.75995,0.29834c0.46338,0.07373,0.85632,0.36035,1.12384,0.74561
+	c2.21851,3.19629,6.10315,5.08032,9.98499,4.84155c0.52692-0.03223,1.05591,0.10986,1.44531,0.46606
+	c1.80054,1.64844,3.35272,3.56396,4.5885,5.68701c0.26941,0.46289,0.29169,1.0188,0.13892,1.53223
+	c-1.12714,3.78711-0.12201,8.07324,2.58411,10.9585c0.32593,0.34741,0.52509,0.802,0.49414,1.27759
+	c-0.16333,2.51123-0.70642,4.91748-1.57739,7.1604c-0.17554,0.4519-0.55823,0.78076-1.01154,0.95312
+	c-3.80048,1.44556-6.62811,5.00684-7.17157,9.03711c-0.06476,0.48096-0.29797,0.92871-0.69806,1.20312
+	c-1.9472,1.33643-4.09882,2.39307-6.3974,3.11743c-0.52441,0.16504-1.08594,0.05493-1.55981-0.22363
+	c-3.47559-2.04443-7.97785-2.04443-11.45343,0c-0.47388,0.27856-1.0354,0.38867-1.55981,0.22363
+	c-2.2984-0.72388-4.44958-1.78076-6.39502-3.11694c-0.40002-0.2749-0.63318-0.72266-0.6983-1.20361
+	c-0.54541-4.03027-3.37311-7.5918-7.17151-9.03711c-0.45312-0.17236-0.83563-0.50098-1.01105-0.95288
+	c-0.87109-2.24292-1.41443-4.64942-1.57953-7.16065c-0.03131-0.47559,0.16766-0.93018,0.49359-1.27759
+	c2.7063-2.88525,3.71338-7.17139,2.58453-10.9585c-0.15302-0.51343-0.13086-1.06958,0.13861-1.53223
+	c1.23566-2.1228,2.78772-4.03857,4.58807-5.68652c0.38959-0.35669,0.91882-0.49878,1.44611-0.46655
+	c3.88336,0.23877,7.76623-1.64526,9.98456-4.84155c0.26746-0.38525,0.66058-0.67188,1.12396-0.74536
+	c1.22595-0.19458,2.48102-0.29712,3.75989-0.29858V0.73659C12.48216,0.74879,0.736,12.50416,0.736,27.00001
+	c0,14.50562,11.75848,26.26636,26.26398,26.26636c14.50562,0,26.2641-11.76074,26.2641-26.26636
+	C53.26408,12.50441,41.51774,0.74879,27.02268,0.73659z"/>
+<g id="path109720_23_" inkscape:connector-curvature="0" opacity="0.15" enable-background="new    ">
+	<g>
+		<path fill="#631919" d="M26.99993,3.51607c1.22003,0,2.45315,0.09756,3.66509,0.28996
+			c0.31782,0.05046,0.52821,0.29271,0.62533,0.43263c2.21967,3.19763,6.02818,5.18403,9.93928,5.18403
+			c0.23562,0,0.47189-0.00719,0.70781-0.02171c0.03308-0.00203,0.06617-0.00306,0.0992-0.00306
+			c0.31888,0,0.60076,0.09727,0.7937,0.27389c1.75971,1.61091,3.2558,3.46506,4.44672,5.51095
+			c0.20056,0.34455,0.12889,0.73739,0.06831,0.94091c-1.2006,4.03361-0.11887,8.62042,2.75585,11.68545
+			c0.2017,0.21505,0.30843,0.47598,0.29281,0.71591c-0.15568,2.39318-0.66981,4.72728-1.52811,6.93746
+			c-0.08791,0.22636-0.29897,0.41728-0.57905,0.52381c-4.06512,1.54603-7.06721,5.32912-7.64818,9.63787
+			c-0.04012,0.2975-0.17833,0.54719-0.37921,0.68505c-1.9082,1.30967-3.99364,2.32585-6.1984,3.02034
+			c-0.09016,0.0284-0.18601,0.0428-0.28489,0.0428c-0.21794,0-0.44938-0.06837-0.66929-0.19772
+			c-1.82046-1.07078-3.9322-1.63676-6.10694-1.63676s-4.28649,0.56598-6.10696,1.63676
+			c-0.21992,0.12935-0.45137,0.19772-0.6693,0.19772c-0.09888,0-0.19474-0.0144-0.28492-0.04281
+			c-2.20529-0.69465-4.28985-1.71067-6.19578-3.01983c-0.201-0.13808-0.3394-0.38806-0.3797-0.68586
+			c-0.58306-4.30856-3.5851-8.09152-7.64805-9.63754c-0.27988-0.1065-0.49079-0.2973-0.57863-0.52349
+			c-0.85789-2.20901-1.37275-4.5434-1.53028-6.93834c-0.01577-0.23977,0.09076-0.5005,0.29228-0.71534
+			c2.87636-3.06649,3.95825-7.65344,2.75622-11.6858c-0.06065-0.20347-0.13247-0.59625,0.06806-0.94072
+			c1.19086-2.04576,2.68682-3.89977,4.44634-5.51054c0.19313-0.1768,0.47526-0.27417,0.79441-0.27417
+			c0.03302,0,0.06611,0.00103,0.09922,0.00307c0.23627,0.01452,0.47211,0.0217,0.70804,0.0217
+			c3.91094,0,7.7192-1.98642,9.93865-5.18406c0.09708-0.13986,0.30741-0.38202,0.62539-0.43248
+			C24.54806,3.61367,25.78114,3.51607,26.99993,3.51607 M26.99993,2.76607c-1.28691,0-2.54927,0.10367-3.78251,0.29935
+			c-0.46337,0.07352-0.85647,0.36013-1.12399,0.74556c-2.09207,3.01413-5.66515,4.86171-9.32252,4.86171
+			c-0.2206,0-0.44111-0.0067-0.66202-0.02029c-0.04843-0.00298-0.09689-0.00448-0.14524-0.00448
+			c-0.47806,0-0.94699,0.14704-1.30084,0.47097c-1.80037,1.64817-3.35239,3.56364-4.58809,5.68643
+			c-0.26946,0.46289-0.29163,1.01901-0.13862,1.53229c1.12885,3.78689,0.12182,8.07323-2.5845,10.95844
+			c-0.32595,0.34749-0.52491,0.80227-0.49364,1.27767c0.16517,2.51117,0.70847,4.91771,1.57953,7.16062
+			c0.1755,0.45189,0.55795,0.78055,1.01104,0.95295c3.79847,1.44538,6.62614,5.00687,7.17154,9.03715
+			c0.06508,0.48089,0.29829,0.92872,0.69829,1.20348c1.94542,1.33629,4.09663,2.39298,6.39509,3.11698
+			c0.16765,0.0528,0.33909,0.07746,0.51025,0.07746c0.36421,0,0.72715-0.11164,1.04953-0.30125
+			c1.73779-1.02215,3.73227-1.53323,5.72673-1.53323s3.98891,0.51107,5.7267,1.53322
+			c0.32237,0.18962,0.68531,0.30126,1.04953,0.30126c0.17116,0,0.3426-0.02466,0.51024-0.07746
+			c2.29866-0.72406,4.45023-1.78086,6.39746-3.11731c0.40004-0.27456,0.63323-0.72235,0.69807-1.20319
+			c0.54342-4.03026,3.37107-7.59172,7.17152-9.03709c0.45332-0.17241,0.83599-0.5012,1.01157-0.95331
+			c0.87096-2.24279,1.41405-4.64924,1.5774-7.16028c0.03094-0.47545-0.16824-0.93016-0.49419-1.27768
+			c-2.70606-2.8852-3.71122-7.17153-2.58406-10.95841c0.15279-0.51329,0.13046-1.06934-0.13896-1.53218
+			c-1.23578-2.12296-2.78795-4.03857-4.58848-5.68684c-0.35365-0.32374-0.82233-0.4707-1.30013-0.4707
+			c-0.04836,0-0.0968,0.00151-0.14524,0.00449c-0.22057,0.01357-0.44147,0.02029-0.66176,0.02029
+			c-3.65639,0-7.23074-1.84738-9.32317-4.86171c-0.26755-0.38543-0.66045-0.6721-1.12384-0.74567
+			C29.55049,2.8697,28.28661,2.76607,26.99993,2.76607L26.99993,2.76607z"/>
+	</g>
+</g>
+<g id="path109720_10_" inkscape:connector-curvature="0" opacity="0.18">
+	<path fill="#F2BDBD" d="M27,6.02426c0.74651,0,1.50209,0.04102,2.24578,0.12207c0.75726,0.08252,1.48725,0.50586,2.05547,1.19214
+		c2.05435,2.48169,5.19908,3.96314,8.41215,3.96314c0.0855,0,0.17151-0.00098,0.25709-0.00317l0.0519-0.00073
+		c0.55985,0,1.09537,0.22046,1.50799,0.62061c1.22828,1.19067,2.30643,2.52637,3.20454,3.97021
+		c0.31184,0.50122,0.40833,1.10767,0.26473,1.66406c-0.87377,3.3855-0.00654,7.13867,2.26324,9.79517
+		c0.38327,0.44849,0.56183,1.0271,0.50277,1.62891c-0.15583,1.58838-0.49282,3.15357-1.00161,4.65186
+		c-0.22486,0.66211-0.73924,1.20801-1.4483,1.53687c-3.1218,1.44751-5.46496,4.44238-6.11509,7.81592
+		c-0.1266,0.65698-0.4899,1.20532-1.02308,1.54346c-1.34915,0.85645-2.79754,1.55688-4.30498,2.08154
+		c-0.23154,0.08057-0.47222,0.12134-0.71536,0.12134c-0.35114,0-0.69938-0.0874-1.00722-0.25293
+		c-1.55588-0.83618-3.33667-1.27832-5.14985-1.27832c-1.81336,0-3.59429,0.44214-5.15021,1.27856
+		c-0.30769,0.16528-0.65592,0.25269-1.00703,0.25269c-0.2432,0-0.48391-0.04077-0.71553-0.12134
+		c-1.50687-0.52466-2.95429-1.22437-4.30217-2.08032c-0.5335-0.33887-0.8973-0.8877-1.02441-1.54541
+		c-0.65173-3.37329-2.99482-6.36792-6.11475-7.81519c-0.70874-0.32886-1.22286-0.87451-1.44767-1.53638
+		c-0.50884-1.4978-0.84639-3.06372-1.00326-4.65381c-0.05846-0.59253,0.1244-1.18579,0.50175-1.6272
+		c2.27122-2.65747,3.13872-6.41089,2.26394-9.79565c-0.14378-0.55615-0.04739-1.16284,0.2645-1.66406
+		c0.8978-1.44336,1.97575-2.77905,3.20377-3.96973c0.41301-0.40039,0.94897-0.62085,1.50918-0.62085l0.05194,0.00073
+		c0.08578,0.0022,0.17141,0.00317,0.25713,0.00317c3.21307,0,6.35757-1.48169,8.41153-3.96314
+		c0.56791-0.68628,1.29773-1.10938,2.05501-1.19189C25.49921,6.06552,26.25492,6.02426,27,6.02426 M27,5.27426
+		c-0.78646,0-1.56266,0.04346-2.32729,0.12671c-1.01355,0.11035-1.90151,0.67383-2.55159,1.45923
+		c-1.90757,2.30469-4.83893,3.69141-7.83377,3.69141c-0.07956,0-0.15904-0.00098-0.23867-0.00293
+		c-0.02348-0.00049-0.04697-0.00098-0.07039-0.00098c-0.75951,0-1.48426,0.30225-2.03115,0.83228
+		c-1.26579,1.22729-2.38271,2.60742-3.31866,4.11206c-0.41827,0.67236-0.55193,1.48144-0.35377,2.24805
+		c0.81537,3.15479,0.00987,6.64258-2.10796,9.12061c-0.51749,0.60547-0.75618,1.39551-0.67799,2.18823
+		c0.1648,1.67041,0.51766,3.28516,1.0395,4.82129c0.30273,0.89136,0.98827,1.57935,1.8421,1.97559
+		c2.91277,1.35107,5.08415,4.12012,5.69408,7.2771c0.16186,0.83765,0.63857,1.57886,1.35878,2.03613
+		c1.38668,0.88062,2.88077,1.60669,4.45763,2.15552c0.31282,0.10889,0.63809,0.16309,0.96207,0.16309
+		c0.47051,0,0.93836-0.11426,1.36209-0.34204c1.4747-0.79272,3.13502-1.18921,4.79515-1.18921
+		c1.66013,0,3.32007,0.39624,4.79477,1.18896c0.42374,0.22778,0.89176,0.34229,1.36229,0.34229
+		c0.32398,0,0.64912-0.0542,0.96195-0.16309c1.57748-0.54907,3.0723-1.27539,4.46034-2.15649
+		c0.71982-0.45679,1.19625-1.19751,1.35759-2.03491c0.6084-3.15698,2.77983-5.92603,5.69413-7.27734
+		c0.85425-0.39624,1.54018-1.08447,1.84297-1.97607c0.52152-1.53589,0.87403-3.1499,1.03786-4.81983
+		c0.07782-0.79321-0.16123-1.5835-0.67899-2.18945c-2.11739-2.47803-2.92142-5.96582-2.10724-9.12036
+		c0.19786-0.7666,0.06405-1.57568-0.35413-2.2478c-0.93609-1.50488-2.05325-2.88525-3.31932-4.11255
+		c-0.54657-0.53003-1.27095-0.83203-2.03001-0.83203c-0.02345,0-0.04689,0.00049-0.0704,0.00098
+		c-0.07942,0.00195-0.15924,0.00293-0.23859,0.00293c-2.99408,0-5.92635-1.38647-7.83442-3.69141
+		c-0.65026-0.7854-1.5383-1.34912-2.55204-1.45947C28.56251,5.31747,27.78602,5.27426,27,5.27426L27,5.27426z"/>
+</g>
+<path id="path109722_6_" inkscape:connector-curvature="0" fill="#E3E3E3" d="M27.95065,1.74111
+	c0,0.52557-0.42744,0.94836-0.95066,0.94836s-0.94833-0.42279-0.94833-0.94836c0-0.52555,0.42511-0.94835,0.94833-0.94835
+	S27.95065,1.21556,27.95065,1.74111"/>
+<path opacity="0.46" fill="#DB0000" d="M27.00003,6.02426c-0.74512,0-1.5008,0.04126-2.24616,0.12231
+	c-0.75726,0.08252-1.48706,0.50562-2.05499,1.19189c-2.05395,2.48145-5.19842,3.96314-8.4115,3.96314
+	c-0.08575,0-0.17139-0.00098-0.25714-0.00317l-0.05194-0.00073c-0.56018,0-1.09619,0.22046-1.50916,0.62085
+	c-1.22802,1.19067-2.30595,2.52637-3.20379,3.96973c-0.31189,0.50122-0.40826,1.10791-0.26447,1.66406
+	c0.87476,3.38477,0.00727,7.13818-2.26397,9.79565c-0.37733,0.44141-0.5602,1.03467-0.50177,1.6272
+	c0.15691,1.59009,0.49444,3.15601,1.00329,4.65381c0.22478,0.66187,0.73889,1.20752,1.44763,1.53638
+	c3.11993,1.44727,5.46307,4.44189,6.11475,7.81519c0.12714,0.65771,0.49091,1.20654,1.02441,1.54541
+	c1.3479,0.85596,2.79535,1.55566,4.30219,2.08032c0.23163,0.08057,0.47235,0.12134,0.71552,0.12134
+	c0.35114,0,0.69934-0.0874,1.00702-0.25269c1.55597-0.83643,3.33686-1.27856,5.15027-1.27856
+	c1.81317,0,3.59393,0.44214,5.14984,1.27832c0.3078,0.16553,0.65607,0.25293,1.0072,0.25293
+	c0.24317,0,0.48383-0.04077,0.71534-0.12134c1.50744-0.52466,2.95587-1.2251,4.30499-2.08154
+	c0.5332-0.33813,0.89648-0.88647,1.02307-1.54346c0.65015-3.37354,2.99329-6.36841,6.11511-7.81592
+	c0.70905-0.32886,1.22345-0.87476,1.44831-1.53687c0.50879-1.49829,0.84576-3.06348,1.00158-4.65186
+	c0.05909-0.60181-0.1195-1.18042-0.50274-1.62891c-2.26978-2.65649-3.13703-6.40967-2.26325-9.79517
+	c0.14362-0.5564,0.04712-1.16284-0.26471-1.66406c-0.89813-1.44385-1.97625-2.77954-3.20459-3.97021
+	c-0.4126-0.40015-0.94812-0.62061-1.50793-0.62061l-0.05194,0.00073c-0.08557,0.0022-0.17157,0.00317-0.25708,0.00317
+	c-3.21308,0-6.35779-1.48145-8.41217-3.96314c-0.56818-0.68628-1.29816-1.10962-2.05542-1.19214
+	C28.5021,6.06527,27.74655,6.02426,27.00003,6.02426L27.00003,6.02426z"/>
+<path id="path109724_6_" inkscape:connector-curvature="0" fill="#E3E3E3" d="M27.18946,27.00234h-0.37662
+	c-0.42039,0-0.76119-0.3408-0.76119-0.76119V7.28285c0-0.42039,0.3408-0.76119,0.76119-0.76119h0.37662
+	c0.42039,0,0.76119,0.3408,0.76119,0.76119v18.9583C27.95065,26.66154,27.60986,27.00234,27.18946,27.00234z"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hLargeRed_bg.svg b/res/ComponentLibrary/Davies1900hLargeRed_bg.svg
new file mode 100644
index 00000000..45aa6fc0
--- /dev/null
+++ b/res/ComponentLibrary/Davies1900hLargeRed_bg.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="54px" height="54.0024px"
+	 viewBox="0 0 54 54.0024" enable-background="new 0 0 54 54.0024" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-60.437162" inkscape:cy="-3.2255292" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="path109718_1_" gradientUnits="userSpaceOnUse" x1="27" y1="0" x2="27" y2="54.00236">
+	<stop  offset="0" style="stop-color:#FF5252"/>
+	<stop  offset="1" style="stop-color:#610000"/>
+</linearGradient>
+<path id="path109718_6_" inkscape:connector-curvature="0" fill="url(#path109718_1_)" d="M54,26.99999
+	c0,14.91202-12.08797,27.00237-27.00001,27.00237S0,41.91201,0,26.99999C0,12.09032,12.08796,0,26.99999,0S54,12.09032,54,26.99999"
+	/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="120.93398" y1="216.0406" x2="120.93398" y2="239.55823" gradientTransform="matrix(-1 0 0 0.50871 147.93398 -99.80668)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.3" fill="url(#SVGID_1_)" cx="27" cy="16.07793" rx="12.03752" ry="5.98187"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hLargeWhite.svg b/res/ComponentLibrary/Davies1900hLargeWhite.svg
index d03288c0..fc466add 100644
--- a/res/ComponentLibrary/Davies1900hLargeWhite.svg
+++ b/res/ComponentLibrary/Davies1900hLargeWhite.svg
@@ -1,106 +1,129 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="54"
-   height="54.002399"
-   viewBox="0 0 14.2875 14.288134"
-   version="1.1"
-   id="svg16908"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="Davies1900hLargeWhite.svg">
-  <defs
-     id="defs16902">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6367">
-      <path
-         d="M 0,3193 H 2089 V 0 H 0 Z"
-         id="path6365"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-89.801371"
-     inkscape:cy="8.8255868"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata16905">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-231.61418,-118.28792)">
-    <g
-       id="g2004"
-       transform="matrix(0.39687059,0,0,-0.39687059,-305.70597,1064.5469)"
-       style="stroke-width:0.88889879">
-      <g
-         transform="translate(1389.8926,2366.2998)"
-         id="g6455"
-         style="stroke-width:0.88889879">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6457"
-           style="fill:#d6d6d6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.88889879"
-           d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0" />
-      </g>
-      <g
-         transform="translate(1389.791,2368.2021)"
-         id="g6459"
-         style="stroke-width:0.88889879">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6461"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88889879"
-           d="m 0,0 c -0.79,1.279 -2.12,2.537 -2.86,4.327 -0.74,1.784 -0.691,3.609 -1.033,5.067 -0.805,0.997 -1.711,1.902 -2.709,2.708 -1.459,0.341 -3.282,0.293 -5.068,1.033 -1.79,0.742 -3.048,2.069 -4.325,2.86 -0.625,0.066 -1.26,0.104 -1.902,0.104 -0.644,0 -1.279,-0.038 -1.903,-0.104 -1.279,-0.791 -2.537,-2.118 -4.327,-2.86 -1.784,-0.74 -3.607,-0.692 -5.067,-1.033 -0.997,-0.806 -1.904,-1.711 -2.708,-2.708 -0.342,-1.458 -0.294,-3.283 -1.035,-5.067 -0.74,-1.79 -2.069,-3.048 -2.858,-4.327 -0.066,-0.625 -0.103,-1.26 -0.103,-1.902 0,-0.643 0.037,-1.278 0.103,-1.905 0.789,-1.277 2.118,-2.535 2.858,-4.325 0.741,-1.784 0.693,-3.609 1.035,-5.066 0.804,-0.998 1.711,-1.904 2.708,-2.709 1.46,-0.342 3.283,-0.293 5.067,-1.032 1.79,-0.743 3.048,-2.071 4.327,-2.861 0.624,-0.065 1.259,-0.103 1.903,-0.103 0.642,0 1.277,0.038 1.902,0.103 1.277,0.79 2.535,2.118 4.325,2.861 1.786,0.739 3.609,0.69 5.068,1.032 0.998,0.805 1.904,1.711 2.709,2.709 0.342,1.457 0.293,3.282 1.033,5.066 0.74,1.79 2.07,3.048 2.86,4.325 0.065,0.627 0.102,1.262 0.102,1.905 C 0.102,-1.26 0.065,-0.625 0,0" />
-      </g>
-      <g
-         transform="translate(1372.4912,2384.2314)"
-         id="g6463"
-         style="stroke-width:0.88889879">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6465"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.88889879"
-           d="M 0,0 C -0.195,0.045 -0.393,0.069 -0.598,0.069 -0.804,0.069 -1.002,0.045 -1.196,0 V -18.157 H 0 Z" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="54px" height="54.0024px"
+	 viewBox="0 0 54 54.0024" enable-background="new 0 0 54 54.0024" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-89.801371" inkscape:cy="8.8255868" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<path opacity="0.38" fill="#CCCCCC" enable-background="new    " d="M27.02268,0.73659v2.03027
+	c1.27875,0.00146,2.53516,0.104,3.75995,0.29834c0.46338,0.07373,0.85632,0.36035,1.12384,0.74561
+	c2.21851,3.19629,6.10315,5.08032,9.98499,4.84155c0.52692-0.03223,1.05591,0.10986,1.44531,0.46606
+	c1.80054,1.64844,3.35272,3.56396,4.5885,5.68701c0.26941,0.46289,0.29169,1.0188,0.13892,1.53223
+	c-1.12714,3.78711-0.12201,8.07324,2.58411,10.9585c0.32593,0.34741,0.52509,0.802,0.49414,1.27759
+	c-0.16333,2.51123-0.70642,4.91748-1.57739,7.1604c-0.17554,0.4519-0.55823,0.78076-1.01154,0.95312
+	c-3.80048,1.44556-6.62811,5.00684-7.17157,9.03711c-0.06476,0.48096-0.29797,0.92871-0.69806,1.20312
+	c-1.9472,1.33643-4.09882,2.39307-6.3974,3.11743c-0.52441,0.16504-1.08594,0.05493-1.55981-0.22363
+	c-3.47559-2.04443-7.97785-2.04443-11.45343,0c-0.47388,0.27856-1.0354,0.38867-1.55981,0.22363
+	c-2.2984-0.72388-4.44958-1.78076-6.39502-3.11694c-0.40002-0.2749-0.63318-0.72266-0.6983-1.20361
+	c-0.54541-4.03027-3.37311-7.5918-7.17151-9.03711c-0.45312-0.17236-0.83563-0.50098-1.01105-0.95288
+	c-0.87109-2.24292-1.41443-4.64942-1.57953-7.16065c-0.03131-0.47559,0.16766-0.93018,0.49359-1.27759
+	c2.7063-2.88525,3.71338-7.17139,2.58453-10.9585c-0.15302-0.51343-0.13086-1.06958,0.13861-1.53223
+	c1.23566-2.1228,2.78772-4.03857,4.58807-5.68652c0.38959-0.35669,0.91882-0.49878,1.44611-0.46655
+	c3.88336,0.23877,7.76623-1.64526,9.98456-4.84155c0.26746-0.38525,0.66058-0.67188,1.12396-0.74536
+	c1.22595-0.19458,2.48102-0.29712,3.75989-0.29858V0.73659C12.48216,0.74879,0.736,12.50416,0.736,27.00001
+	c0,14.50562,11.75848,26.26636,26.26398,26.26636c14.50562,0,26.2641-11.76074,26.2641-26.26636
+	C53.26408,12.50441,41.51774,0.74879,27.02268,0.73659z"/>
+<g id="path109720_00000084507434883104600380000008610382314516821182_" inkscape:connector-curvature="0" opacity="0.32" enable-background="new    ">
+	<g>
+		<path fill="#9C9C9C" d="M26.99993,3.51607c1.22003,0,2.45315,0.09756,3.66509,0.28996
+			c0.31782,0.05046,0.52821,0.29271,0.62533,0.43263c2.21967,3.19763,6.02818,5.18403,9.93928,5.18403
+			c0.23562,0,0.47189-0.00719,0.70781-0.02171c0.03308-0.00203,0.06617-0.00306,0.0992-0.00306
+			c0.31888,0,0.60076,0.09727,0.7937,0.27389c1.75971,1.61091,3.2558,3.46506,4.44672,5.51095
+			c0.20056,0.34455,0.12889,0.73739,0.06831,0.94091c-1.2006,4.03361-0.11887,8.62042,2.75585,11.68545
+			c0.2017,0.21505,0.30843,0.47598,0.29281,0.71591c-0.15568,2.39318-0.66981,4.72728-1.52811,6.93746
+			c-0.08791,0.22636-0.29897,0.41728-0.57905,0.52381c-4.06512,1.54603-7.06721,5.32912-7.64818,9.63787
+			c-0.04012,0.2975-0.17833,0.54719-0.37921,0.68505c-1.9082,1.30967-3.99364,2.32585-6.1984,3.02034
+			c-0.09016,0.0284-0.18601,0.0428-0.28489,0.0428c-0.21794,0-0.44938-0.06837-0.66929-0.19772
+			c-1.82046-1.07078-3.9322-1.63676-6.10694-1.63676s-4.28649,0.56598-6.10696,1.63676
+			c-0.21992,0.12935-0.45137,0.19772-0.6693,0.19772c-0.09888,0-0.19474-0.0144-0.28492-0.04281
+			c-2.20529-0.69465-4.28985-1.71067-6.19578-3.01983c-0.201-0.13808-0.3394-0.38806-0.3797-0.68586
+			c-0.58306-4.30856-3.5851-8.09152-7.64805-9.63754c-0.27988-0.1065-0.49079-0.2973-0.57863-0.52349
+			c-0.85789-2.20901-1.37275-4.5434-1.53028-6.93834c-0.01577-0.23977,0.09076-0.5005,0.29228-0.71534
+			c2.87636-3.06649,3.95825-7.65344,2.75622-11.6858c-0.06065-0.20347-0.13247-0.59625,0.06806-0.94072
+			c1.19086-2.04576,2.68682-3.89977,4.44634-5.51054c0.19313-0.1768,0.47526-0.27417,0.79441-0.27417
+			c0.03302,0,0.06611,0.00103,0.09922,0.00307c0.23627,0.01452,0.47211,0.0217,0.70804,0.0217
+			c3.91094,0,7.7192-1.98642,9.93865-5.18406c0.09708-0.13986,0.30741-0.38202,0.62539-0.43248
+			C24.54806,3.61367,25.78114,3.51607,26.99993,3.51607 M26.99993,2.76607c-1.28691,0-2.54927,0.10367-3.78251,0.29935
+			c-0.46337,0.07352-0.85647,0.36013-1.12399,0.74556c-2.09207,3.01413-5.66515,4.86171-9.32252,4.86171
+			c-0.2206,0-0.44111-0.0067-0.66202-0.02029c-0.04843-0.00298-0.09689-0.00448-0.14524-0.00448
+			c-0.47806,0-0.94699,0.14704-1.30084,0.47097c-1.80037,1.64817-3.35239,3.56364-4.58809,5.68643
+			c-0.26946,0.46289-0.29163,1.01901-0.13862,1.53229c1.12885,3.78689,0.12182,8.07323-2.5845,10.95844
+			c-0.32595,0.34749-0.52491,0.80227-0.49364,1.27767c0.16517,2.51117,0.70847,4.91771,1.57953,7.16062
+			c0.1755,0.45189,0.55795,0.78055,1.01104,0.95295c3.79847,1.44538,6.62614,5.00687,7.17154,9.03715
+			c0.06508,0.48089,0.29829,0.92872,0.69829,1.20348c1.94542,1.33629,4.09663,2.39298,6.39509,3.11698
+			c0.16765,0.0528,0.33909,0.07746,0.51025,0.07746c0.36421,0,0.72715-0.11164,1.04953-0.30125
+			c1.73779-1.02215,3.73227-1.53323,5.72673-1.53323s3.98891,0.51107,5.7267,1.53322
+			c0.32237,0.18962,0.68531,0.30126,1.04953,0.30126c0.17116,0,0.3426-0.02466,0.51024-0.07746
+			c2.29866-0.72406,4.45023-1.78086,6.39746-3.11731c0.40004-0.27456,0.63323-0.72235,0.69807-1.20319
+			c0.54342-4.03026,3.37107-7.59172,7.17152-9.03709c0.45332-0.17241,0.83599-0.5012,1.01157-0.95331
+			c0.87096-2.24279,1.41405-4.64924,1.5774-7.16028c0.03094-0.47545-0.16824-0.93016-0.49419-1.27768
+			c-2.70606-2.8852-3.71122-7.17153-2.58406-10.95841c0.15279-0.51329,0.13046-1.06934-0.13896-1.53218
+			c-1.23578-2.12296-2.78795-4.03857-4.58848-5.68684c-0.35365-0.32374-0.82233-0.4707-1.30013-0.4707
+			c-0.04836,0-0.0968,0.00151-0.14524,0.00449c-0.22057,0.01357-0.44147,0.02029-0.66176,0.02029
+			c-3.65639,0-7.23074-1.84738-9.32317-4.86171c-0.26755-0.38543-0.66045-0.6721-1.12384-0.74567
+			C29.55049,2.8697,28.28661,2.76607,26.99993,2.76607L26.99993,2.76607z"/>
+	</g>
+</g>
+<g id="path109720_00000018219049566726604980000005135173328781906831_" inkscape:connector-curvature="0" opacity="0.6">
+	<path fill="#FFFFFF" d="M27,6.02426c0.74651,0,1.50209,0.04102,2.24578,0.12207c0.75726,0.08252,1.48725,0.50586,2.05547,1.19214
+		c2.05435,2.48169,5.19908,3.96314,8.41215,3.96314c0.0855,0,0.17151-0.00098,0.25709-0.00317l0.0519-0.00073
+		c0.55985,0,1.09537,0.22046,1.50799,0.62061c1.22828,1.19067,2.30643,2.52637,3.20454,3.97021
+		c0.31184,0.50122,0.40833,1.10767,0.26473,1.66406c-0.87377,3.3855-0.00654,7.13867,2.26324,9.79517
+		c0.38327,0.44849,0.56183,1.0271,0.50277,1.62891c-0.15583,1.58838-0.49282,3.15357-1.00161,4.65186
+		c-0.22486,0.66211-0.73924,1.20801-1.4483,1.53687c-3.1218,1.44751-5.46496,4.44238-6.11509,7.81592
+		c-0.1266,0.65698-0.4899,1.20532-1.02308,1.54346c-1.34915,0.85645-2.79754,1.55688-4.30498,2.08154
+		c-0.23154,0.08057-0.47222,0.12134-0.71536,0.12134c-0.35114,0-0.69938-0.0874-1.00722-0.25293
+		c-1.55588-0.83618-3.33667-1.27832-5.14985-1.27832c-1.81336,0-3.59429,0.44214-5.15021,1.27856
+		c-0.30769,0.16528-0.65592,0.25269-1.00703,0.25269c-0.2432,0-0.48391-0.04077-0.71553-0.12134
+		c-1.50687-0.52466-2.95429-1.22437-4.30217-2.08032c-0.5335-0.33887-0.8973-0.8877-1.02441-1.54541
+		c-0.65173-3.37329-2.99482-6.36792-6.11475-7.81519c-0.70874-0.32886-1.22286-0.87451-1.44767-1.53638
+		c-0.50884-1.4978-0.84639-3.06372-1.00326-4.65381c-0.05846-0.59253,0.1244-1.18579,0.50175-1.6272
+		c2.27122-2.65747,3.13872-6.41089,2.26394-9.79565c-0.14378-0.55615-0.04739-1.16284,0.2645-1.66406
+		c0.8978-1.44336,1.97575-2.77905,3.20377-3.96973c0.41301-0.40039,0.94897-0.62085,1.50918-0.62085l0.05194,0.00073
+		c0.08578,0.0022,0.17141,0.00317,0.25713,0.00317c3.21307,0,6.35757-1.48169,8.41153-3.96314
+		c0.56791-0.68628,1.29773-1.10938,2.05501-1.19189C25.49921,6.06552,26.25492,6.02426,27,6.02426 M27,5.27426
+		c-0.78646,0-1.56266,0.04346-2.32729,0.12671c-1.01355,0.11035-1.90151,0.67383-2.55159,1.45923
+		c-1.90757,2.30469-4.83893,3.69141-7.83377,3.69141c-0.07956,0-0.15904-0.00098-0.23867-0.00293
+		c-0.02348-0.00049-0.04697-0.00098-0.07039-0.00098c-0.75951,0-1.48426,0.30225-2.03115,0.83228
+		c-1.26579,1.22729-2.38271,2.60742-3.31866,4.11206c-0.41827,0.67236-0.55193,1.48144-0.35377,2.24805
+		c0.81537,3.15479,0.00987,6.64258-2.10796,9.12061c-0.51749,0.60547-0.75618,1.39551-0.67799,2.18823
+		c0.1648,1.67041,0.51766,3.28516,1.0395,4.82129c0.30273,0.89136,0.98827,1.57935,1.8421,1.97559
+		c2.91277,1.35107,5.08415,4.12012,5.69408,7.2771c0.16186,0.83765,0.63857,1.57886,1.35878,2.03613
+		c1.38668,0.88062,2.88077,1.60669,4.45763,2.15552c0.31282,0.10889,0.63809,0.16309,0.96207,0.16309
+		c0.47051,0,0.93836-0.11426,1.36209-0.34204c1.4747-0.79272,3.13502-1.18921,4.79515-1.18921
+		c1.66013,0,3.32007,0.39624,4.79477,1.18896c0.42374,0.22778,0.89176,0.34229,1.36229,0.34229
+		c0.32398,0,0.64912-0.0542,0.96195-0.16309c1.57748-0.54907,3.0723-1.27539,4.46034-2.15649
+		c0.71982-0.45679,1.19625-1.19751,1.35759-2.03491c0.6084-3.15698,2.77983-5.92603,5.69413-7.27734
+		c0.85425-0.39624,1.54018-1.08447,1.84297-1.97607c0.52152-1.53589,0.87403-3.1499,1.03786-4.81983
+		c0.07782-0.79321-0.16123-1.5835-0.67899-2.18945c-2.11739-2.47803-2.92142-5.96582-2.10724-9.12036
+		c0.19786-0.7666,0.06405-1.57568-0.35413-2.2478c-0.93609-1.50488-2.05325-2.88525-3.31932-4.11255
+		c-0.54657-0.53003-1.27095-0.83203-2.03001-0.83203c-0.02345,0-0.04689,0.00049-0.0704,0.00098
+		c-0.07942,0.00195-0.15924,0.00293-0.23859,0.00293c-2.99408,0-5.92635-1.38647-7.83442-3.69141
+		c-0.65026-0.7854-1.5383-1.34912-2.55204-1.45947C28.56251,5.31747,27.78602,5.27426,27,5.27426L27,5.27426z"/>
+</g>
+<path id="path109722_00000061436748106002876880000010182986146052709796_" inkscape:connector-curvature="0" fill="#383838" d="
+	M27.95065,1.74111c0,0.52557-0.42744,0.94836-0.95066,0.94836s-0.94833-0.42279-0.94833-0.94836
+	c0-0.52555,0.42511-0.94835,0.94833-0.94835S27.95065,1.21556,27.95065,1.74111"/>
+<path opacity="0.54" fill="#FFFFFF" enable-background="new    " d="M27.00003,6.02426c-0.74512,0-1.5008,0.04126-2.24616,0.12231
+	c-0.75726,0.08252-1.48706,0.50562-2.05499,1.19189c-2.05395,2.48145-5.19842,3.96314-8.4115,3.96314
+	c-0.08575,0-0.17139-0.00098-0.25714-0.00317l-0.05194-0.00073c-0.56018,0-1.09619,0.22046-1.50916,0.62085
+	c-1.22802,1.19067-2.30595,2.52637-3.20379,3.96973c-0.31189,0.50122-0.40826,1.10791-0.26447,1.66406
+	c0.87476,3.38477,0.00727,7.13818-2.26397,9.79565c-0.37733,0.44141-0.5602,1.03467-0.50177,1.6272
+	c0.15691,1.59009,0.49444,3.15601,1.00329,4.65381c0.22478,0.66187,0.73889,1.20752,1.44763,1.53638
+	c3.11993,1.44727,5.46307,4.44189,6.11475,7.81519c0.12714,0.65771,0.49091,1.20654,1.02441,1.54541
+	c1.3479,0.85596,2.79535,1.55566,4.30219,2.08032c0.23163,0.08057,0.47235,0.12134,0.71552,0.12134
+	c0.35114,0,0.69934-0.0874,1.00702-0.25269c1.55597-0.83643,3.33686-1.27856,5.15027-1.27856
+	c1.81317,0,3.59393,0.44214,5.14984,1.27832c0.3078,0.16553,0.65607,0.25293,1.0072,0.25293
+	c0.24317,0,0.48383-0.04077,0.71534-0.12134c1.50744-0.52466,2.95587-1.2251,4.30499-2.08154
+	c0.5332-0.33813,0.89648-0.88647,1.02307-1.54346c0.65015-3.37354,2.99329-6.36841,6.11511-7.81592
+	c0.70905-0.32886,1.22345-0.87476,1.44831-1.53687c0.50879-1.49829,0.84576-3.06348,1.00158-4.65186
+	c0.05909-0.60181-0.1195-1.18042-0.50274-1.62891c-2.26978-2.65649-3.13703-6.40967-2.26325-9.79517
+	c0.14362-0.5564,0.04712-1.16284-0.26471-1.66406c-0.89813-1.44385-1.97625-2.77954-3.20459-3.97021
+	c-0.4126-0.40015-0.94812-0.62061-1.50793-0.62061l-0.05194,0.00073c-0.08557,0.0022-0.17157,0.00317-0.25708,0.00317
+	c-3.21308,0-6.35779-1.48145-8.41217-3.96314c-0.56818-0.68628-1.29816-1.10962-2.05542-1.19214
+	C28.5021,6.06527,27.74655,6.02426,27.00003,6.02426L27.00003,6.02426z"/>
+<path id="path109724_00000026851521941493466240000008372713963942067077_" inkscape:connector-curvature="0" fill="#383838" d="
+	M27.18946,27.00234h-0.37662c-0.42039,0-0.76119-0.3408-0.76119-0.76119V7.28285c0-0.42039,0.3408-0.76119,0.76119-0.76119h0.37662
+	c0.42039,0,0.76119,0.3408,0.76119,0.76119v18.9583C27.95065,26.66154,27.60986,27.00234,27.18946,27.00234z"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hLargeWhite_bg.svg b/res/ComponentLibrary/Davies1900hLargeWhite_bg.svg
new file mode 100644
index 00000000..59c27c7b
--- /dev/null
+++ b/res/ComponentLibrary/Davies1900hLargeWhite_bg.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="54px" height="54.0024px"
+	 viewBox="0 0 54 54.0024" enable-background="new 0 0 54 54.0024" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-89.801371" inkscape:cy="8.8255868" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="path109718_1_" gradientUnits="userSpaceOnUse" x1="27" y1="0" x2="27" y2="54.00236">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#858585"/>
+</linearGradient>
+<path id="path109718_00000087410135378419476440000003530716317735391636_" inkscape:connector-curvature="0" fill="url(#path109718_1_)" d="
+	M54,26.99999c0,14.91202-12.08797,27.00237-27.00001,27.00237S0,41.91201,0,26.99999C0,12.09032,12.08796,0,26.99999,0
+	S54,12.09032,54,26.99999"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="120.93398" y1="216.0406" x2="120.93398" y2="239.55823" gradientTransform="matrix(-1 0 0 0.50871 147.93398 -99.80668)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse fill="url(#SVGID_1_)" cx="27" cy="16.07793" rx="12.03752" ry="5.98187"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hRed.svg b/res/ComponentLibrary/Davies1900hRed.svg
index 26f7e3b7..dbbe6b1a 100644
--- a/res/ComponentLibrary/Davies1900hRed.svg
+++ b/res/ComponentLibrary/Davies1900hRed.svg
@@ -1,106 +1,203 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36.000004"
-   height="36.001602"
-   viewBox="0 0 9.5250006 9.5254239"
-   version="1.1"
-   id="svg16908"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="Davies1900hRed.svg">
-  <defs
-     id="defs16902">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6367">
-      <path
-         d="M 0,3193 H 2089 V 0 H 0 Z"
-         id="path6365"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-88.847695"
-     inkscape:cy="17.482497"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata16905">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-230.79391,-125.3411)">
-    <g
-       id="g1996"
-       transform="matrix(0.2645804,0,0,-0.2645804,-143.82352,756.18044)"
-       style="stroke-width:1.33334816">
-      <g
-         transform="translate(1451.8926,2366.2998)"
-         id="g6467"
-         style="stroke-width:1.33334816">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6469"
-           style="fill:#830100;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33334816"
-           d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0" />
-      </g>
-      <g
-         transform="translate(1451.791,2368.2021)"
-         id="g6471"
-         style="stroke-width:1.33334816">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6473"
-           style="fill:#ff030a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.33334816"
-           d="m 0,0 c -0.79,1.279 -2.12,2.537 -2.86,4.327 -0.74,1.784 -0.691,3.609 -1.033,5.067 -0.805,0.997 -1.711,1.902 -2.709,2.708 -1.459,0.341 -3.282,0.293 -5.068,1.033 -1.79,0.742 -3.048,2.069 -4.325,2.86 -0.625,0.066 -1.26,0.104 -1.902,0.104 -0.644,0 -1.279,-0.038 -1.903,-0.104 -1.279,-0.791 -2.537,-2.118 -4.327,-2.86 -1.784,-0.74 -3.607,-0.692 -5.067,-1.033 -0.997,-0.806 -1.904,-1.711 -2.708,-2.708 -0.342,-1.458 -0.294,-3.283 -1.035,-5.067 -0.74,-1.79 -2.069,-3.048 -2.858,-4.327 -0.066,-0.625 -0.103,-1.26 -0.103,-1.902 0,-0.643 0.037,-1.278 0.103,-1.905 0.789,-1.277 2.118,-2.535 2.858,-4.325 0.741,-1.784 0.693,-3.609 1.035,-5.066 0.804,-0.998 1.711,-1.904 2.708,-2.709 1.46,-0.342 3.283,-0.293 5.067,-1.032 1.79,-0.743 3.048,-2.071 4.327,-2.861 0.624,-0.065 1.259,-0.103 1.903,-0.103 0.642,0 1.277,0.038 1.902,0.103 1.277,0.79 2.535,2.118 4.325,2.861 1.786,0.739 3.609,0.69 5.068,1.032 0.998,0.805 1.904,1.711 2.709,2.709 0.342,1.457 0.293,3.282 1.033,5.066 0.74,1.79 2.07,3.048 2.86,4.325 0.065,0.627 0.102,1.262 0.102,1.905 C 0.102,-1.26 0.065,-0.625 0,0" />
-      </g>
-      <g
-         transform="translate(1434.4912,2384.2314)"
-         id="g6475"
-         style="stroke-width:1.33334816">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6477"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.33334816"
-           d="M 0,0 C -0.195,0.045 -0.393,0.069 -0.598,0.069 -0.804,0.069 -1.002,0.045 -1.196,0 V -18.157 H 0 Z" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="36px" height="36.0016px"
+	 viewBox="0 0 36 36.0016" enable-background="new 0 0 36 36.0016" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-88.847695" inkscape:cy="17.482497" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g opacity="0.29" enable-background="new    ">
+	<path fill="#F07F7F" d="M18.03021,1.84695c0.50058,0,1.00682,0.02386,1.50432,0.07087
+		c0.10089,0.00958,0.20305,0.03061,0.30366,0.0625l0.07239,0.02295l0.07548,0.00843
+		c0.42952,0.04798,0.90456,0.05413,1.27043,0.05413c0.2077,0,0.42116-0.00226,0.63775-0.00456
+		c0.21742-0.00232,0.43807-0.00469,0.65915-0.00469c0.86696,0,1.84119,0.03638,2.49349,0.30619
+		c0.6667,0.27582,1.08666,0.83378,1.57292,1.47985c0.38367,0.50974,0.7804,1.03684,1.34013,1.47981l0.05381,0.04259l0.06048,0.03244
+		c0.09147,0.04909,0.17251,0.10263,0.24041,0.15876c0.77831,0.64445,1.49941,1.36698,2.14295,2.14714
+		c0.05626,0.06829,0.10958,0.14926,0.15846,0.24066l0.03328,0.06222l0.04399,0.05518
+		c0.40585,0.50903,0.92139,0.95439,1.41996,1.38509c0.73243,0.63272,1.42424,1.23036,1.72486,1.95522
+		c0.30686,0.7398,0.24464,1.7328,0.18448,2.6931c-0.04213,0.67233-0.08569,1.36755-0.00864,2.01603l0.71195-0.08459
+		l-0.69078,0.19688c0.02048,0.07362,0.04495,0.16837,0.05259,0.24842c0.09633,1.00796,0.09702,2.02855,0.00204,3.03355
+		c-0.00839,0.08885-0.02793,0.18435-0.05811,0.28384l-0.02045,0.06745l-0.00793,0.07003
+		c-0.06875,0.60724-0.04597,1.26405-0.02186,1.95943c0.03674,1.05952,0.07474,2.15511-0.24208,2.92096
+		c-0.2912,0.70401-0.93378,1.2265-1.61408,1.77968c-0.51097,0.41548-1.03934,0.84511-1.46655,1.3875l-0.03816,0.04845l-0.03,0.05388
+		c-0.04875,0.08754-0.089,0.14783-0.13931,0.20852c-0.64346,0.77744-1.36595,1.49853-2.1473,2.14318
+		c-0.06979,0.05756-0.11429,0.08797-0.19043,0.13014l-0.05503,0.03048l-0.04938,0.03897
+		c-0.51263,0.40454-0.97103,0.92516-1.41433,1.42863c-0.63211,0.71791-1.28574,1.46027-2.02566,1.76712
+		c-0.38183,0.15839-0.85012,0.23217-1.47374,0.23217c-0.38329,0-0.79139-0.02747-1.18606-0.05404
+		c-0.40773-0.02745-0.82935-0.05583-1.24003-0.05583c-0.28498,0-0.53817,0.01348-0.77404,0.04122l-0.06166,0.00725l-0.05972,0.017
+		c-0.09319,0.02652-0.15748,0.0392-0.23766,0.04682c-0.50664,0.04844-1.02107,0.07301-1.529,0.07301
+		c-0.50053,0-1.00672-0.02386-1.50444-0.0709c-0.09852-0.00931-0.15484-0.01935-0.23177-0.04129l-0.05985-0.01707l-0.06181-0.00728
+		c-0.29212-0.03441-0.61664-0.05044-1.02126-0.05044c-0.31091,0-0.63496,0.00958-0.96426,0.01945
+		c-0.32431,0.00972-0.65396,0.01971-0.98066,0.01971c-0.61522,0-1.39693-0.03125-1.98589-0.2749
+		c-0.70807-0.29293-1.22684-0.93263-1.77608-1.60988c-0.41332-0.50966-0.84071-1.03666-1.38448-1.46601l-0.05056-0.03991
+		l-0.05645-0.03101c-0.08205-0.04505-0.13802-0.08291-0.20697-0.14008c-0.77753-0.64358-1.49858-1.36607-2.14356-2.14798
+		c-0.05284-0.06393-0.08678-0.11269-0.12679-0.18452L5.4222,28.03473l-0.0384-0.04866
+		c-0.41014-0.5197-0.93317-0.97179-1.43897-1.409c-0.73406-0.6345-1.42741-1.23381-1.73065-1.9649
+		c-0.31072-0.74925-0.25145-1.75534-0.19413-2.7283c0.03955-0.67143,0.08045-1.36572,0.00457-2.01145l-0.00711-0.06043
+		l-0.01646-0.05857c-0.02946-0.10483-0.04481-0.17868-0.05133-0.24704C1.8534,18.49832,1.85271,17.47763,1.94763,16.473
+		c0.00775-0.08166,0.02642-0.15562,0.04777-0.23415l0.01507-0.05544l0.00672-0.05705c0.07897-0.6705,0.01966-1.3546-0.03769-2.01617
+		c-0.07997-0.92254-0.15551-1.79392,0.14179-2.51263c0.31304-0.75673,1.08781-1.46244,1.83707-2.14493
+		c0.49451-0.45044,1.00587-0.91622,1.39796-1.41091l0.04205-0.05305l0.03219-0.05955
+		C5.4812,7.83545,5.53209,7.75818,5.58611,7.69293C6.23046,6.91471,6.953,6.1937,7.73412,5.54955
+		C7.79654,5.49797,7.87257,5.4481,7.96653,5.39708l0.05973-0.03244l0.05317-0.04236c0.50636-0.4035,0.95578-0.91889,1.3904-1.41731
+		c0.6189-0.70973,1.25886-1.44362,1.98904-1.74653c0.37649-0.15612,0.84023-0.22883,1.4594-0.22881
+		c0.38417,0.00001,0.79356,0.02767,1.18947,0.05441c0.40841,0.02759,0.83072,0.05611,1.24113,0.05611
+		c0.28379,0,0.53571-0.01346,0.77015-0.04115l0.06235-0.00736l0.06034-0.01732c0.10572-0.03035,0.1879-0.04759,0.25947-0.05436
+		C17.0078,1.87151,17.52223,1.84695,18.03021,1.84695 M18.03022,1.07347c-0.53702,0-1.07176,0.02575-1.60265,0.07651
+		c-0.13618,0.01287-0.26897,0.04347-0.39926,0.08087c-0.21896,0.02586-0.4463,0.03582-0.67943,0.03582
+		c-0.77704,0-1.61886-0.11051-2.43057-0.11053c-0.61634-0.00002-1.21521,0.06367-1.7557,0.2878
+		c-1.45595,0.60399-2.38757,2.335-3.5652,3.27342C7.47262,4.78513,7.3521,4.86186,7.24154,4.95318
+		c-0.8131,0.67054-1.56791,1.42122-2.2512,2.24646c-0.09289,0.1122-0.17152,0.2346-0.24019,0.36162
+		c-0.9409,1.1871-2.73669,2.27351-3.3436,3.74062c-0.60849,1.47101,0.01994,3.22705-0.15753,4.734
+		c-0.03315,0.12191-0.05938,0.23727-0.07141,0.36404c-0.10078,1.06665-0.09811,2.13086,0.00213,3.18002
+		c0.01263,0.13236,0.04098,0.25573,0.07668,0.38275c0.1779,1.51375-0.36958,3.46796,0.24328,4.94577
+		c0.60994,1.47052,2.337,2.36579,3.27693,3.55678c0.0652,0.11706,0.12021,0.19672,0.20631,0.3009
+		c0.67072,0.8131,1.42122,1.56791,2.24658,2.25108c0.10868,0.0901,0.20534,0.15494,0.32786,0.22222
+		c1.19621,0.94448,1.86602,2.57203,3.34419,3.18355c0.6596,0.27288,1.46168,0.33365,2.28158,0.33365
+		c0.65817,0,1.32804-0.03916,1.94492-0.03916c0.32858,0,0.64191,0.01109,0.93077,0.04513
+		c0.13029,0.03716,0.23502,0.05465,0.37109,0.06752c0.52682,0.04979,1.0531,0.07433,1.57727,0.07433
+		c0.53699,0,1.07176-0.02576,1.60262-0.07652c0.13546-0.01287,0.24608-0.03594,0.37577-0.07285
+		c0.22073-0.02596,0.44946-0.03593,0.68369-0.03593c0.7774,0,1.61588,0.10988,2.42609,0.10988
+		c0.61984,0,1.22305-0.06427,1.77012-0.29121c1.47052-0.60983,2.43178-2.36313,3.62277-3.303
+		c0.11839-0.06557,0.20242-0.12313,0.30783-0.21007c0.81303-0.67078,1.56778-1.42122,2.25101-2.24671
+		c0.08737-0.1054,0.15325-0.20691,0.21924-0.32543c0.93884-1.19196,2.5792-1.87889,3.18775-3.35014
+		c0.6026-1.45668,0.14837-3.59276,0.31776-5.08902c0.04287-0.14135,0.07396-0.28706,0.08798-0.43569
+		c0.10079-1.0664,0.09812-2.13086-0.00213-3.17978c-0.01243-0.13034-0.04259-0.25706-0.07735-0.38206
+		c-0.00002-0.00006-0.00004-0.00013-0.00005-0.0002c0.00002,0.00007,0.00003,0.00013,0.00005,0.0002
+		c0.00041,0.00137,0.00136,0.00253,0.00171,0.00368c-0.17899-1.50646,0.38049-3.4437-0.22946-4.91422
+		c-0.60302-1.45401-2.31693-2.35022-3.25449-3.52615c-0.0691-0.1292-0.1493-0.25331-0.24353-0.36769
+		c-0.67072-0.8131-1.42128-1.56767-2.24664-2.25108c-0.11427-0.09447-0.23855-0.1751-0.368-0.24456
+		c-1.17994-0.9338-1.64092-2.46532-3.09736-3.06786c-0.76566-0.3167-1.78183-0.36494-2.78918-0.36494
+		c-0.44122,0-0.88078,0.00925-1.2969,0.00925c-0.4275,0-0.83014-0.00976-1.18456-0.04935
+		c-0.15015-0.0476-0.30577-0.08015-0.46429-0.0952C19.08076,1.09802,18.55441,1.07347,18.03022,1.07347L18.03022,1.07347z
+		 M8.23405,4.50073c0.00018,0,0.00043,0,0.00061,0C8.23448,4.50073,8.23429,4.50073,8.23405,4.50073L8.23405,4.50073z"/>
+</g>
+<path opacity="0.23" fill="#750000" d="M35.90357,16.15523c-0.07361-0.70705-0.49979-1.29864-1.06952-1.72377
+	c-0.61895-0.46186-1.30921-1.50206-1.85906-2.79493c-0.55021-1.29408-0.82048-2.5138-0.72318-3.27993
+	c0.08954-0.70504-0.04032-1.42231-0.49814-1.9659c-0.71619-0.85038-1.51525-1.63894-2.39182-2.35207
+	c-0.55256-0.44953-1.27422-0.56869-1.97903-0.46552c-0.76414,0.11186-1.98919-0.13576-3.29369-0.66165
+	c-1.30531-0.52654-2.35981-1.19865-2.83229-1.80971c-0.43578-0.56359-1.03802-0.97887-1.74792-1.03872
+	c-1.12585-0.09492-2.24826-0.08171-3.35386,0.03338c-0.7071,0.07361-1.29866,0.49991-1.72382,1.06969
+	c-0.46185,0.61894-1.50183,1.30921-2.79484,1.85879C10.34243,3.57512,9.12277,3.8454,8.35668,3.74825
+	C7.65162,3.65884,6.93432,3.78858,6.39073,4.24642c-0.85038,0.71624-1.639,1.51525-2.35212,2.39175
+	c-0.44951,0.5525-0.56872,1.27411-0.46555,1.97886c0.11186,0.76415-0.13561,1.9892-0.66171,3.29384
+	c-0.52652,1.30541-1.19883,2.3602-1.80989,2.83256c-0.56343,0.43554-0.97863,1.03749-1.03844,1.74712
+	c-0.09491,1.12597-0.0817,2.24858,0.03345,3.35436c0.07363,0.70707,0.49988,1.29863,1.06962,1.7238
+	c0.61889,0.46184,1.30912,1.50186,1.85894,2.79489c0.5502,1.29385,0.82051,2.5137,0.72324,3.27988
+	c-0.08951,0.70504,0.0403,1.42231,0.49813,1.96589c0.71613,0.85026,1.51513,1.63887,2.39162,2.35188
+	c0.5526,0.44954,1.2743,0.56875,1.97914,0.46561c0.76419-0.11182,1.98924,0.13566,3.29371,0.6618
+	c1.3056,0.52645,2.36037,1.19888,2.83273,1.80995c0.43551,0.56341,1.03745,0.97859,1.74704,1.03843
+	c1.12602,0.09496,2.24863,0.08175,3.35437-0.03349c0.70696-0.07368,1.29852-0.49973,1.72354-1.06945
+	c0.46177-0.61897,1.50192-1.30924,2.79504-1.85913c1.2939-0.55021,2.5135-0.82048,3.27964-0.72324
+	c0.70521,0.08952,1.42269-0.04021,1.96637-0.4982c0.85029-0.71627,1.63881-1.51539,2.35187-2.39191
+	c0.44946-0.55249,0.56865-1.27406,0.46548-1.97877c-0.11187-0.76414,0.1356-1.98916,0.66171-3.2936
+	c0.52645-1.30538,1.19873-2.36014,1.8098-2.83266c0.56349-0.43573,0.97872-1.03787,1.03854-1.74766
+	C36.03189,18.38322,36.01868,17.26087,35.90357,16.15523z M35.14483,19.45553c-0.03778,0.4441-0.26189,0.84652-0.59933,1.07659
+	c-0.76952,0.52408-1.56887,1.71213-2.19307,3.25983c-0.62362,1.54641-0.87236,2.95595-0.68247,3.86751
+	c0.08327,0.39955-0.03467,0.84465-0.31572,1.19049c-0.67815,0.83517-1.44105,1.61091-2.26751,2.30584
+	c-0.26963,0.22685-0.59977,0.35347-0.92951,0.35656c-0.08353,0.00078-0.16682-0.00671-0.2476-0.02198
+	c-0.1923-0.03671-0.40678-0.05408-0.63754-0.05193c-0.87313,0.00817-2.01639,0.29437-3.21898,0.80596
+	c-1.5346,0.65219-2.70716,1.47313-3.21707,2.25219c-0.22193,0.33908-0.61765,0.56918-1.05824,0.61569
+	c-0.53955,0.05674-1.08767,0.08797-1.62899,0.09303c-0.53344,0.00499-1.07326-0.01528-1.60433-0.06045
+	c-0.44403-0.03797-0.84652-0.26189-1.07653-0.59959c-0.52428-0.76965-1.71252-1.569-3.26015-2.19313
+	c-1.21234-0.489-2.36075-0.75375-3.23362-0.74558c-0.22967,0.00215-0.44288,0.02353-0.63362,0.0633
+	c-0.08048,0.01678-0.16368,0.02557-0.24741,0.02635c-0.33272,0.00311-0.66769-0.11832-0.94328-0.34214
+	c-0.8353-0.67835-1.61104-1.44124-2.30585-2.2677C4.55894,28.7474,4.434,28.30741,4.50968,27.90948
+	c0.17409-0.9147-0.1008-2.32038-0.75404-3.85691C3.103,22.51811,2.282,21.34549,1.5032,20.83563
+	c-0.33915-0.22193-0.56925-0.61752-0.61549-1.05799c-0.11271-1.07355-0.12367-2.16148-0.03246-3.23358
+	c0.03778-0.4441,0.26183-0.84652,0.59927-1.07633c0.76958-0.52408,1.56894-1.71239,2.19313-3.26009
+	c0.62362-1.54641,0.87236-2.95595,0.68247-3.86725c-0.08327-0.39955,0.0348-0.84465,0.31572-1.19075
+	c0.67899-0.83595,1.44195-1.6117,2.26777-2.30559C7.18324,4.61721,7.51324,4.49058,7.84279,4.4875
+	c0.08366-0.00078,0.16695,0.00671,0.24773,0.02198C8.28263,4.54619,8.49704,4.56356,8.72768,4.5614
+	c0.87288-0.00817,2.01613-0.29436,3.21936-0.80597c1.53479-0.65271,2.70734-1.47364,3.21701-2.25219
+	c0.22206-0.33934,0.61758-0.56944,1.05818-0.61569c0.53961-0.05674,1.08773-0.08797,1.62912-0.09304
+	c0.53357-0.00499,1.07339,0.01528,1.60439,0.06045c0.44416,0.03797,0.84659,0.26189,1.07653,0.59959
+	c0.52408,0.76939,1.71232,1.56874,3.25989,2.19287c1.2124,0.489,2.36088,0.75401,3.23388,0.74584
+	c0.22967-0.00215,0.44281-0.02353,0.63356-0.0633c0.08048-0.01678,0.16368-0.02557,0.2474-0.02635
+	c0.33272-0.00311,0.66776,0.11832,0.94315,0.34188c0.8353,0.6786,1.61118,1.4415,2.30585,2.2677
+	c0.28513,0.33899,0.41014,0.77924,0.33445,1.17717c-0.17403,0.9147,0.1008,2.32038,0.75397,3.85665
+	c0.65245,1.53447,1.47345,2.70709,2.25245,3.21694c0.33915,0.22193,0.56924,0.61752,0.61549,1.05824
+	C35.22515,17.29576,35.23604,18.38344,35.14483,19.45553z"/>
+<path opacity="0.64" fill="#DB0000" d="M34.06219,15.82835c-0.92052-0.6026-1.8255-1.87058-2.54837-3.57056
+	c-0.72367-1.70204-1.00892-3.23478-0.8033-4.3157c0.0311-0.16363-0.03098-0.36205-0.16211-0.51795
+	c-0.6622-0.78748-1.40201-1.51505-2.19884-2.16248c-0.1321-0.10705-0.28667-0.16556-0.43514-0.16417
+	c-0.03146,0.00029-0.0627,0.00343-0.09288,0.00966c-0.24182,0.05033-0.50698,0.07737-0.78808,0.08
+	c-0.97456,0.00912-2.23113-0.27633-3.53828-0.80347c-1.71445-0.69131-2.99972-1.57298-3.61906-2.48206
+	c-0.09538-0.14022-0.28238-0.23797-0.48807-0.25568c-0.50527-0.04283-1.01994-0.0623-1.52929-0.05754
+	c-0.51697,0.00484-1.03964,0.0348-1.55357,0.08871c-0.20287,0.02128-0.38549,0.1212-0.47684,0.26084
+	c-0.60235,0.92026-1.87045,1.82504-3.57063,2.54805c-1.29693,0.5515-2.54794,0.86016-3.52263,0.86928
+	C8.45162,5.35792,8.18457,5.33561,7.94153,5.2893c-0.02874-0.00542-0.05997-0.00823-0.0913-0.00793
+	c-0.14562,0.00136-0.2967,0.0617-0.42555,0.17016C6.63706,6.11327,5.90956,6.85302,5.26206,7.65017
+	C5.13214,7.81032,5.07279,8.01272,5.10729,8.17832c0.22439,1.07689-0.03253,2.61315-0.72341,4.32637
+	c-0.69151,1.71451-1.57317,2.99998-2.48252,3.61919c-0.13989,0.09538-0.23765,0.28212-0.25511,0.48748
+	c-0.08696,1.02217-0.07655,2.05946,0.03099,3.08344c0.02128,0.20268,0.12113,0.38524,0.26064,0.47645
+	c0.92026,0.6026,1.82524,1.87058,2.54831,3.57056c0.7238,1.70256,1.00906,3.23529,0.80337,4.31621
+	c-0.0311,0.16337,0.03104,0.36153,0.16204,0.51744c0.66259,0.78799,1.40227,1.51556,2.19871,2.16248
+	c0.13236,0.10731,0.287,0.16582,0.4354,0.16443c0.0314-0.00029,0.06258-0.00343,0.09276-0.00965
+	c0.24195-0.05033,0.50711-0.07737,0.78827-0.08c0.97482-0.00912,2.23132,0.27607,3.53802,0.80321
+	c1.71445,0.69131,2.99979,1.57298,3.61932,2.48232c0.09532,0.14022,0.28238,0.23796,0.488,0.25568
+	c0.50533,0.04282,1.02001,0.0623,1.52929,0.05754c0.5169-0.00484,1.03958-0.0348,1.55337-0.08871
+	c0.2028-0.02154,0.38569-0.12146,0.47697-0.26084c0.6026-0.92078,1.87071-1.82556,3.57082-2.54805
+	c1.29603-0.55149,2.54691-0.86015,3.52212-0.86928c0.28349-0.00265,0.55054,0.01966,0.79378,0.06597
+	c0.02887,0.00542,0.0601,0.00822,0.09137,0.00793c0.14575-0.00136,0.29702-0.0617,0.42581-0.17016
+	c0.78838-0.66304,1.51582-1.40279,2.16229-2.1989c0.13011-0.1599,0.18941-0.3623,0.15484-0.52789
+	c-0.22433-1.07715,0.0326-2.61341,0.7234-4.32662c0.69144-1.71425,1.57304-2.99972,2.48245-3.61893
+	c0.13983-0.09538,0.23771-0.28238,0.25517-0.48774c0.08696-1.02217,0.07655-2.05946-0.03098-3.08318
+	C34.30149,16.10213,34.20164,15.91957,34.06219,15.82835z"/>
+<g opacity="0.39">
+	<path fill="#ED3232" d="M17.85875,1.58839c0.50938-0.00477,1.02404,0.01471,1.52934,0.05754
+		c0.20568,0.01772,0.39264,0.11547,0.48802,0.25568c0.61935,0.90909,1.90463,1.79075,3.61907,2.48207
+		c1.30716,0.52714,2.56374,0.81259,3.53827,0.80347c0.28111-0.00263,0.5463-0.02966,0.78808-0.08
+		c0.03021-0.00623,0.06145-0.00936,0.09288-0.00966c0.14846-0.00139,0.30307,0.05712,0.43514,0.16417
+		c0.79686,0.64743,1.53664,1.375,2.19888,2.16248c0.13108,0.15591,0.19319,0.35433,0.16209,0.51795
+		c-0.20565,1.08092,0.07962,2.61365,0.80329,4.3157c0.72289,1.69998,1.62788,2.96796,2.54836,3.57056
+		c0.13948,0.09122,0.23933,0.27378,0.26062,0.47671c0.10753,1.02372,0.11795,2.061,0.03097,3.08318
+		c-0.01748,0.20537-0.11537,0.39236-0.25518,0.48774c-0.9094,0.61921-1.79101,1.90468-2.48246,3.61893
+		c-0.69081,1.71321-0.94771,3.24947-0.72339,4.32662c0.03453,0.1656-0.02471,0.36799-0.15483,0.52789
+		c-0.64647,0.79611-1.37391,1.53585-2.1623,2.1989c-0.12882,0.10846-0.28006,0.1688-0.42584,0.17016
+		c-0.03127,0.00029-0.06247-0.00252-0.09134-0.00793c-0.24322-0.04631-0.51029-0.06862-0.79381-0.06597
+		c-0.97516,0.00913-2.22609,0.31778-3.52207,0.86928c-1.70012,0.72249-2.96826,1.62727-3.57084,2.54805
+		c-0.0913,0.13938-0.27418,0.2393-0.47697,0.26084c-0.51383,0.05391-1.03647,0.08387-1.55341,0.08871
+		c-0.50928,0.00476-1.02392-0.01471-1.52924-0.05754c-0.20568-0.01772-0.39268-0.11547-0.48805-0.25568
+		c-0.61948-0.90935-1.90487-1.79101-3.61932-2.48232c-1.30669-0.52714-2.56319-0.81233-3.53802-0.80321
+		c-0.28113,0.00263-0.54633,0.02966-0.78824,0.08c-0.03018,0.00623-0.06139,0.00936-0.09279,0.00965
+		c-0.1484,0.00139-0.30301-0.05712-0.43538-0.16443c-0.7964-0.64692-1.53613-1.37449-2.19871-2.16248
+		c-0.13102-0.15591-0.19311-0.35407-0.16204-0.51744c0.20572-1.08092-0.07959-2.61365-0.80337-4.31621
+		c-0.72307-1.69998-1.62804-2.96796-2.54829-3.57056c-0.13951-0.09122-0.23938-0.27378-0.26066-0.47645
+		c-0.1075-1.02397-0.11792-2.06126-0.03097-3.08344c0.01746-0.20537,0.11523-0.3921,0.25511-0.48748
+		c0.90933-0.61921,1.79098-1.90468,2.48253-3.61919c0.69082-1.71321,0.94775-3.24947,0.72339-4.32636
+		c-0.03453-0.1656,0.02482-0.36799,0.15476-0.52815c0.64751-0.79715,1.375-1.5369,2.16263-2.19864
+		C7.5535,5.34306,7.70463,5.28273,7.8502,5.28136C7.88153,5.28107,7.91277,5.28388,7.94152,5.2893
+		C8.1846,5.33561,8.4516,5.35792,8.73508,5.35527c0.97472-0.00912,2.22573-0.31778,3.52263-0.86928
+		c1.70023-0.72301,2.96828-1.62779,3.57063-2.54805c0.09134-0.13964,0.27402-0.23956,0.47687-0.26084
+		C16.81911,1.62319,17.34179,1.59323,17.85875,1.58839 M17.85133,0.79453c-0.54139,0.00507-1.08951,0.0363-1.62912,0.09304
+		c-0.4406,0.04625-0.83612,0.27635-1.05818,0.61569c-0.50966,0.77854-1.68222,1.59947-3.21701,2.25219
+		c-1.20323,0.5116-2.34649,0.7978-3.21936,0.80597C8.49702,4.56356,8.28261,4.54619,8.0905,4.50948
+		C8.00972,4.49421,7.92643,4.48672,7.84277,4.4875C7.51322,4.49058,7.18321,4.61721,6.91358,4.84406
+		C6.08777,5.53795,5.3248,6.31369,4.64582,7.14964C4.3649,7.49574,4.24682,7.94085,4.3301,8.3404
+		c0.18989,0.9113-0.05885,2.32084-0.68247,3.86725c-0.62419,1.5477-1.42355,2.736-2.19313,3.26009
+		c-0.33744,0.22981-0.56149,0.63223-0.59927,1.07633c-0.09121,1.07209-0.08026,2.16003,0.03246,3.23358
+		c0.04625,0.44047,0.27634,0.83606,0.61549,1.05799c0.7788,0.50985,1.5998,1.68247,2.25244,3.21694
+		c0.65325,1.53653,0.92814,2.9422,0.75404,3.85691c-0.07568,0.39793,0.04926,0.83792,0.33432,1.17692
+		c0.6948,0.82646,1.47055,1.58935,2.30585,2.2677c0.27559,0.22382,0.61057,0.34525,0.94328,0.34214
+		c0.08373-0.00078,0.16693-0.00957,0.24741-0.02635c0.19075-0.03978,0.40395-0.06115,0.63362-0.0633
+		c0.87288-0.00817,2.02128,0.25658,3.23362,0.74558c1.54764,0.62413,2.73588,1.42348,3.26015,2.19313
+		c0.23001,0.3377,0.63249,0.56162,1.07653,0.59959c0.53107,0.04517,1.07088,0.06544,1.60433,0.06045
+		c0.54132-0.00507,1.08945-0.0363,1.62899-0.09303c0.4406-0.04651,0.83631-0.27661,1.05824-0.61569
+		c0.50992-0.77906,1.68247-1.59999,3.21707-2.25219c1.20259-0.51159,2.34584-0.79779,3.21898-0.80596
+		c0.23077-0.00216,0.44524,0.01521,0.63754,0.05192c0.08078,0.01527,0.16406,0.02276,0.2476,0.02198
+		c0.32974-0.00308,0.65988-0.12971,0.92951-0.35656c0.82645-0.69493,1.58935-1.47067,2.26751-2.30584
+		c0.28105-0.34584,0.399-0.79095,0.31572-1.19049c-0.18989-0.91156,0.05885-2.3211,0.68247-3.86751
+		c0.62419-1.5477,1.42355-2.73575,2.19307-3.25983c0.33744-0.23007,0.56155-0.63249,0.59933-1.07659
+		c0.09121-1.07209,0.08032-2.15977-0.03245-3.23332c-0.04625-0.44073-0.27635-0.83632-0.6155-1.05824
+		c-0.779-0.50985-1.59999-1.68247-2.25245-3.21694c-0.65318-1.53627-0.928-2.94195-0.75397-3.85665
+		c0.07568-0.39793-0.04932-0.83818-0.33446-1.17717c-0.69467-0.8262-1.47054-1.5891-2.30585-2.2677
+		c-0.27539-0.22356-0.61044-0.34499-0.94315-0.34188c-0.08373,0.00078-0.16693,0.00957-0.24741,0.02635
+		c-0.19075,0.03978-0.40389,0.06115-0.63356,0.0633c-0.873,0.00817-2.02148-0.25684-3.23388-0.74584
+		c-1.54757-0.62413-2.73581-1.42348-3.25989-2.19287c-0.22994-0.3377-0.63236-0.56162-1.07653-0.59959
+		C18.92471,0.80981,18.3849,0.78953,17.85133,0.79453L17.85133,0.79453z"/>
+</g>
+<path fill="#E3E3E3" d="M17.98332,2.51392h-0.12289c-0.38496,0-0.69703,0.31207-0.69703,0.69703v14.41034
+	c0,0.38496,0.31207,0.69703,0.69703,0.69703l0.12289,0c0.38496,0,0.69702-0.31207,0.69702-0.69703V3.21095
+	C18.68035,2.82599,18.36828,2.51392,17.98332,2.51392z"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hRed_bg.svg b/res/ComponentLibrary/Davies1900hRed_bg.svg
new file mode 100644
index 00000000..5f24e4cf
--- /dev/null
+++ b/res/ComponentLibrary/Davies1900hRed_bg.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="36px" height="36.0016px"
+	 viewBox="0 0 36 36.0016" enable-background="new 0 0 36 36.0016" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-88.847695" inkscape:cy="17.482497" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="18.00007" y1="3.637979e-12" x2="18.00007" y2="36">
+	<stop  offset="0" style="stop-color:#FF5252"/>
+	<stop  offset="1" style="stop-color:#610000"/>
+</linearGradient>
+<circle fill="url(#SVGID_1_)" cx="18.00007" cy="18" r="18"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="112.00964" y1="213.36432" x2="112.00964" y2="233.88402" gradientTransform="matrix(-1 0 0 0.50871 129.93398 -104.22826)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse opacity="0.8" fill="url(#SVGID_2_)" cx="17.92434" cy="9.53234" rx="8.37098" ry="5.21932"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hWhite.svg b/res/ComponentLibrary/Davies1900hWhite.svg
index 16219f4f..cb0b28d4 100644
--- a/res/ComponentLibrary/Davies1900hWhite.svg
+++ b/res/ComponentLibrary/Davies1900hWhite.svg
@@ -1,106 +1,160 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36.000004"
-   height="36.001602"
-   viewBox="0 0 9.5250006 9.5254239"
-   version="1.1"
-   id="svg16908"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="Davies1900hWhite.svg">
-  <defs
-     id="defs16902">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6367">
-      <path
-         d="M 0,3193 H 2089 V 0 H 0 Z"
-         id="path6365"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-91.947964"
-     inkscape:cy="8.8255993"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1422"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     units="px" />
-  <metadata
-     id="metadata16905">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-231.61419,-123.05063)">
-    <g
-       id="g2004"
-       transform="matrix(0.2645804,0,0,-0.2645804,-126.59926,753.88997)"
-       style="stroke-width:1.33334816">
-      <g
-         transform="translate(1389.8926,2366.2998)"
-         id="g6455"
-         style="stroke-width:1.33334816">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6457"
-           style="fill:#d6d6d6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33334816"
-           d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.941,0 -18,8.059 -18,18 0,9.941 8.059,18 18,18 C -8.059,18 0,9.941 0,0" />
-      </g>
-      <g
-         transform="translate(1389.791,2368.2021)"
-         id="g6459"
-         style="stroke-width:1.33334816">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6461"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.33334816"
-           d="m 0,0 c -0.79,1.279 -2.12,2.537 -2.86,4.327 -0.74,1.784 -0.691,3.609 -1.033,5.067 -0.805,0.997 -1.711,1.902 -2.709,2.708 -1.459,0.341 -3.282,0.293 -5.068,1.033 -1.79,0.742 -3.048,2.069 -4.325,2.86 -0.625,0.066 -1.26,0.104 -1.902,0.104 -0.644,0 -1.279,-0.038 -1.903,-0.104 -1.279,-0.791 -2.537,-2.118 -4.327,-2.86 -1.784,-0.74 -3.607,-0.692 -5.067,-1.033 -0.997,-0.806 -1.904,-1.711 -2.708,-2.708 -0.342,-1.458 -0.294,-3.283 -1.035,-5.067 -0.74,-1.79 -2.069,-3.048 -2.858,-4.327 -0.066,-0.625 -0.103,-1.26 -0.103,-1.902 0,-0.643 0.037,-1.278 0.103,-1.905 0.789,-1.277 2.118,-2.535 2.858,-4.325 0.741,-1.784 0.693,-3.609 1.035,-5.066 0.804,-0.998 1.711,-1.904 2.708,-2.709 1.46,-0.342 3.283,-0.293 5.067,-1.032 1.79,-0.743 3.048,-2.071 4.327,-2.861 0.624,-0.065 1.259,-0.103 1.903,-0.103 0.642,0 1.277,0.038 1.902,0.103 1.277,0.79 2.535,2.118 4.325,2.861 1.786,0.739 3.609,0.69 5.068,1.032 0.998,0.805 1.904,1.711 2.709,2.709 0.342,1.457 0.293,3.282 1.033,5.066 0.74,1.79 2.07,3.048 2.86,4.325 0.065,0.627 0.102,1.262 0.102,1.905 C 0.102,-1.26 0.065,-0.625 0,0" />
-      </g>
-      <g
-         transform="translate(1372.4912,2384.2314)"
-         id="g6463"
-         style="stroke-width:1.33334816">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6465"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.33334816"
-           d="M 0,0 C -0.195,0.045 -0.393,0.069 -0.598,0.069 -0.804,0.069 -1.002,0.045 -1.196,0 V -18.157 H 0 Z" />
-      </g>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="36px" height="36.0016px"
+	 viewBox="0 0 36 36.0016" enable-background="new 0 0 36 36.0016" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-91.947964" inkscape:cy="8.8255993" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<path opacity="0.49" fill="#C4C4C4" enable-background="new    " d="M31.26635,28.45262
+	c0.93884-1.19196,2.5792-1.87889,3.18775-3.35014c0.6026-1.45668,0.14837-3.59276,0.31776-5.08902
+	c0.04287-0.14134,0.07395-0.28706,0.08797-0.43569c0.10079-1.0664,0.09812-2.13086-0.00212-3.17977
+	c-0.01245-0.13042-0.04262-0.25719-0.07741-0.38226c0.00037,0.00146,0.0014,0.00267,0.00176,0.00389
+	c-0.17899-1.50646,0.38048-3.4437-0.22946-4.91423c-0.60302-1.45401-2.31693-2.35022-3.2545-3.52615
+	c-0.06909-0.1292-0.1493-0.2533-0.24353-0.36769c-0.67072-0.8131-1.42128-1.56767-2.24664-2.25107
+	c-0.11427-0.09447-0.23855-0.1751-0.36799-0.24456c-1.17994-0.9338-1.64092-2.46532-3.09736-3.06786
+	c-1.44557-0.59792-3.78361-0.23893-5.27065-0.40505c-0.15015-0.0476-0.30576-0.08014-0.46429-0.0952
+	c-1.06664-0.10079-2.13098-0.09812-3.18008,0.00219c-0.13618,0.01287-0.26897,0.04347-0.39926,0.08087
+	c-1.50288,0.17753-3.3998-0.39479-4.86571,0.21309c-1.45595,0.60399-2.38756,2.335-3.5652,3.27342
+	c-0.12477,0.06776-0.24529,0.1445-0.35585,0.23582c-0.8131,0.67054-1.56791,1.42122-2.2512,2.24646
+	c-0.09289,0.1122-0.17152,0.2346-0.24019,0.36162c-0.9409,1.1871-2.73669,2.27351-3.3436,3.74063
+	c-0.60849,1.47101,0.01993,3.22704-0.15754,4.73399c-0.03315,0.12192-0.05938,0.23728-0.0714,0.36405
+	c-0.10079,1.06664-0.09812,2.13086,0.00213,3.18002c0.01263,0.13236,0.04098,0.25573,0.07668,0.38275
+	c0.1779,1.51375-0.36958,3.46796,0.24328,4.94577c0.60994,1.47052,2.33699,2.36579,3.27693,3.55678
+	c0.06521,0.11706,0.12022,0.19672,0.20631,0.3009c0.67072,0.8131,1.42122,1.56791,2.24658,2.25108
+	c0.10868,0.0901,0.20534,0.15495,0.32786,0.22222c1.19621,0.94448,1.86602,2.57203,3.34419,3.18356
+	c1.47113,0.60861,3.6505,0.16209,5.15727,0.33962c0.13029,0.03716,0.23503,0.05465,0.37109,0.06752
+	c1.06652,0.10078,2.13086,0.09811,3.1799-0.00219c0.13546-0.01287,0.24608-0.03595,0.37577-0.07286
+	c1.51381-0.17802,3.40228,0.39571,4.8799-0.21727c1.47052-0.60983,2.43178-2.36312,3.62277-3.303
+	c0.11839-0.06557,0.20243-0.12313,0.30783-0.21008c0.81304-0.67078,1.56779-1.42122,2.25101-2.2467
+	C31.13447,28.67265,31.20035,28.57113,31.26635,28.45262z M8.23466,4.50073c-0.00018,0-0.00036,0-0.00061,0
+	C8.23424,4.50073,8.23448,4.50073,8.23466,4.50073z"/>
+<path opacity="0.32" fill="#9C9C9C" enable-background="new    " d="M35.90357,16.15523
+	c-0.07361-0.70705-0.49979-1.29864-1.06952-1.72377c-0.61895-0.46186-1.30921-1.50206-1.85906-2.79493
+	c-0.55021-1.29408-0.82048-2.5138-0.72318-3.27993c0.08954-0.70504-0.04032-1.42231-0.49814-1.9659
+	c-0.71619-0.85038-1.51525-1.63894-2.39182-2.35207c-0.55256-0.44953-1.27422-0.56869-1.97903-0.46552
+	c-0.76414,0.11186-1.98919-0.13576-3.29369-0.66165c-1.30531-0.52654-2.35981-1.19865-2.83229-1.80971
+	c-0.43578-0.56359-1.03802-0.97887-1.74792-1.03872c-1.12585-0.09492-2.24826-0.08171-3.35386,0.03338
+	c-0.7071,0.07361-1.29866,0.49991-1.72382,1.06969c-0.46185,0.61894-1.50183,1.30921-2.79484,1.85879
+	C10.34243,3.57512,9.12277,3.8454,8.35668,3.74825C7.65162,3.65884,6.93432,3.78858,6.39073,4.24642
+	c-0.85038,0.71624-1.639,1.51525-2.35212,2.39175c-0.44951,0.5525-0.56872,1.27411-0.46555,1.97886
+	c0.11186,0.76415-0.13561,1.9892-0.66171,3.29384c-0.52652,1.30541-1.19883,2.3602-1.80989,2.83256
+	c-0.56343,0.43554-0.97863,1.03749-1.03844,1.74712c-0.09491,1.12597-0.0817,2.24858,0.03345,3.35436
+	c0.07363,0.70707,0.49988,1.29863,1.06962,1.7238c0.61889,0.46184,1.30912,1.50186,1.85894,2.79489
+	c0.5502,1.29385,0.82051,2.5137,0.72324,3.27988c-0.08951,0.70504,0.0403,1.42231,0.49813,1.96589
+	c0.71613,0.85026,1.51513,1.63887,2.39162,2.35188c0.5526,0.44954,1.2743,0.56875,1.97914,0.46561
+	c0.76419-0.11182,1.98924,0.13566,3.29371,0.6618c1.3056,0.52645,2.36037,1.19888,2.83273,1.80995
+	c0.43551,0.56341,1.03745,0.97859,1.74704,1.03843c1.12602,0.09496,2.24863,0.08175,3.35437-0.03349
+	c0.70696-0.07368,1.29852-0.49973,1.72354-1.06945c0.46177-0.61897,1.50192-1.30924,2.79504-1.85913
+	c1.2939-0.55021,2.5135-0.82048,3.27964-0.72324c0.70521,0.08952,1.42269-0.04021,1.96637-0.4982
+	c0.85029-0.71627,1.63881-1.51539,2.35187-2.39191c0.44946-0.55249,0.56865-1.27406,0.46548-1.97877
+	c-0.11187-0.76414,0.1356-1.98916,0.66171-3.2936c0.52645-1.30538,1.19873-2.36014,1.8098-2.83266
+	c0.56349-0.43573,0.97872-1.03787,1.03854-1.74766C36.03189,18.38322,36.01868,17.26087,35.90357,16.15523z M35.14483,19.45553
+	c-0.03778,0.4441-0.26189,0.84652-0.59933,1.07659c-0.76952,0.52408-1.56887,1.71213-2.19307,3.25983
+	c-0.62362,1.54641-0.87236,2.95595-0.68247,3.86751c0.08327,0.39955-0.03467,0.84465-0.31572,1.19049
+	c-0.67815,0.83517-1.44105,1.61091-2.26751,2.30584c-0.26963,0.22685-0.59977,0.35347-0.92951,0.35656
+	c-0.08353,0.00078-0.16682-0.00671-0.2476-0.02198c-0.1923-0.03671-0.40678-0.05408-0.63754-0.05193
+	c-0.87313,0.00817-2.01639,0.29437-3.21898,0.80596c-1.5346,0.65219-2.70716,1.47313-3.21707,2.25219
+	c-0.22193,0.33908-0.61765,0.56918-1.05824,0.61569c-0.53955,0.05674-1.08767,0.08797-1.62899,0.09303
+	c-0.53344,0.00499-1.07326-0.01528-1.60433-0.06045c-0.44403-0.03797-0.84652-0.26189-1.07653-0.59959
+	c-0.52428-0.76965-1.71252-1.569-3.26015-2.19313c-1.21234-0.489-2.36075-0.75375-3.23362-0.74558
+	c-0.22967,0.00215-0.44288,0.02353-0.63362,0.0633c-0.08048,0.01678-0.16368,0.02557-0.24741,0.02635
+	c-0.33272,0.00311-0.66769-0.11832-0.94328-0.34214c-0.8353-0.67835-1.61104-1.44124-2.30585-2.2677
+	C4.55894,28.7474,4.434,28.30741,4.50968,27.90948c0.17409-0.9147-0.1008-2.32038-0.75404-3.85691
+	C3.103,22.51811,2.282,21.34549,1.5032,20.83563c-0.33915-0.22193-0.56925-0.61752-0.61549-1.05799
+	c-0.11271-1.07355-0.12367-2.16148-0.03246-3.23358c0.03778-0.4441,0.26183-0.84652,0.59927-1.07633
+	c0.76958-0.52408,1.56894-1.71239,2.19313-3.26009c0.62362-1.54641,0.87236-2.95595,0.68247-3.86725
+	c-0.08327-0.39955,0.0348-0.84465,0.31572-1.19075c0.67899-0.83595,1.44195-1.6117,2.26777-2.30559
+	C7.18324,4.61721,7.51324,4.49058,7.84279,4.4875c0.08366-0.00078,0.16695,0.00671,0.24773,0.02198
+	C8.28263,4.54619,8.49704,4.56356,8.72768,4.5614c0.87288-0.00817,2.01613-0.29436,3.21936-0.80597
+	c1.53479-0.65271,2.70734-1.47364,3.21701-2.25219c0.22206-0.33934,0.61758-0.56944,1.05818-0.61569
+	c0.53961-0.05674,1.08773-0.08797,1.62912-0.09304c0.53357-0.00499,1.07339,0.01528,1.60439,0.06045
+	c0.44416,0.03797,0.84659,0.26189,1.07653,0.59959c0.52408,0.76939,1.71232,1.56874,3.25989,2.19287
+	c1.2124,0.489,2.36088,0.75401,3.23388,0.74584c0.22967-0.00215,0.44281-0.02353,0.63356-0.0633
+	c0.08048-0.01678,0.16368-0.02557,0.2474-0.02635c0.33272-0.00311,0.66776,0.11832,0.94315,0.34188
+	c0.8353,0.6786,1.61118,1.4415,2.30585,2.2677c0.28513,0.33899,0.41014,0.77924,0.33445,1.17717
+	c-0.17403,0.9147,0.1008,2.32038,0.75397,3.85665c0.65245,1.53447,1.47345,2.70709,2.25245,3.21694
+	c0.33915,0.22193,0.56924,0.61752,0.61549,1.05824C35.22515,17.29576,35.23604,18.38344,35.14483,19.45553z"/>
+<path opacity="0.46" fill="#FFFFFF" enable-background="new    " d="M34.06219,15.82835
+	c-0.92052-0.6026-1.8255-1.87058-2.54837-3.57056c-0.72367-1.70204-1.00892-3.23478-0.8033-4.3157
+	c0.0311-0.16363-0.03098-0.36205-0.16211-0.51795c-0.6622-0.78748-1.40201-1.51505-2.19884-2.16248
+	c-0.1321-0.10705-0.28667-0.16556-0.43514-0.16417c-0.03146,0.00029-0.0627,0.00343-0.09288,0.00966
+	c-0.24182,0.05033-0.50698,0.07737-0.78808,0.08c-0.97456,0.00912-2.23113-0.27633-3.53828-0.80347
+	c-1.71445-0.69131-2.99972-1.57298-3.61906-2.48206c-0.09538-0.14022-0.28238-0.23797-0.48807-0.25568
+	c-0.50527-0.04283-1.01994-0.0623-1.52929-0.05754c-0.51697,0.00484-1.03964,0.0348-1.55357,0.08871
+	c-0.20287,0.02128-0.38549,0.1212-0.47684,0.26084c-0.60235,0.92026-1.87045,1.82504-3.57063,2.54805
+	c-1.29693,0.5515-2.54794,0.86016-3.52263,0.86928C8.45162,5.35792,8.18457,5.33561,7.94153,5.2893
+	c-0.02874-0.00542-0.05997-0.00823-0.0913-0.00793c-0.14562,0.00136-0.2967,0.0617-0.42555,0.17016
+	C6.63706,6.11327,5.90956,6.85302,5.26206,7.65017C5.13214,7.81032,5.07279,8.01272,5.10729,8.17832
+	c0.22439,1.07689-0.03253,2.61315-0.72341,4.32637c-0.69151,1.71451-1.57317,2.99998-2.48252,3.61919
+	c-0.13989,0.09538-0.23765,0.28212-0.25511,0.48748c-0.08696,1.02217-0.07655,2.05946,0.03099,3.08344
+	c0.02128,0.20268,0.12113,0.38524,0.26064,0.47645c0.92026,0.6026,1.82524,1.87058,2.54831,3.57056
+	c0.7238,1.70256,1.00906,3.23529,0.80337,4.31621c-0.0311,0.16337,0.03104,0.36153,0.16204,0.51744
+	c0.66259,0.78799,1.40227,1.51556,2.19871,2.16248c0.13236,0.10731,0.287,0.16582,0.4354,0.16443
+	c0.0314-0.00029,0.06258-0.00343,0.09276-0.00965c0.24195-0.05033,0.50711-0.07737,0.78827-0.08
+	c0.97482-0.00912,2.23132,0.27607,3.53802,0.80321c1.71445,0.69131,2.99979,1.57298,3.61932,2.48232
+	c0.09532,0.14022,0.28238,0.23796,0.488,0.25568c0.50533,0.04282,1.02001,0.0623,1.52929,0.05754
+	c0.5169-0.00484,1.03958-0.0348,1.55337-0.08871c0.2028-0.02154,0.38569-0.12146,0.47697-0.26084
+	c0.6026-0.92078,1.87071-1.82556,3.57082-2.54805c1.29603-0.55149,2.54691-0.86015,3.52212-0.86928
+	c0.28349-0.00265,0.55054,0.01966,0.79378,0.06597c0.02887,0.00542,0.0601,0.00822,0.09137,0.00793
+	c0.14575-0.00136,0.29702-0.0617,0.42581-0.17016c0.78838-0.66304,1.51582-1.40279,2.16229-2.1989
+	c0.13011-0.1599,0.18941-0.3623,0.15484-0.52789c-0.22433-1.07715,0.0326-2.61341,0.7234-4.32662
+	c0.69144-1.71425,1.57304-2.99972,2.48245-3.61893c0.13983-0.09538,0.23771-0.28238,0.25517-0.48774
+	c0.08696-1.02217,0.07655-2.05946-0.03098-3.08318C34.30149,16.10213,34.20164,15.91957,34.06219,15.82835z"/>
+<g opacity="0.6" enable-background="new    ">
+	<path fill="#FFFFFF" d="M17.85875,1.58839c0.50938-0.00477,1.02404,0.01471,1.52934,0.05754
+		c0.20568,0.01772,0.39264,0.11547,0.48802,0.25568c0.61935,0.90909,1.90463,1.79075,3.61907,2.48207
+		c1.30716,0.52714,2.56374,0.81259,3.53827,0.80347c0.28111-0.00263,0.5463-0.02966,0.78808-0.08
+		c0.03021-0.00623,0.06145-0.00936,0.09288-0.00966c0.14846-0.00139,0.30307,0.05712,0.43514,0.16417
+		c0.79686,0.64743,1.53664,1.375,2.19888,2.16248c0.13108,0.15591,0.19319,0.35433,0.16209,0.51795
+		c-0.20565,1.08092,0.07962,2.61365,0.80329,4.3157c0.72289,1.69998,1.62788,2.96796,2.54836,3.57056
+		c0.13948,0.09122,0.23933,0.27378,0.26062,0.47671c0.10753,1.02372,0.11795,2.061,0.03097,3.08318
+		c-0.01748,0.20537-0.11537,0.39236-0.25518,0.48774c-0.9094,0.61921-1.79101,1.90468-2.48246,3.61893
+		c-0.69081,1.71321-0.94771,3.24947-0.72339,4.32662c0.03453,0.1656-0.02471,0.36799-0.15483,0.52789
+		c-0.64647,0.79611-1.37391,1.53585-2.1623,2.1989c-0.12882,0.10846-0.28006,0.1688-0.42584,0.17016
+		c-0.03127,0.00029-0.06247-0.00252-0.09134-0.00793c-0.24322-0.04631-0.51029-0.06862-0.79381-0.06597
+		c-0.97516,0.00913-2.22609,0.31778-3.52207,0.86928c-1.70012,0.72249-2.96826,1.62727-3.57084,2.54805
+		c-0.0913,0.13938-0.27418,0.2393-0.47697,0.26084c-0.51383,0.05391-1.03647,0.08387-1.55341,0.08871
+		c-0.50928,0.00476-1.02392-0.01471-1.52924-0.05754c-0.20568-0.01772-0.39268-0.11547-0.48805-0.25568
+		c-0.61948-0.90935-1.90487-1.79101-3.61932-2.48232c-1.30669-0.52714-2.56319-0.81233-3.53802-0.80321
+		c-0.28113,0.00263-0.54633,0.02966-0.78824,0.08c-0.03018,0.00623-0.06139,0.00936-0.09279,0.00965
+		c-0.1484,0.00139-0.30301-0.05712-0.43538-0.16443c-0.7964-0.64692-1.53613-1.37449-2.19871-2.16248
+		c-0.13102-0.15591-0.19311-0.35407-0.16204-0.51744c0.20572-1.08092-0.07959-2.61365-0.80337-4.31621
+		c-0.72307-1.69998-1.62804-2.96796-2.54829-3.57056c-0.13951-0.09122-0.23938-0.27378-0.26066-0.47645
+		c-0.1075-1.02397-0.11792-2.06126-0.03097-3.08344c0.01746-0.20537,0.11523-0.3921,0.25511-0.48748
+		c0.90933-0.61921,1.79098-1.90468,2.48253-3.61919c0.69082-1.71321,0.94775-3.24947,0.72339-4.32636
+		c-0.03453-0.1656,0.02482-0.36799,0.15476-0.52815c0.64751-0.79715,1.375-1.5369,2.16263-2.19864
+		C7.5535,5.34306,7.70463,5.28273,7.8502,5.28136C7.88153,5.28107,7.91277,5.28388,7.94152,5.2893
+		C8.1846,5.33561,8.4516,5.35792,8.73508,5.35527c0.97472-0.00912,2.22573-0.31778,3.52263-0.86928
+		c1.70023-0.72301,2.96828-1.62779,3.57063-2.54805c0.09134-0.13964,0.27402-0.23956,0.47687-0.26084
+		C16.81911,1.62319,17.34179,1.59323,17.85875,1.58839 M17.85133,0.79453c-0.54139,0.00507-1.08951,0.0363-1.62912,0.09304
+		c-0.4406,0.04625-0.83612,0.27635-1.05818,0.61569c-0.50966,0.77854-1.68222,1.59947-3.21701,2.25219
+		c-1.20323,0.5116-2.34649,0.7978-3.21936,0.80597C8.49702,4.56356,8.28261,4.54619,8.0905,4.50948
+		C8.00972,4.49421,7.92643,4.48672,7.84277,4.4875C7.51322,4.49058,7.18321,4.61721,6.91358,4.84406
+		C6.08777,5.53795,5.3248,6.31369,4.64582,7.14964C4.3649,7.49574,4.24682,7.94085,4.3301,8.3404
+		c0.18989,0.9113-0.05885,2.32084-0.68247,3.86725c-0.62419,1.5477-1.42355,2.736-2.19313,3.26009
+		c-0.33744,0.22981-0.56149,0.63223-0.59927,1.07633c-0.09121,1.07209-0.08026,2.16003,0.03246,3.23358
+		c0.04625,0.44047,0.27634,0.83606,0.61549,1.05799c0.7788,0.50985,1.5998,1.68247,2.25244,3.21694
+		c0.65325,1.53653,0.92814,2.9422,0.75404,3.85691c-0.07568,0.39793,0.04926,0.83792,0.33432,1.17692
+		c0.6948,0.82646,1.47055,1.58935,2.30585,2.2677c0.27559,0.22382,0.61057,0.34525,0.94328,0.34214
+		c0.08373-0.00078,0.16693-0.00957,0.24741-0.02635c0.19075-0.03978,0.40395-0.06115,0.63362-0.0633
+		c0.87288-0.00817,2.02128,0.25658,3.23362,0.74558c1.54764,0.62413,2.73588,1.42348,3.26015,2.19313
+		c0.23001,0.3377,0.63249,0.56162,1.07653,0.59959c0.53107,0.04517,1.07088,0.06544,1.60433,0.06045
+		c0.54132-0.00507,1.08945-0.0363,1.62899-0.09303c0.4406-0.04651,0.83631-0.27661,1.05824-0.61569
+		c0.50992-0.77906,1.68247-1.59999,3.21707-2.25219c1.20259-0.51159,2.34584-0.79779,3.21898-0.80596
+		c0.23077-0.00216,0.44524,0.01521,0.63754,0.05192c0.08078,0.01527,0.16406,0.02276,0.2476,0.02198
+		c0.32974-0.00308,0.65988-0.12971,0.92951-0.35656c0.82645-0.69493,1.58935-1.47067,2.26751-2.30584
+		c0.28105-0.34584,0.399-0.79095,0.31572-1.19049c-0.18989-0.91156,0.05885-2.3211,0.68247-3.86751
+		c0.62419-1.5477,1.42355-2.73575,2.19307-3.25983c0.33744-0.23007,0.56155-0.63249,0.59933-1.07659
+		c0.09121-1.07209,0.08032-2.15977-0.03245-3.23332c-0.04625-0.44073-0.27635-0.83632-0.6155-1.05824
+		c-0.779-0.50985-1.59999-1.68247-2.25245-3.21694c-0.65318-1.53627-0.928-2.94195-0.75397-3.85665
+		c0.07568-0.39793-0.04932-0.83818-0.33446-1.17717c-0.69467-0.8262-1.47054-1.5891-2.30585-2.2677
+		c-0.27539-0.22356-0.61044-0.34499-0.94315-0.34188c-0.08373,0.00078-0.16693,0.00957-0.24741,0.02635
+		c-0.19075,0.03978-0.40389,0.06115-0.63356,0.0633c-0.873,0.00817-2.02148-0.25684-3.23388-0.74584
+		c-1.54757-0.62413-2.73581-1.42348-3.25989-2.19287c-0.22994-0.3377-0.63236-0.56162-1.07653-0.59959
+		C18.92471,0.80981,18.3849,0.78953,17.85133,0.79453L17.85133,0.79453z"/>
+</g>
+<path fill="#383838" d="M17.98332,2.51392h-0.12289c-0.38496,0-0.69703,0.31207-0.69703,0.69703v14.41034
+	c0,0.38496,0.31207,0.69703,0.69703,0.69703l0.12289,0c0.38496,0,0.69702-0.31207,0.69702-0.69703V3.21095
+	C18.68035,2.82599,18.36828,2.51392,17.98332,2.51392z"/>
+</svg>
diff --git a/res/ComponentLibrary/Davies1900hWhite_bg.svg b/res/ComponentLibrary/Davies1900hWhite_bg.svg
new file mode 100644
index 00000000..1d716bca
--- /dev/null
+++ b/res/ComponentLibrary/Davies1900hWhite_bg.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0"
+	 id="svg16908" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="36px" height="36.0016px"
+	 viewBox="0 0 36 36.0016" enable-background="new 0 0 36 36.0016" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer1" inkscape:cx="-91.947964" inkscape:cy="8.8255993" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1422" inkscape:window-maximized="0" inkscape:window-width="2560" inkscape:window-x="0" inkscape:window-y="18" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="18.00007" y1="9.094947e-12" x2="18.00007" y2="36">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<circle fill="url(#SVGID_1_)" cx="18.00007" cy="18" r="18"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="112.00964" y1="213.36432" x2="112.00964" y2="233.88402" gradientTransform="matrix(-1 0 0 0.50871 129.93398 -104.22826)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse fill="url(#SVGID_2_)" cx="17.92434" cy="9.53234" rx="8.37098" ry="5.21932"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="112.00964" y1="213.36432" x2="112.00964" y2="233.88402" gradientTransform="matrix(-1 0 0 0.50871 129.93398 -104.22826)">
+	<stop  offset="0" style="stop-color:#FDFDFF"/>
+	<stop  offset="1" style="stop-color:#FCFEFF;stop-opacity:0"/>
+</linearGradient>
+<ellipse fill="url(#SVGID_3_)" cx="17.92434" cy="9.53234" rx="8.37098" ry="5.21932"/>
+</svg>
diff --git a/res/ComponentLibrary/Rogan1PBlue-fg.svg b/res/ComponentLibrary/Rogan1PBlue_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PBlue-fg.svg
rename to res/ComponentLibrary/Rogan1PBlue_fg.svg
diff --git a/res/ComponentLibrary/Rogan1PGreen-fg.svg b/res/ComponentLibrary/Rogan1PGreen_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PGreen-fg.svg
rename to res/ComponentLibrary/Rogan1PGreen_fg.svg
diff --git a/res/ComponentLibrary/Rogan1PRed-fg.svg b/res/ComponentLibrary/Rogan1PRed_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PRed-fg.svg
rename to res/ComponentLibrary/Rogan1PRed_fg.svg
diff --git a/res/ComponentLibrary/Rogan1PSBlue-fg.svg b/res/ComponentLibrary/Rogan1PSBlue_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PSBlue-fg.svg
rename to res/ComponentLibrary/Rogan1PSBlue_fg.svg
diff --git a/res/ComponentLibrary/Rogan1PSGreen-fg.svg b/res/ComponentLibrary/Rogan1PSGreen_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PSGreen-fg.svg
rename to res/ComponentLibrary/Rogan1PSGreen_fg.svg
diff --git a/res/ComponentLibrary/Rogan1PSRed-fg.svg b/res/ComponentLibrary/Rogan1PSRed_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PSRed-fg.svg
rename to res/ComponentLibrary/Rogan1PSRed_fg.svg
diff --git a/res/ComponentLibrary/Rogan1PSWhite-fg.svg b/res/ComponentLibrary/Rogan1PSWhite_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PSWhite-fg.svg
rename to res/ComponentLibrary/Rogan1PSWhite_fg.svg
diff --git a/res/ComponentLibrary/Rogan1PS-bg.svg b/res/ComponentLibrary/Rogan1PS_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PS-bg.svg
rename to res/ComponentLibrary/Rogan1PS_bg.svg
diff --git a/res/ComponentLibrary/Rogan1PWhite-fg.svg b/res/ComponentLibrary/Rogan1PWhite_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1PWhite-fg.svg
rename to res/ComponentLibrary/Rogan1PWhite_fg.svg
diff --git a/res/ComponentLibrary/Rogan1P-bg.svg b/res/ComponentLibrary/Rogan1P_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan1P-bg.svg
rename to res/ComponentLibrary/Rogan1P_bg.svg
diff --git a/res/ComponentLibrary/Rogan2PBlue-fg.svg b/res/ComponentLibrary/Rogan2PBlue_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PBlue-fg.svg
rename to res/ComponentLibrary/Rogan2PBlue_fg.svg
diff --git a/res/ComponentLibrary/Rogan2PGreen-fg.svg b/res/ComponentLibrary/Rogan2PGreen_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PGreen-fg.svg
rename to res/ComponentLibrary/Rogan2PGreen_fg.svg
diff --git a/res/ComponentLibrary/Rogan2PRed-fg.svg b/res/ComponentLibrary/Rogan2PRed_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PRed-fg.svg
rename to res/ComponentLibrary/Rogan2PRed_fg.svg
diff --git a/res/ComponentLibrary/Rogan2PSBlue-fg.svg b/res/ComponentLibrary/Rogan2PSBlue_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PSBlue-fg.svg
rename to res/ComponentLibrary/Rogan2PSBlue_fg.svg
diff --git a/res/ComponentLibrary/Rogan2PSGreen-fg.svg b/res/ComponentLibrary/Rogan2PSGreen_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PSGreen-fg.svg
rename to res/ComponentLibrary/Rogan2PSGreen_fg.svg
diff --git a/res/ComponentLibrary/Rogan2PSRed-fg.svg b/res/ComponentLibrary/Rogan2PSRed_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PSRed-fg.svg
rename to res/ComponentLibrary/Rogan2PSRed_fg.svg
diff --git a/res/ComponentLibrary/Rogan2PSWhite-fg.svg b/res/ComponentLibrary/Rogan2PSWhite_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PSWhite-fg.svg
rename to res/ComponentLibrary/Rogan2PSWhite_fg.svg
diff --git a/res/ComponentLibrary/Rogan2PS-bg.svg b/res/ComponentLibrary/Rogan2PS_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PS-bg.svg
rename to res/ComponentLibrary/Rogan2PS_bg.svg
diff --git a/res/ComponentLibrary/Rogan2PWhite-fg.svg b/res/ComponentLibrary/Rogan2PWhite_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2PWhite-fg.svg
rename to res/ComponentLibrary/Rogan2PWhite_fg.svg
diff --git a/res/ComponentLibrary/Rogan2P-bg.svg b/res/ComponentLibrary/Rogan2P_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2P-bg.svg
rename to res/ComponentLibrary/Rogan2P_bg.svg
diff --git a/res/ComponentLibrary/Rogan2SGray-fg.svg b/res/ComponentLibrary/Rogan2SGray_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2SGray-fg.svg
rename to res/ComponentLibrary/Rogan2SGray_fg.svg
diff --git a/res/ComponentLibrary/Rogan2S-bg.svg b/res/ComponentLibrary/Rogan2S_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan2S-bg.svg
rename to res/ComponentLibrary/Rogan2S_bg.svg
diff --git a/res/ComponentLibrary/Rogan3PBlue-fg.svg b/res/ComponentLibrary/Rogan3PBlue_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PBlue-fg.svg
rename to res/ComponentLibrary/Rogan3PBlue_fg.svg
diff --git a/res/ComponentLibrary/Rogan3PGreen-fg.svg b/res/ComponentLibrary/Rogan3PGreen_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PGreen-fg.svg
rename to res/ComponentLibrary/Rogan3PGreen_fg.svg
diff --git a/res/ComponentLibrary/Rogan3PRed-fg.svg b/res/ComponentLibrary/Rogan3PRed_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PRed-fg.svg
rename to res/ComponentLibrary/Rogan3PRed_fg.svg
diff --git a/res/ComponentLibrary/Rogan3PSBlue-fg.svg b/res/ComponentLibrary/Rogan3PSBlue_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PSBlue-fg.svg
rename to res/ComponentLibrary/Rogan3PSBlue_fg.svg
diff --git a/res/ComponentLibrary/Rogan3PSGreen-fg.svg b/res/ComponentLibrary/Rogan3PSGreen_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PSGreen-fg.svg
rename to res/ComponentLibrary/Rogan3PSGreen_fg.svg
diff --git a/res/ComponentLibrary/Rogan3PSRed-fg.svg b/res/ComponentLibrary/Rogan3PSRed_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PSRed-fg.svg
rename to res/ComponentLibrary/Rogan3PSRed_fg.svg
diff --git a/res/ComponentLibrary/Rogan3PSWhite-fg.svg b/res/ComponentLibrary/Rogan3PSWhite_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PSWhite-fg.svg
rename to res/ComponentLibrary/Rogan3PSWhite_fg.svg
diff --git a/res/ComponentLibrary/Rogan3PS-bg.svg b/res/ComponentLibrary/Rogan3PS_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PS-bg.svg
rename to res/ComponentLibrary/Rogan3PS_bg.svg
diff --git a/res/ComponentLibrary/Rogan3PWhite-fg.svg b/res/ComponentLibrary/Rogan3PWhite_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3PWhite-fg.svg
rename to res/ComponentLibrary/Rogan3PWhite_fg.svg
diff --git a/res/ComponentLibrary/Rogan3P-bg.svg b/res/ComponentLibrary/Rogan3P_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan3P-bg.svg
rename to res/ComponentLibrary/Rogan3P_bg.svg
diff --git a/res/ComponentLibrary/Rogan5PSGray-fg.svg b/res/ComponentLibrary/Rogan5PSGray_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan5PSGray-fg.svg
rename to res/ComponentLibrary/Rogan5PSGray_fg.svg
diff --git a/res/ComponentLibrary/Rogan5PS-bg.svg b/res/ComponentLibrary/Rogan5PS_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan5PS-bg.svg
rename to res/ComponentLibrary/Rogan5PS_bg.svg
diff --git a/res/ComponentLibrary/Rogan6PSWhite-fg.svg b/res/ComponentLibrary/Rogan6PSWhite_fg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan6PSWhite-fg.svg
rename to res/ComponentLibrary/Rogan6PSWhite_fg.svg
diff --git a/res/ComponentLibrary/Rogan6PS-bg.svg b/res/ComponentLibrary/Rogan6PS_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Rogan6PS-bg.svg
rename to res/ComponentLibrary/Rogan6PS_bg.svg
diff --git a/res/ComponentLibrary/RoundBigBlackKnob-bg.svg b/res/ComponentLibrary/RoundBigBlackKnob_bg.svg
similarity index 100%
rename from res/ComponentLibrary/RoundBigBlackKnob-bg.svg
rename to res/ComponentLibrary/RoundBigBlackKnob_bg.svg
diff --git a/res/ComponentLibrary/RoundBlackKnob-bg.svg b/res/ComponentLibrary/RoundBlackKnob_bg.svg
similarity index 100%
rename from res/ComponentLibrary/RoundBlackKnob-bg.svg
rename to res/ComponentLibrary/RoundBlackKnob_bg.svg
diff --git a/res/ComponentLibrary/RoundHugeBlackKnob-bg.svg b/res/ComponentLibrary/RoundHugeBlackKnob_bg.svg
similarity index 100%
rename from res/ComponentLibrary/RoundHugeBlackKnob-bg.svg
rename to res/ComponentLibrary/RoundHugeBlackKnob_bg.svg
diff --git a/res/ComponentLibrary/RoundLargeBlackKnob-bg.svg b/res/ComponentLibrary/RoundLargeBlackKnob_bg.svg
similarity index 100%
rename from res/ComponentLibrary/RoundLargeBlackKnob-bg.svg
rename to res/ComponentLibrary/RoundLargeBlackKnob_bg.svg
diff --git a/res/ComponentLibrary/RoundSmallBlackKnob-bg.svg b/res/ComponentLibrary/RoundSmallBlackKnob_bg.svg
similarity index 100%
rename from res/ComponentLibrary/RoundSmallBlackKnob-bg.svg
rename to res/ComponentLibrary/RoundSmallBlackKnob_bg.svg
diff --git a/res/ComponentLibrary/SynthTechAlco-bg.svg b/res/ComponentLibrary/SynthTechAlco_bg.svg
similarity index 100%
rename from res/ComponentLibrary/SynthTechAlco-bg.svg
rename to res/ComponentLibrary/SynthTechAlco_bg.svg
diff --git a/res/ComponentLibrary/SynthTechAlco-fg.svg b/res/ComponentLibrary/SynthTechAlco_fg.svg
similarity index 100%
rename from res/ComponentLibrary/SynthTechAlco-fg.svg
rename to res/ComponentLibrary/SynthTechAlco_fg.svg
diff --git a/res/ComponentLibrary/Trimpot-bg.svg b/res/ComponentLibrary/Trimpot_bg.svg
similarity index 100%
rename from res/ComponentLibrary/Trimpot-bg.svg
rename to res/ComponentLibrary/Trimpot_bg.svg
diff --git a/res/ComponentLibrary/USB-B.svg b/res/ComponentLibrary/USB_B.svg
similarity index 100%
rename from res/ComponentLibrary/USB-B.svg
rename to res/ComponentLibrary/USB_B.svg