diff --git a/include/componentlibrary.hpp b/include/componentlibrary.hpp
index b8d2125b..264d3405 100644
--- a/include/componentlibrary.hpp
+++ b/include/componentlibrary.hpp
@@ -609,16 +609,21 @@ struct Rogan1PWhite : Rogan {
 
 
 struct SynthTechAlco : app::SvgKnob {
+	widget::SvgWidget* bg;
+	widget::SvgWidget* fg;
+
 	SynthTechAlco() {
+		bg = new widget::SvgWidget;
+		fb->addChildBelow(bg, tw);
+
+		fg = new widget::SvgWidget;
+		fb->addChildAbove(fg, tw);
+
 		minAngle = -0.82 * M_PI;
 		maxAngle = 0.82 * M_PI;
 		setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco.svg")));
-		// Add cap
-		widget::FramebufferWidget* capFb = new widget::FramebufferWidget;
-		widget::SvgWidget* cap = new widget::SvgWidget;
-		cap->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco_cap.svg")));
-		capFb->addChild(cap);
-		addChild(capFb);
+		bg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco-bg.svg")));
+		fg->setSvg(Svg::load(asset::system("res/ComponentLibrary/SynthTechAlco-fg.svg")));
 	}
 };
 
diff --git a/res/ComponentLibrary/CL1362.svg b/res/ComponentLibrary/CL1362.svg
index ac39ef0f..435cf3b0 100644
--- a/res/ComponentLibrary/CL1362.svg
+++ b/res/ComponentLibrary/CL1362.svg
@@ -1,443 +1,64 @@
-<?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="11.28851mm"
-   height="10.148451mm"
-   viewBox="0 0 11.28851 10.148451"
-   version="1.1"
-   id="svg15246"
-   sodipodi:docname="CL1362.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <defs
-     id="defs15240">
-    <clipPath
-       id="clip89">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="19"
-         id="rect4864" />
-    </clipPath>
-    <clipPath
-       id="clip90">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.898438,0.128906 h 16.25 v 17.882813 h -16.25 z m 0,0"
-         id="path4861" />
-    </clipPath>
-    <mask
-       id="mask44">
-      <g
-         style="filter:url(#alpha)"
-         id="g4858"
-         transform="matrix(0.26458333,0,0,0.26458333,89.358789,128.57765)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4856" />
-      </g>
-    </mask>
-    <filter
-       id="alpha"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix4149" />
-    </filter>
-    <clipPath
-       id="clipPath17821">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="19"
-         id="rect17819" />
-    </clipPath>
-    <clipPath
-       id="clipPath17825">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.898438,0.128906 h 16.25 v 17.882813 h -16.25 z m 0,0"
-         id="path17823" />
-    </clipPath>
-    <clipPath
-       id="clip87">
-      <rect
-         y="0"
-         x="0"
-         width="24"
-         height="26"
-         id="rect4848" />
-    </clipPath>
-    <clipPath
-       id="clip88">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.683594,0.921875 h 22.679687 v 24.9375 H 0.683594 Z m 0,0"
-         id="path4845" />
-    </clipPath>
-    <mask
-       id="mask43">
-      <g
-         style="filter:url(#alpha)"
-         id="g4842"
-         transform="matrix(0.26458333,0,0,0.26458333,89.358789,128.57765)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4840" />
-      </g>
-    </mask>
-    <filter
-       id="filter17836"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix17834" />
-    </filter>
-    <clipPath
-       id="clipPath17840">
-      <rect
-         y="0"
-         x="0"
-         width="24"
-         height="26"
-         id="rect17838" />
-    </clipPath>
-    <clipPath
-       id="clipPath17844">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.683594,0.921875 h 22.679687 v 24.9375 H 0.683594 Z m 0,0"
-         id="path17842" />
-    </clipPath>
-    <clipPath
-       id="clip95">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect4912" />
-    </clipPath>
-    <clipPath
-       id="clip96">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.140625,0.140625 H 17.199219 V 17.199219 H 0.140625 Z m 0,0"
-         id="path4909" />
-    </clipPath>
-    <mask
-       id="mask47">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4906"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.33000201;stroke:none"
-           id="rect4904" />
-      </g>
-    </mask>
-    <filter
-       id="alpha-3"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix4149-6" />
-    </filter>
-    <clipPath
-       id="clipPath18541">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect18539" />
-    </clipPath>
-    <clipPath
-       id="clipPath18545">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.140625,0.140625 H 17.199219 V 17.199219 H 0.140625 Z m 0,0"
-         id="path18543" />
-    </clipPath>
-    <clipPath
-       id="clip93">
-      <rect
-         y="0"
-         x="0"
-         width="22"
-         height="24"
-         id="rect4896" />
-    </clipPath>
-    <clipPath
-       id="clip94">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.0390625,0.0390625 H 21.300781 V 23.421875 H 0.0390625 Z m 0,0"
-         id="path4893" />
-    </clipPath>
-    <mask
-       id="mask46">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4890"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4888" />
-      </g>
-    </mask>
-    <filter
-       id="filter18556"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix18554" />
-    </filter>
-    <clipPath
-       id="clipPath18560">
-      <rect
-         y="0"
-         x="0"
-         width="22"
-         height="24"
-         id="rect18558" />
-    </clipPath>
-    <clipPath
-       id="clipPath18564">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.0390625,0.0390625 H 21.300781 V 23.421875 H 0.0390625 Z m 0,0"
-         id="path18562" />
-    </clipPath>
-    <clipPath
-       id="clip91">
-      <rect
-         y="0"
-         x="0"
-         width="29"
-         height="32"
-         id="rect4880" />
-    </clipPath>
-    <clipPath
-       id="clip92">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.507812,0.5 H 28.855469 V 31.679688 H 0.507812 Z m 0,0"
-         id="path4877" />
-    </clipPath>
-    <mask
-       id="mask45">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4874"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4872" />
-      </g>
-    </mask>
-    <filter
-       id="filter18575"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix18573" />
-    </filter>
-    <clipPath
-       id="clipPath18579">
-      <rect
-         y="0"
-         x="0"
-         width="29"
-         height="32"
-         id="rect18577" />
-    </clipPath>
-    <clipPath
-       id="clipPath18583">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.507812,0.5 H 28.855469 V 31.679688 H 0.507812 Z m 0,0"
-         id="path18581" />
-    </clipPath>
-    <clipPath
-       id="clip202">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect5795" />
-    </clipPath>
-    <clipPath
-       id="clip203">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.855469,0.140625 H 17.914062 V 17.199219 H 0.855469 Z m 0,0"
-         id="path5792" />
-    </clipPath>
-    <mask
-       id="mask104">
-      <g
-         style="filter:url(#alpha-7)"
-         id="g5789"
-         transform="matrix(0.26458333,0,0,0.26458333,74.416306,97.613551)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.33000201;stroke:none"
-           id="rect5787" />
-      </g>
-    </mask>
-    <filter
-       id="alpha-7"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix4149-5" />
-    </filter>
-    <clipPath
-       id="clipPath18765">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect18763" />
-    </clipPath>
-    <clipPath
-       id="clipPath18769">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.855469,0.140625 H 17.914062 V 17.199219 H 0.855469 Z m 0,0"
-         id="path18767" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="0.6268417"
-     inkscape:cy="0.0028090321"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1274"
-     inkscape:window-height="1434"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     units="px"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata15243">
-    <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(-60.318055,-89.106416)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path9179"
-       d="m 63.444634,99.129867 c -0.157096,0 -0.341754,-0.10887 -0.418924,-0.24529 l -2.520431,-4.4607 c -0.07717,-0.13641 -0.07717,-0.35002 0,-0.48782 l 2.520431,-4.46073 c 0.07717,-0.13642 0.261828,-0.243911 0.418924,-0.243911 h 5.035352 c 0.157096,0 0.341754,0.107491 0.418924,0.243911 l 2.520431,4.46073 c 0.07717,0.1378 0.07717,0.35141 0,0.48782 l -2.520431,4.4607 c -0.07717,0.13642 -0.261828,0.24529 -0.418924,0.24529 z m 0,0"
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#636663;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path9183"
-       d="m 62.088644,94.179967 c 0,-2.13871 1.734951,-3.873672 3.873666,-3.873672 2.138715,0 3.873666,1.734962 3.873666,3.873672 0,2.14009 -1.734951,3.87364 -3.873666,3.87364 -2.138715,0 -3.873666,-1.73355 -3.873666,-3.87364"
-       style="fill:#545454;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path9185"
-       d="m 63.962776,94.179967 c 0,-1.1038 0.894348,-1.99954 1.999534,-1.99954 1.103806,0 1.999534,0.89574 1.999534,1.99954 0,1.10519 -0.895728,2.00089 -1.999534,2.00089 -1.105186,0 -1.999534,-0.8957 -1.999534,-2.00089"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#272827;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 62.994254,94.17964 c 0,-1.638452 1.327547,-2.968065 2.968056,-2.968065 1.638461,0 2.968056,1.329613 2.968056,2.968065 0,1.640516 -1.329595,2.970069 -2.968056,2.970069 -1.640509,0 -2.968056,-1.329553 -2.968056,-2.970069"
-       id="path18865"
-       inkscape:connector-curvature="0" />
-  </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="svg15246" 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="31.99893px"
+	 height="28.76726px" viewBox="0 0 31.99893 28.76726" enable-background="new 0 0 31.99893 28.76726" 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="0.6268417" inkscape:cy="0.0028090321" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1434" inkscape:window-maximized="0" inkscape:window-width="1274" inkscape:window-x="1280" inkscape:window-y="0" inkscape:zoom="5.6" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="15.99946" y1="0.52233" x2="15.99946" y2="28.24493">
+	<stop  offset="0" style="stop-color:#828181"/>
+	<stop  offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M22.46387,0.52233H9.53506c-0.95198,0-1.83164,0.50787-2.30763,1.33231l-6.4644,11.19668
+	c-0.47599,0.82444-0.47599,1.84019,0,2.66463l6.4644,11.19668c0.47599,0.82444,1.35565,1.33231,2.30763,1.33231h12.92881
+	c0.95198,0,1.83164-0.50788,2.30763-1.33231l6.46441-11.19668c0.47599-0.82444,0.47599-1.84019,0-2.66463L24.7715,1.85464
+	C24.29551,1.0302,23.41585,0.52233,22.46387,0.52233z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15.99946" y1="1.11445" x2="15.99946" y2="27.65281">
+	<stop  offset="0.00559" style="stop-color:#F2F2F2"/>
+	<stop  offset="1" style="stop-color:#C7C7C7"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="23.66043,1.11445 8.3385,1.11445 0.67754,14.38363 8.3385,27.65281 23.66043,27.65281 
+	31.32139,14.38363 "/>
+<circle fill="#E0E0E0" cx="15.9996" cy="14.28116" r="12.36617"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-1239.25635" y1="-380.04678" x2="-1217.55823" y2="-380.04678" gradientTransform="matrix(0 -1 -1 0 -364.04718 -1214.1261)">
+	<stop  offset="0" style="stop-color:#B0AEAE"/>
+	<stop  offset="1" style="stop-color:#616161"/>
+</linearGradient>
+<circle fill="url(#SVGID_3_)" cx="15.9996" cy="14.28116" r="10.84904"/>
+<circle fill="#0D0D0D" cx="15.99962" cy="14.27289" r="10.33745"/>
+<circle cx="15.99962" cy="14.27289" r="4.7387"/>
+<path opacity="0.23" d="M15.99962,6.84344c5.36514,0,9.71445,4.14275,9.71445,9.2531s-4.34931,10.17309-9.71445,10.17309
+	s-9.71445-5.06274-9.71445-10.17309S10.63448,6.84344,15.99962,6.84344z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-1881.01306" y1="25.22116" x2="-1881.01306" y2="5.79226" gradientTransform="matrix(-1 0 0 -1 -1865.01343 29.77966)">
+	<stop  offset="0.00559" style="stop-color:#707070"/>
+	<stop  offset="1" style="stop-color:#171616"/>
+</linearGradient>
+<circle fill="url(#SVGID_4_)" cx="15.99962" cy="14.27295" r="9.71445"/>
+<circle fill="#333333" cx="15.99962" cy="14.27296" r="8.74175"/>
+<g opacity="0.5">
+	<path fill="#404040" d="M15.99964,5.12988c5.31283,0,9.62258,4.14508,9.70095,9.28517
+		c0.0007-0.04878,0.0073-0.09608,0.0073-0.14502c0-5.36355-4.34649-9.71152-9.70826-9.71152S6.2913,8.90647,6.2913,14.27003
+		c0,0.04893,0.0066,0.09624,0.0073,0.14502C6.37698,9.27496,10.6868,5.12988,15.99964,5.12988z"/>
+	<path opacity="0.28" fill="#404040" d="M6.2986,14.41504c-0.0007,0.04738-0.0073,0.09321-0.0073,0.14075
+		c0,5.20572,4.34657,9.42583,9.70833,9.42583C10.6868,23.98162,6.37698,19.71102,6.2986,14.41504z"/>
+	<path opacity="0.28" fill="#404040" d="M15.99964,23.98162c5.36177,0,9.70826-4.22011,9.70826-9.42583
+		c0-0.04754-0.0066-0.09336-0.0073-0.14075C25.62222,19.71102,21.31247,23.98162,15.99964,23.98162z"/>
+</g>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-1881.01306" y1="9.53299" x2="-1881.01306" y2="21.48041" gradientTransform="matrix(-1 0 0 -1 -1865.01343 29.77966)">
+	<stop  offset="0" style="stop-color:#595959"/>
+	<stop  offset="1" style="stop-color:#171616"/>
+</linearGradient>
+<circle fill="url(#SVGID_5_)" cx="15.99962" cy="14.27296" r="5.97371"/>
+<circle cx="15.99962" cy="14.26962" r="4.86733"/>
+<path fill="#FFFFFF" d="M23.66043,1.11445c0,0.449-3.42986,0.81298-7.66079,0.81298S8.33884,1.56345,8.33884,1.11445H23.66043z"/>
+<g opacity="0.15">
+	<path d="M23.66043,27.65281c0-0.449-3.42986-0.81298-7.66079-0.81298s-7.66079,0.36398-7.66079,0.81298H23.66043z"/>
+</g>
+<g opacity="0.1">
+	<path d="M31.38607,14.44154c-0.38884-0.2245-2.41899,2.56385-4.53446,6.22795s-3.51518,6.81643-3.12634,7.04093L31.38607,14.44154z
+		"/>
+</g>
+<path opacity="0.5" fill="#FFFFFF" d="M31.38607,14.38334c-0.38884,0.2245-2.41899-2.56385-4.53446-6.22795
+	s-3.51518-6.81643-3.12634-7.04093L31.38607,14.38334z"/>
+</svg>
diff --git a/res/ComponentLibrary/NKK_0.svg b/res/ComponentLibrary/NKK_0.svg
index 8cc3f8e9..5dc80ed0 100644
--- a/res/ComponentLibrary/NKK_0.svg
+++ b/res/ComponentLibrary/NKK_0.svg
@@ -1,92 +1,127 @@
-<?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="31.999855"
-   height="43.882507"
-   viewBox="0 0 8.4666281 11.61058"
-   version="1.1"
-   id="svg20198"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="NKK_0.svg">
-  <defs
-     id="defs20192" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="1.4417943"
-     inkscape:cy="15.231018"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g20169-3"
-     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="metadata20195">
-    <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(-80.57476,-112.94621)">
-    <g
-       transform="matrix(0.33514843,0,0,-0.33529537,-224.0132,506.00388)"
-       id="g20169"
-       style="stroke-width:1.05237091">
-      <g
-         transform="matrix(0.99501487,0,0,0.99507779,32.585756,3.8599038)"
-         id="g20169-3"
-         style="stroke-width:1.11299801">
-        <path
-           d="m 887.1943,1146.2402 -6.117,10.597 6.117,10.597 h 12.238 l 6.118,-10.597 -6.118,-10.597 z"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path6481-7"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 893.3271,1149.1729 c -4.227,0 -7.665,3.438 -7.665,7.664 0,4.227 3.438,7.666 7.665,7.666 4.227,0 7.666,-3.439 7.666,-7.666 0,-4.226 -3.439,-7.664 -7.666,-7.664"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path6489-5"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 898.8584,1156.8379 c 0,-3.063 -2.481,-5.545 -5.544,-5.545 -3.064,0 -5.545,2.482 -5.545,5.545 0,3.062 2.481,5.544 5.545,5.544 3.063,0 5.544,-2.482 5.544,-5.544"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.79320747;stroke-miterlimit:4;stroke-dasharray:none"
-           id="path6497-9"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path20173"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:evenodd;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 890.43168,1156.793 -2.289,-17.003 h 10.376 l -1.79,17.003 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="svg20198" 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="31.99986px"
+	 height="43.88251px" viewBox="0 0 31.99986 43.88251" enable-background="new 0 0 31.99986 43.88251" 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="g20169-3" inkscape:cx="1.4417943" inkscape:cy="15.231018" 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.919596" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="15.91134" y1="7.99768" x2="15.91134" y2="35.72028">
+	<stop  offset="0" style="stop-color:#828181"/>
+	<stop  offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M22.37574,7.99768H9.44694c-0.95198,0-1.83164,0.50787-2.30763,1.33231L0.6749,20.52667
+	c-0.47599,0.82444-0.47599,1.84019,0,2.66463l6.4644,11.19668c0.47599,0.82444,1.35565,1.33231,2.30763,1.33231h12.92881
+	c0.95198,0,1.83164-0.50788,2.30763-1.33231l6.4644-11.19668c0.47599-0.82444,0.47599-1.84019,0-2.66463l-6.4644-11.19668
+	C24.20739,8.50555,23.32772,7.99768,22.37574,7.99768z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15.91134" y1="8.5898" x2="15.91134" y2="35.12816">
+	<stop  offset="0.00559" style="stop-color:#F2F2F2"/>
+	<stop  offset="1" style="stop-color:#C7C7C7"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="23.57231,8.5898 8.25038,8.5898 0.58941,21.85898 8.25038,35.12816 23.57231,35.12816 
+	31.23327,21.85898 "/>
+<circle fill="#E0E0E0" cx="15.91148" cy="21.75651" r="12.36617"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-1238.73169" y1="-371.95865" x2="-1217.03357" y2="-371.95865" gradientTransform="matrix(0 -1 -1 0 -356.04718 -1206.1261)">
+	<stop  offset="0" style="stop-color:#B0AEAE"/>
+	<stop  offset="1" style="stop-color:#616161"/>
+</linearGradient>
+<circle fill="url(#SVGID_3_)" cx="15.91148" cy="21.75651" r="10.84904"/>
+<circle fill="#0D0D0D" cx="15.91149" cy="21.74824" r="10.33745"/>
+<circle cx="15.91149" cy="21.74824" r="4.7387"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-1880.92493" y1="33.74581" x2="-1880.92493" y2="14.31691" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0.00559" style="stop-color:#707070"/>
+	<stop  offset="1" style="stop-color:#171616"/>
+</linearGradient>
+<circle fill="url(#SVGID_4_)" cx="15.91149" cy="21.7483" r="9.71445"/>
+<path fill="#FFFFFF" d="M23.57231,8.5898c0,0.449-3.42986,0.81298-7.66079,0.81298S8.25072,9.0388,8.25072,8.5898H23.57231z"/>
+<g opacity="0.15">
+	<path d="M23.57231,35.12816c0-0.44899-3.42986-0.81298-7.66079-0.81298s-7.66079,0.36398-7.66079,0.81298H23.57231z"/>
+</g>
+<g opacity="0.1">
+	<path d="M31.29795,21.91689c-0.38884-0.2245-2.41899,2.56385-4.53446,6.22795s-3.51518,6.81643-3.12634,7.04093L31.29795,21.91689z
+		"/>
+</g>
+<g opacity="0.1">
+	<path d="M0.58941,21.91689c0.38884-0.2245,2.41899,2.56385,4.53446,6.22795s3.51518,6.81643,3.12634,7.04093L0.58941,21.91689z"/>
+</g>
+<path opacity="0.5" fill="#FFFFFF" d="M31.29795,21.85868c-0.38884,0.2245-2.41899-2.56385-4.53446-6.22795
+	S23.24832,8.8143,23.63716,8.5898L31.29795,21.85868z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M0.58941,21.85868c0.38884,0.2245,2.41899-2.56385,4.53446-6.22795
+	S8.63905,8.8143,8.25021,8.5898L0.58941,21.85868z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-1880.9209" y1="33.74581" x2="-1880.9209" y2="14.42281" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FFFEFE"/>
+	<stop  offset="1" style="stop-color:#545454"/>
+</linearGradient>
+<circle fill="url(#SVGID_5_)" cx="15.90746" cy="21.69536" r="9.6615"/>
+<circle fill="#E0E0E0" cx="15.90745" cy="21.69536" r="8.60911"/>
+<g opacity="0.43">
+	<path fill="#404040" d="M15.90746,12.60231c5.28544,0,9.57298,4.12371,9.65095,9.2373
+		c0.00069-0.04853,0.00726-0.09559,0.00726-0.14427c0-5.3359-4.32408-9.66145-9.65821-9.66145s-9.65829,4.32555-9.65829,9.66145
+		c0,0.04868,0.00657,0.09574,0.00726,0.14427C6.33441,16.72603,10.62202,12.60231,15.90746,12.60231z"/>
+	<path opacity="0.28" fill="#404040" d="M6.25644,21.83961c-0.0007,0.04714-0.00726,0.09273-0.00726,0.14002
+		c0,5.17888,4.32416,9.37724,9.65829,9.37724C10.62202,31.35687,6.33441,27.10829,6.25644,21.83961z"/>
+	<path opacity="0.28" fill="#404040" d="M15.90746,31.35687c5.33413,0,9.65821-4.19836,9.65821-9.37724
+		c0-0.04729-0.00657-0.09288-0.00726-0.14002C25.48044,27.10829,21.19291,31.35687,15.90746,31.35687z"/>
+</g>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-1880.9209" y1="17.10312" x2="-1880.9209" y2="31.06549" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FFFEFE"/>
+	<stop  offset="1" style="stop-color:#706C6C"/>
+</linearGradient>
+<circle fill="url(#SVGID_6_)" cx="15.90746" cy="21.69536" r="6.98118"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-1880.9209" y1="30.2466" x2="-1880.9209" y2="17.92201" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FAF9F9"/>
+	<stop  offset="1" style="stop-color:#545454"/>
+</linearGradient>
+<circle fill="url(#SVGID_7_)" cx="15.90746" cy="21.69536" r="6.16229"/>
+<g opacity="0.5">
+	<path fill="#404040" d="M15.90745,16.89562c3.37118,0,6.10586,1.6302,6.15559,4.89176
+		c0.00044-0.03095,0.00463-0.06097,0.00463-0.09202c0-3.40336-2.758-6.1623-6.16023-6.1623s-6.16028,2.75893-6.16028,6.1623
+		c0,0.03105,0.00419,0.06107,0.00463,0.09202C9.80154,18.52581,12.53627,16.89562,15.90745,16.89562z"/>
+	<path opacity="0.28" fill="#404040" d="M9.75181,21.78738c-0.00044,0.03007-0.00463,0.05914-0.00463,0.08931
+		c0,3.30321,2.75805,5.98102,6.16028,5.98102C12.53627,27.8577,9.80154,25.14786,9.75181,21.78738z"/>
+	<path opacity="0.28" fill="#404040" d="M15.90745,27.8577c3.40223,0,6.16023-2.67781,6.16023-5.98102
+		c0-0.03016-0.00419-0.05924-0.00463-0.08931C22.01331,25.14786,19.27863,27.8577,15.90745,27.8577z"/>
+</g>
+<path opacity="0.2" d="M20.02515,21.91829l3.65045,16.03359c0.23546,1.03419,0.09831,2.1183-0.38729,3.06127l0,0H8.8834h0
+	c-0.48559-0.94297-0.62274-2.02708-0.38728-3.06127l3.65045-16.03359H20.02515z"/>
+<g>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="16.08586" y1="20.44502" x2="16.08586" y2="41.40279">
+		<stop  offset="0" style="stop-color:#828181"/>
+		<stop  offset="1" style="stop-color:#575757"/>
+	</linearGradient>
+	<path fill="url(#SVGID_8_)" d="M18.72112,20.44502h-0.04098H13.4931c-0.64775,0-1.16326,0.43264-1.26826,1.02854l-0.09619,0.5458
+		L9.01963,38.27147c-0.08902,0.31904-0.13623,0.65764-0.13623,0.98855c0,0.7051,0.19542,1.38911,0.58085,2.03335l0.06551,0.10942
+		h0.12758h12.85699h0.12758l0.06551-0.10942c0.38546-0.64424,0.5809-1.32847,0.5809-2.03335
+		c0-0.33135-0.0473-0.67039-0.1406-1.00723l-3.12257-16.3345l-0.07836-0.44473
+		C19.84181,20.87766,19.32633,20.44502,18.72112,20.44502L18.72112,20.44502z"/>
+</g>
+<g>
+	<path fill="#E0E0E0" d="M18.68014,20.66997h-5.18703c-0.50911,0-0.9465,0.36228-1.04236,0.86337L9.17942,38.63386h13.81288
+		l-3.26978-17.10043C19.62669,21.03231,19.18928,20.66997,18.68014,20.66997z"/>
+	<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="16.08586" y1="20.66997" x2="16.08586" y2="37.3425">
+		<stop  offset="0.00559" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#C7C7C7"/>
+	</linearGradient>
+	<path fill="url(#SVGID_9_)" d="M18.72113,20.66997h-5.27055c-0.49484,0-0.91824,0.35532-1.00411,0.84266L9.65736,37.3425h12.85698
+		l-2.78911-15.82987C19.63937,21.0253,19.21597,20.66997,18.72113,20.66997z"/>
+	<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="16.08586" y1="37.3425" x2="16.08586" y2="41.17776">
+		<stop  offset="0.00559" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#C7C7C7"/>
+	</linearGradient>
+	<path fill="url(#SVGID_10_)" d="M9.1084,39.26013c0,0.68151,0.19702,1.32938,0.54896,1.91763h12.85698
+		c0.35194-0.58824,0.54896-1.23611,0.54896-1.91763s-0.19702-1.32938-0.54896-1.91763H9.65736
+		C9.30542,37.93075,9.1084,38.57862,9.1084,39.26013z"/>
+	<polygon fill="#FFFFFF" points="22.69582,37.8098 9.47589,37.8098 9.65734,37.3425 22.51433,37.3425 	"/>
+	<g opacity="0.1">
+		<polygon points="22.51434,41.17776 9.65736,41.17776 9.4759,40.84854 22.69581,40.84854 		"/>
+	</g>
+</g>
+<g opacity="0.2">
+	<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="16.08588" y1="20.67002" x2="16.08588" y2="25.88282">
+		<stop  offset="0.00559" style="stop-color:#000000"/>
+		<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+	</linearGradient>
+	<path fill="url(#SVGID_11_)" d="M19.72528,21.51267c-0.08591-0.48735-0.50927-0.84265-1.00415-0.84265h-5.27054
+		c-0.49483,0-0.91824,0.3553-1.0041,0.84265l-0.76998,4.37015h8.81874L19.72528,21.51267z"/>
+</g>
+</svg>
diff --git a/res/ComponentLibrary/NKK_1.svg b/res/ComponentLibrary/NKK_1.svg
index 769c8a4e..bd652586 100644
--- a/res/ComponentLibrary/NKK_1.svg
+++ b/res/ComponentLibrary/NKK_1.svg
@@ -1,93 +1,102 @@
-<?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="31.999855"
-   height="43.882507"
-   viewBox="0 0 8.4666281 11.61058"
-   version="1.1"
-   id="svg20198"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="NKK_1.svg">
-  <defs
-     id="defs20192" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="1.4417943"
-     inkscape:cy="15.231018"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g20169-3"
-     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="metadata20195">
-    <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(-80.57476,-112.94621)">
-    <g
-       transform="matrix(0.33514843,0,0,-0.33529537,-224.0132,506.00388)"
-       id="g20169"
-       style="stroke-width:1.05237091">
-      <g
-         transform="matrix(0.99501487,0,0,0.99507779,32.585756,3.8599038)"
-         id="g20169-3"
-         style="stroke-width:1.11299801">
-        <path
-           d="m 887.1943,1146.2402 -6.117,10.597 6.117,10.597 h 12.238 l 6.118,-10.597 -6.118,-10.597 z"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path6481-7"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 893.3271,1149.1729 c -4.227,0 -7.665,3.438 -7.665,7.664 0,4.227 3.438,7.666 7.665,7.666 4.227,0 7.666,-3.439 7.666,-7.666 0,-4.226 -3.439,-7.664 -7.666,-7.664"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path6489-5"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 898.8584,1156.8379 c 0,-3.063 -2.481,-5.545 -5.544,-5.545 -3.064,0 -5.545,2.482 -5.545,5.545 0,3.062 2.481,5.544 5.545,5.544 3.063,0 5.544,-2.482 5.544,-5.544"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.79320747;stroke-miterlimit:4;stroke-dasharray:none"
-           id="path6497-9"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 888.14458,1158.9871 -0.005,-4.2983 h 10.376 l -0.006,4.2983 z"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:evenodd;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path20175"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-      </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="svg20198" 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="31.99986px"
+	 height="43.88251px" viewBox="0 0 31.99986 43.88251" enable-background="new 0 0 31.99986 43.88251" 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="g20169-3" inkscape:cx="1.4417943" inkscape:cy="15.231018" 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.919596" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="15.91134" y1="7.99768" x2="15.91134" y2="35.72028">
+	<stop  offset="0" style="stop-color:#828181"/>
+	<stop  offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M22.37574,7.99768H9.44694c-0.95198,0-1.83164,0.50787-2.30763,1.33231L0.6749,20.52667
+	c-0.47599,0.82444-0.47599,1.84019,0,2.66463l6.4644,11.19668c0.47599,0.82444,1.35565,1.33231,2.30763,1.33231h12.92881
+	c0.95198,0,1.83164-0.50788,2.30763-1.33231l6.4644-11.19668c0.47599-0.82444,0.47599-1.84019,0-2.66463l-6.4644-11.19668
+	C24.20739,8.50555,23.32772,7.99768,22.37574,7.99768z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15.91134" y1="8.5898" x2="15.91134" y2="35.12816">
+	<stop  offset="0.00559" style="stop-color:#F2F2F2"/>
+	<stop  offset="1" style="stop-color:#C7C7C7"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="23.57231,8.5898 8.25038,8.5898 0.58941,21.85898 8.25038,35.12816 23.57231,35.12816 
+	31.23327,21.85898 "/>
+<circle fill="#E0E0E0" cx="15.91148" cy="21.75651" r="12.36617"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-1238.73169" y1="-371.95865" x2="-1217.03357" y2="-371.95865" gradientTransform="matrix(0 -1 -1 0 -356.04718 -1206.1261)">
+	<stop  offset="0" style="stop-color:#B0AEAE"/>
+	<stop  offset="1" style="stop-color:#616161"/>
+</linearGradient>
+<circle fill="url(#SVGID_3_)" cx="15.91148" cy="21.75651" r="10.84904"/>
+<circle fill="#0D0D0D" cx="15.91149" cy="21.74824" r="10.33745"/>
+<circle cx="15.91149" cy="21.74824" r="4.7387"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-1880.92493" y1="33.74581" x2="-1880.92493" y2="14.31691" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0.00559" style="stop-color:#707070"/>
+	<stop  offset="1" style="stop-color:#171616"/>
+</linearGradient>
+<circle fill="url(#SVGID_4_)" cx="15.91149" cy="21.7483" r="9.71445"/>
+<path fill="#FFFFFF" d="M23.57231,8.5898c0,0.449-3.42986,0.81298-7.66079,0.81298S8.25072,9.0388,8.25072,8.5898H23.57231z"/>
+<g opacity="0.15">
+	<path d="M23.57231,35.12816c0-0.44899-3.42986-0.81298-7.66079-0.81298s-7.66079,0.36398-7.66079,0.81298H23.57231z"/>
+</g>
+<g opacity="0.1">
+	<path d="M31.29795,21.91689c-0.38884-0.2245-2.41899,2.56385-4.53446,6.22795s-3.51518,6.81643-3.12634,7.04093L31.29795,21.91689z
+		"/>
+</g>
+<g opacity="0.1">
+	<path d="M0.58941,21.91689c0.38884-0.2245,2.41899,2.56385,4.53446,6.22795s3.51518,6.81643,3.12634,7.04093L0.58941,21.91689z"/>
+</g>
+<path opacity="0.5" fill="#FFFFFF" d="M31.29795,21.85868c-0.38884,0.2245-2.41899-2.56385-4.53446-6.22795
+	S23.24832,8.8143,23.63716,8.5898L31.29795,21.85868z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M0.58941,21.85868c0.38884,0.2245,2.41899-2.56385,4.53446-6.22795
+	S8.63905,8.8143,8.25021,8.5898L0.58941,21.85868z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-1880.9209" y1="33.74581" x2="-1880.9209" y2="14.42281" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FFFEFE"/>
+	<stop  offset="1" style="stop-color:#545454"/>
+</linearGradient>
+<circle fill="url(#SVGID_5_)" cx="15.90746" cy="21.69536" r="9.6615"/>
+<circle fill="#E0E0E0" cx="15.90745" cy="21.69536" r="8.60911"/>
+<g opacity="0.43">
+	<path fill="#404040" d="M15.90746,12.60231c5.28544,0,9.57298,4.12371,9.65095,9.2373
+		c0.00069-0.04853,0.00726-0.09559,0.00726-0.14427c0-5.3359-4.32408-9.66145-9.65821-9.66145s-9.65829,4.32555-9.65829,9.66145
+		c0,0.04868,0.00657,0.09574,0.00726,0.14427C6.33441,16.72603,10.62202,12.60231,15.90746,12.60231z"/>
+	<path opacity="0.28" fill="#404040" d="M6.25644,21.83961c-0.0007,0.04714-0.00726,0.09273-0.00726,0.14002
+		c0,5.17888,4.32416,9.37724,9.65829,9.37724C10.62202,31.35687,6.33441,27.10829,6.25644,21.83961z"/>
+	<path opacity="0.28" fill="#404040" d="M15.90746,31.35687c5.33413,0,9.65821-4.19836,9.65821-9.37724
+		c0-0.04729-0.00657-0.09288-0.00726-0.14002C25.48044,27.10829,21.19291,31.35687,15.90746,31.35687z"/>
+</g>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-1880.9209" y1="17.10312" x2="-1880.9209" y2="31.06549" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FFFEFE"/>
+	<stop  offset="1" style="stop-color:#706C6C"/>
+</linearGradient>
+<circle fill="url(#SVGID_6_)" cx="15.90746" cy="21.69536" r="6.98118"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-1880.90735" y1="30.2466" x2="-1880.90735" y2="17.92201" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FAF9F9"/>
+	<stop  offset="1" style="stop-color:#545454"/>
+</linearGradient>
+<circle fill="url(#SVGID_7_)" cx="15.89388" cy="21.69536" r="6.16229"/>
+<g opacity="0.5">
+	<path fill="#404040" d="M15.89387,16.89562c3.37118,0,6.10586,1.6302,6.15559,4.89176
+		c0.00044-0.03095,0.00463-0.06097,0.00463-0.09202c0-3.40336-2.758-6.1623-6.16022-6.1623S9.7336,18.292,9.7336,21.69536
+		c0,0.03105,0.00419,0.06107,0.00463,0.09202C9.78796,18.52581,12.5227,16.89562,15.89387,16.89562z"/>
+	<path opacity="0.28" fill="#404040" d="M9.73823,21.78738c-0.00044,0.03007-0.00463,0.05914-0.00463,0.08931
+		c0,3.30321,2.75805,5.98102,6.16028,5.98102C12.5227,27.8577,9.78796,25.14786,9.73823,21.78738z"/>
+	<path opacity="0.28" fill="#404040" d="M15.89387,27.8577c3.40223,0,6.16022-2.67781,6.16022-5.98102
+		c0-0.03016-0.00419-0.05924-0.00463-0.08931C21.99973,25.14786,19.26505,27.8577,15.89387,27.8577z"/>
+</g>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="8.70181" y1="21.69526" x2="23.1856" y2="21.69526">
+	<stop  offset="0" style="stop-color:#828181"/>
+	<stop  offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<path fill="url(#SVGID_8_)" d="M8.70181,21.69526c0,1.01953,0.21286,1.98875,0.5931,2.86875H22.5925
+	c0.38024-0.88001,0.5931-1.84922,0.5931-2.86875s-0.21286-1.98875-0.5931-2.86875H9.29491
+	C8.91467,19.70651,8.70181,20.67573,8.70181,21.69526z"/>
+<path fill="#E0E0E0" d="M8.96626,21.69526c0,0.94366,0.19702,1.84075,0.54896,2.65527h12.85698
+	c0.35194-0.81452,0.54896-1.71161,0.54896-2.65527s-0.19702-1.84075-0.54896-2.65527H9.51522
+	C9.16327,19.85451,8.96626,20.7516,8.96626,21.69526z"/>
+<polygon fill="#FFFFFF" points="22.55368,19.50729 9.33376,19.50729 9.51522,19.03999 22.37219,19.03999 "/>
+<g opacity="0.15">
+	<polygon points="22.37219,24.35053 9.51522,24.35053 9.33376,23.88324 22.55366,23.88324 	"/>
+</g>
+<path opacity="0.2" d="M19.78062,24.82254l3.22107,9.00289c0.33171,0.92712,0.20907,1.98553-0.32236,2.78217l-0.08537,0.12797
+	c-0.12326,0.18477-0.31497,0.29322-0.51835,0.29322H9.81184c-0.20337,0-0.39509-0.10845-0.51835-0.29322L9.20813,36.6076
+	c-0.53144-0.79664-0.65407-1.85505-0.32236-2.78217l3.22107-9.00289H19.78062z"/>
+</svg>
diff --git a/res/ComponentLibrary/NKK_2.svg b/res/ComponentLibrary/NKK_2.svg
index 2350fc68..b8f93cf1 100644
--- a/res/ComponentLibrary/NKK_2.svg
+++ b/res/ComponentLibrary/NKK_2.svg
@@ -1,92 +1,122 @@
-<?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="31.999855"
-   height="43.882507"
-   viewBox="0 0 8.4666281 11.61058"
-   version="1.1"
-   id="svg20198"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="NKK_2.svg">
-  <defs
-     id="defs20192" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="1.4417943"
-     inkscape:cy="15.231018"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g20169-3"
-     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="metadata20195">
-    <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(-80.57476,-112.94621)">
-    <g
-       transform="matrix(0.33514843,0,0,-0.33529537,-224.0132,506.00388)"
-       id="g20169"
-       style="stroke-width:1.05237091">
-      <g
-         transform="matrix(0.99501487,0,0,0.99507779,32.585756,3.8599038)"
-         id="g20169-3"
-         style="stroke-width:1.11299801">
-        <path
-           d="m 887.1943,1146.2402 -6.117,10.597 6.117,10.597 h 12.238 l 6.118,-10.597 -6.118,-10.597 z"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path6481-7"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 893.3271,1149.1729 c -4.227,0 -7.665,3.438 -7.665,7.664 0,4.227 3.438,7.666 7.665,7.666 4.227,0 7.666,-3.439 7.666,-7.666 0,-4.226 -3.439,-7.664 -7.666,-7.664"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:nonzero;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path6489-5"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 898.8584,1156.8379 c 0,-3.063 -2.481,-5.545 -5.544,-5.545 -3.064,0 -5.545,2.482 -5.545,5.545 0,3.062 2.481,5.544 5.545,5.544 3.063,0 5.544,-2.482 5.544,-5.544"
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.79320747;stroke-miterlimit:4;stroke-dasharray:none"
-           id="path6497-9"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 890.43168,1156.793 -2.289,17.003 h 10.376 l -1.79,-17.003 z"
-           style="opacity:1;vector-effect:none;fill:#e7e7e7;fill-opacity:1;fill-rule:evenodd;stroke:#939593;stroke-width:0.79320753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path6501-2"
-           inkscape:connector-curvature="0" />
-      </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="svg20198" 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="31.99986px"
+	 height="43.88251px" viewBox="0 0 31.99986 43.88251" enable-background="new 0 0 31.99986 43.88251" 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="g20169-3" inkscape:cx="1.4417943" inkscape:cy="15.231018" 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.919596" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="15.91134" y1="7.99768" x2="15.91134" y2="35.72028">
+	<stop  offset="0" style="stop-color:#828181"/>
+	<stop  offset="1" style="stop-color:#575757"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M22.37574,7.99768H9.44694c-0.95198,0-1.83164,0.50787-2.30763,1.33231L0.6749,20.52667
+	c-0.47599,0.82444-0.47599,1.84019,0,2.66463l6.4644,11.19668c0.47599,0.82444,1.35565,1.33231,2.30763,1.33231h12.92881
+	c0.95198,0,1.83164-0.50788,2.30763-1.33231l6.4644-11.19668c0.47599-0.82444,0.47599-1.84019,0-2.66463l-6.4644-11.19668
+	C24.20739,8.50555,23.32772,7.99768,22.37574,7.99768z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15.91134" y1="8.5898" x2="15.91134" y2="35.12816">
+	<stop  offset="0.00559" style="stop-color:#F2F2F2"/>
+	<stop  offset="1" style="stop-color:#C7C7C7"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="23.57231,8.5898 8.25038,8.5898 0.58941,21.85898 8.25038,35.12816 23.57231,35.12816 
+	31.23327,21.85898 "/>
+<circle fill="#E0E0E0" cx="15.91148" cy="21.75651" r="12.36617"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-1238.73169" y1="-371.95865" x2="-1217.03357" y2="-371.95865" gradientTransform="matrix(0 -1 -1 0 -356.04718 -1206.1261)">
+	<stop  offset="0" style="stop-color:#B0AEAE"/>
+	<stop  offset="1" style="stop-color:#616161"/>
+</linearGradient>
+<circle fill="url(#SVGID_3_)" cx="15.91148" cy="21.75651" r="10.84904"/>
+<circle fill="#0D0D0D" cx="15.91149" cy="21.74824" r="10.33745"/>
+<circle cx="15.91149" cy="21.74824" r="4.7387"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-1880.92493" y1="33.74581" x2="-1880.92493" y2="14.31691" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0.00559" style="stop-color:#707070"/>
+	<stop  offset="1" style="stop-color:#171616"/>
+</linearGradient>
+<circle fill="url(#SVGID_4_)" cx="15.91149" cy="21.7483" r="9.71445"/>
+<g opacity="0.15">
+	<path d="M23.57231,35.12816c0-0.44899-3.42986-0.81298-7.66079-0.81298s-7.66079,0.36398-7.66079,0.81298H23.57231z"/>
+</g>
+<g opacity="0.1">
+	<path d="M31.29795,21.91689c-0.38884-0.2245-2.41899,2.56385-4.53446,6.22795s-3.51518,6.81643-3.12634,7.04093L31.29795,21.91689z
+		"/>
+</g>
+<g opacity="0.1">
+	<path d="M0.58941,21.91689c0.38884-0.2245,2.41899,2.56385,4.53446,6.22795s3.51518,6.81643,3.12634,7.04093L0.58941,21.91689z"/>
+</g>
+<path opacity="0.5" fill="#FFFFFF" d="M31.29795,21.85868c-0.38884,0.2245-2.41899-2.56385-4.53446-6.22795
+	S23.24832,8.8143,23.63716,8.5898L31.29795,21.85868z"/>
+<path opacity="0.5" fill="#FFFFFF" d="M0.58941,21.85868c0.38884,0.2245,2.41899-2.56385,4.53446-6.22795
+	S8.63905,8.8143,8.25021,8.5898L0.58941,21.85868z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-1880.9209" y1="33.74581" x2="-1880.9209" y2="14.42281" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FFFEFE"/>
+	<stop  offset="1" style="stop-color:#545454"/>
+</linearGradient>
+<circle fill="url(#SVGID_5_)" cx="15.90746" cy="21.69536" r="9.6615"/>
+<circle fill="#E0E0E0" cx="15.90745" cy="21.69536" r="8.60911"/>
+<g opacity="0.43">
+	<path fill="#404040" d="M15.90746,12.60231c5.28544,0,9.57298,4.12371,9.65095,9.2373
+		c0.00069-0.04853,0.00726-0.09559,0.00726-0.14427c0-5.3359-4.32408-9.66145-9.65821-9.66145s-9.65829,4.32555-9.65829,9.66145
+		c0,0.04868,0.00657,0.09574,0.00726,0.14427C6.33441,16.72603,10.62202,12.60231,15.90746,12.60231z"/>
+	<path opacity="0.28" fill="#404040" d="M6.25644,21.83961c-0.0007,0.04714-0.00726,0.09273-0.00726,0.14002
+		c0,5.17888,4.32416,9.37724,9.65829,9.37724C10.62202,31.35687,6.33441,27.10829,6.25644,21.83961z"/>
+	<path opacity="0.28" fill="#404040" d="M15.90746,31.35687c5.33413,0,9.65821-4.19836,9.65821-9.37724
+		c0-0.04729-0.00657-0.09288-0.00726-0.14002C25.48044,27.10829,21.19291,31.35687,15.90746,31.35687z"/>
+</g>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-1880.9209" y1="17.10312" x2="-1880.9209" y2="31.06549" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FFFEFE"/>
+	<stop  offset="1" style="stop-color:#706C6C"/>
+</linearGradient>
+<circle fill="url(#SVGID_6_)" cx="15.90746" cy="21.69536" r="6.98118"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-1880.9209" y1="30.2466" x2="-1880.9209" y2="17.92201" gradientTransform="matrix(-1 0 0 -1 -1865.01343 45.77966)">
+	<stop  offset="0" style="stop-color:#FAF9F9"/>
+	<stop  offset="1" style="stop-color:#545454"/>
+</linearGradient>
+<circle fill="url(#SVGID_7_)" cx="15.90746" cy="21.69536" r="6.16229"/>
+<g opacity="0.5">
+	<path fill="#404040" d="M15.90745,16.89562c3.37118,0,6.10586,1.6302,6.15559,4.89176
+		c0.00044-0.03095,0.00463-0.06097,0.00463-0.09202c0-3.40336-2.758-6.1623-6.16023-6.1623s-6.16028,2.75893-6.16028,6.1623
+		c0,0.03105,0.00419,0.06107,0.00463,0.09202C9.80154,18.52581,12.53627,16.89562,15.90745,16.89562z"/>
+	<path opacity="0.28" fill="#404040" d="M9.75181,21.78738c-0.00044,0.03007-0.00463,0.05914-0.00463,0.08931
+		c0,3.30321,2.75805,5.98102,6.16028,5.98102C12.53627,27.8577,9.80154,25.14786,9.75181,21.78738z"/>
+	<path opacity="0.28" fill="#404040" d="M15.90745,27.8577c3.40223,0,6.16023-2.67781,6.16023-5.98102
+		c0-0.03016-0.00419-0.05924-0.00463-0.08931C22.01331,25.14786,19.27863,27.8577,15.90745,27.8577z"/>
+</g>
+<path opacity="0.25" d="M19.74519,21.14497l3.07186,9.00289c0.31634,0.92712,0.19939,1.98553-0.30743,2.78217l-0.08141,0.12797
+	c-0.11755,0.18477-0.30038,0.29322-0.49434,0.29322H10.23818c-0.19395,0-0.37679-0.10845-0.49434-0.29322l-0.08141-0.12797
+	c-0.50682-0.79664-0.62377-1.85505-0.30743-2.78217l3.07186-9.00289H19.74519z"/>
+<g>
+	
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="16.08603" y1="-5387.09863" x2="16.08603" y2="-5408.05615" gradientTransform="matrix(1 0 0 -1 0 -5384.78125)">
+		<stop  offset="0" style="stop-color:#828181"/>
+		<stop  offset="1" style="stop-color:#2E2E2E"/>
+	</linearGradient>
+	<path fill="url(#SVGID_8_)" d="M18.72128,23.27494h-0.04098h-5.18702c-0.64775,0-1.16326-0.43264-1.26826-1.02854l-0.09618-0.5458
+		L9.01983,5.44856C8.93081,5.12952,8.8836,4.79092,8.8836,4.46001c0-0.7051,0.19542-1.38911,0.58085-2.03335l0.06551-0.10942
+		h0.12758h12.85695h0.12758l0.06551,0.10942c0.38545,0.64424,0.5809,1.32846,0.5809,2.03335
+		c0,0.33135-0.0473,0.67038-0.1406,1.00722L20.0253,21.80168l-0.07836,0.44473
+		C19.84197,22.8423,19.32649,23.27494,18.72128,23.27494L18.72128,23.27494z"/>
+</g>
+<g>
+	<path fill="#949494" d="M18.6803,23.04998h-5.18701c-0.5091,0-0.9465-0.36228-1.04235-0.86336L9.17961,5.08617h13.81283
+		l-3.26977,17.10036C19.62685,22.68765,19.18944,23.04998,18.6803,23.04998z"/>
+	
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="16.08603" y1="-5391.15869" x2="16.08603" y2="-5407.83105" gradientTransform="matrix(1 0 0 -1 0 -5384.78125)">
+		<stop  offset="0.00559" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#3B3B3B"/>
+	</linearGradient>
+	<path fill="url(#SVGID_9_)" d="M18.72129,23.04998h-5.27053c-0.49484,0-0.91824-0.35532-1.0041-0.84266L9.65756,6.37752h12.85693
+		l-2.7891,15.82981C19.63953,22.69466,19.21613,23.04998,18.72129,23.04998z"/>
+	
+		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="16.08603" y1="-5387.32324" x2="16.08603" y2="-5391.15869" gradientTransform="matrix(1 0 0 -1 0 -5384.78125)">
+		<stop  offset="0.00559" style="stop-color:#F5F5F5"/>
+		<stop  offset="1" style="stop-color:#DBDBDB"/>
+	</linearGradient>
+	<path fill="url(#SVGID_10_)" d="M9.1086,4.4599c0-0.68151,0.19702-1.32938,0.54896-1.91762h12.85693
+		c0.35194,0.58824,0.54896,1.23611,0.54896,1.91762c0,0.68151-0.19702,1.32938-0.54896,1.91762H9.65756
+		C9.30562,5.78928,9.1086,5.1414,9.1086,4.4599z"/>
+	<g opacity="0.1">
+		<polygon points="22.69596,5.91023 9.47609,5.91023 9.65754,6.37752 22.51447,6.37752 		"/>
+	</g>
+	<polygon fill="#FFFFFF" points="22.51448,2.54228 9.65755,2.54228 9.4761,2.87149 22.69595,2.87149 	"/>
+</g>
+</svg>
diff --git a/res/ComponentLibrary/PJ3410.svg b/res/ComponentLibrary/PJ3410.svg
index bb7be8a3..9ab9c113 100644
--- a/res/ComponentLibrary/PJ3410.svg
+++ b/res/ComponentLibrary/PJ3410.svg
@@ -1,383 +1,61 @@
-<?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="10.355158mm"
-   height="10.35652mm"
-   viewBox="0 0 10.355158 10.35652"
-   version="1.1"
-   id="svg15246"
-   sodipodi:docname="PJ3410.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <defs
-     id="defs15240">
-    <clipPath
-       id="clip89">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="19"
-         id="rect4864" />
-    </clipPath>
-    <clipPath
-       id="clip90">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.898438,0.128906 h 16.25 v 17.882813 h -16.25 z m 0,0"
-         id="path4861" />
-    </clipPath>
-    <mask
-       id="mask44">
-      <g
-         style="filter:url(#alpha)"
-         id="g4858"
-         transform="matrix(0.26458333,0,0,0.26458333,89.358789,128.57765)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4856" />
-      </g>
-    </mask>
-    <filter
-       id="alpha"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix4149" />
-    </filter>
-    <clipPath
-       id="clipPath17821">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="19"
-         id="rect17819" />
-    </clipPath>
-    <clipPath
-       id="clipPath17825">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.898438,0.128906 h 16.25 v 17.882813 h -16.25 z m 0,0"
-         id="path17823" />
-    </clipPath>
-    <clipPath
-       id="clip87">
-      <rect
-         y="0"
-         x="0"
-         width="24"
-         height="26"
-         id="rect4848" />
-    </clipPath>
-    <clipPath
-       id="clip88">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.683594,0.921875 h 22.679687 v 24.9375 H 0.683594 Z m 0,0"
-         id="path4845" />
-    </clipPath>
-    <mask
-       id="mask43">
-      <g
-         style="filter:url(#alpha)"
-         id="g4842"
-         transform="matrix(0.26458333,0,0,0.26458333,89.358789,128.57765)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4840" />
-      </g>
-    </mask>
-    <filter
-       id="filter17836"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix17834" />
-    </filter>
-    <clipPath
-       id="clipPath17840">
-      <rect
-         y="0"
-         x="0"
-         width="24"
-         height="26"
-         id="rect17838" />
-    </clipPath>
-    <clipPath
-       id="clipPath17844">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.683594,0.921875 h 22.679687 v 24.9375 H 0.683594 Z m 0,0"
-         id="path17842" />
-    </clipPath>
-    <clipPath
-       id="clip95">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect4912" />
-    </clipPath>
-    <clipPath
-       id="clip96">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.140625,0.140625 H 17.199219 V 17.199219 H 0.140625 Z m 0,0"
-         id="path4909" />
-    </clipPath>
-    <mask
-       id="mask47">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4906"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.33000201;stroke:none"
-           id="rect4904" />
-      </g>
-    </mask>
-    <filter
-       id="alpha-3"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix4149-6" />
-    </filter>
-    <clipPath
-       id="clipPath18541">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect18539" />
-    </clipPath>
-    <clipPath
-       id="clipPath18545">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.140625,0.140625 H 17.199219 V 17.199219 H 0.140625 Z m 0,0"
-         id="path18543" />
-    </clipPath>
-    <clipPath
-       id="clip93">
-      <rect
-         y="0"
-         x="0"
-         width="22"
-         height="24"
-         id="rect4896" />
-    </clipPath>
-    <clipPath
-       id="clip94">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.0390625,0.0390625 H 21.300781 V 23.421875 H 0.0390625 Z m 0,0"
-         id="path4893" />
-    </clipPath>
-    <mask
-       id="mask46">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4890"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4888" />
-      </g>
-    </mask>
-    <filter
-       id="filter18556"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix18554" />
-    </filter>
-    <clipPath
-       id="clipPath18560">
-      <rect
-         y="0"
-         x="0"
-         width="22"
-         height="24"
-         id="rect18558" />
-    </clipPath>
-    <clipPath
-       id="clipPath18564">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.0390625,0.0390625 H 21.300781 V 23.421875 H 0.0390625 Z m 0,0"
-         id="path18562" />
-    </clipPath>
-    <clipPath
-       id="clip91">
-      <rect
-         y="0"
-         x="0"
-         width="29"
-         height="32"
-         id="rect4880" />
-    </clipPath>
-    <clipPath
-       id="clip92">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.507812,0.5 H 28.855469 V 31.679688 H 0.507812 Z m 0,0"
-         id="path4877" />
-    </clipPath>
-    <mask
-       id="mask45">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4874"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4872" />
-      </g>
-    </mask>
-    <filter
-       id="filter18575"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix18573" />
-    </filter>
-    <clipPath
-       id="clipPath18579">
-      <rect
-         y="0"
-         x="0"
-         width="29"
-         height="32"
-         id="rect18577" />
-    </clipPath>
-    <clipPath
-       id="clipPath18583">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.507812,0.5 H 28.855469 V 31.679688 H 0.507812 Z m 0,0"
-         id="path18581" />
-    </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="6.9359976"
-     inkscape:cy="-37.491484"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1274"
-     inkscape:window-height="1434"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     units="px"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata15243">
-    <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(-74.416306,-97.613551)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path7751"
-       d="m 79.593198,107.84507 c -2.786394,-0.018 -5.053266,-2.28618 -5.051891,-5.05739 0.0014,-2.77125 2.266876,-5.036748 5.051891,-5.049128 2.775366,0.0138 5.042242,2.279258 5.053266,5.049128 -0.0055,2.77259 -2.272386,5.04084 -5.05189,5.05739 z m 0,0"
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#636663;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path7757"
-       d="m 75.83942,102.78768 c 0.01101,2.0822 1.672939,3.74548 3.753778,3.75514 2.072569,-0.007 3.74964,-1.67982 3.746884,-3.75514 -0.0014,-2.06982 -1.677073,-3.740008 -3.746884,-3.745508 -2.078083,0.008 -3.738619,1.666028 -3.753778,3.745508"
-       style="fill:#545454;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path7759"
-       d="m 77.58953,102.79043 c 0.0055,1.11069 0.891589,1.99676 2.002289,2.00226 1.105185,-0.004 1.999534,-0.8957 1.998154,-2.00226 0,-1.10518 -0.894345,-1.99542 -1.998154,-1.99817 -1.107941,0.004 -1.99402,0.88883 -2.002289,1.99817"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a2b2a;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 76.73908,102.78956 c 0.0078,1.58293 1.270673,2.84574 2.853618,2.85358 1.575085,-0.006 2.849691,-1.27654 2.847724,-2.85358 0,-1.57508 -1.274601,-2.843827 -2.847724,-2.847746 -1.579013,0.0057 -2.841833,1.266736 -2.853618,2.847746"
-       id="path18715"
-       inkscape:connector-curvature="0" />
-  </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="svg15246" 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="29.3532px"
+	 height="29.35706px" viewBox="0 0 29.3532 29.35706" enable-background="new 0 0 29.3532 29.35706" 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="6.9359976" inkscape:cy="-37.491484" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1434" inkscape:window-maximized="0" inkscape:window-width="1274" inkscape:window-x="1280" inkscape:window-y="0" inkscape:zoom="3.959798" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-602.19672" y1="1788.5177" x2="-573.24432" y2="1788.5177" 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_1_)" d="M14.67691,29.15473c-7.98243,0-14.47682-6.49377-14.47682-14.47558
+		c0-7.98305,6.49439-14.47682,14.47682-14.47682s14.4762,6.49377,14.4762,14.47683
+		C29.15311,22.66096,22.65935,29.15473,14.67691,29.15473z"/>
+</g>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="1061.78845" y1="-4088.5166" x2="1090.05518" y2="-4088.5166" gradientTransform="matrix(0 1 -1 0 -4073.83984 -1061.23169)">
+	<stop  offset="0.00559" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<circle fill="url(#SVGID_2_)" cx="14.6766" cy="14.69006" r="14.13337"/>
+<circle fill="#E0E0E0" cx="14.6766" cy="14.69006" r="13.15024"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="61.68285" y1="-51.36954" x2="61.68285" y2="-48.64069" gradientTransform="matrix(1 0 0 -1 -47.00625 -35.32658)">
+	<stop  offset="0" style="stop-color:#FFFBFD"/>
+	<stop  offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M1.53804,13.31411l-0.67218,0.41026c-0.43297,0.5698-0.42987,1.3592,0.00755,1.92559l0.64127,0.36363
+	l26.24718,0.02937l0.70641-0.3782c0.45261-0.56379,0.45589-1.36545,0.00792-1.93293l-0.71434-0.39466L1.53804,13.31411z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-1239.96838" y1="-378.72379" x2="-1217.66406" y2="-378.72379" gradientTransform="matrix(0 -1 -1 0 -364.04718 -1214.1261)">
+	<stop  offset="0" style="stop-color:#B0AEAE"/>
+	<stop  offset="1" style="stop-color:#616161"/>
+</linearGradient>
+<circle fill="url(#SVGID_4_)" cx="14.67661" cy="14.69004" r="11.15214"/>
+<circle fill="#1C1C1C" cx="14.67662" cy="14.68177" r="10.33745"/>
+<circle cx="14.67662" cy="14.68177" r="4.7387"/>
+<path opacity="0.23" d="M14.67662,7.25231c5.36514,0,9.71445,4.14275,9.71445,9.2531S20.04176,26.6785,14.67662,26.6785
+	s-9.71445-5.06274-9.71445-10.17309S9.31148,7.25231,14.67662,7.25231z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-1881.69006" y1="26.81228" x2="-1881.69006" y2="7.38338" gradientTransform="matrix(-1 0 0 -1 -1867.01343 31.77966)">
+	<stop  offset="0.00559" style="stop-color:#707070"/>
+	<stop  offset="1" style="stop-color:#171616"/>
+</linearGradient>
+<circle fill="url(#SVGID_5_)" cx="14.67662" cy="14.68183" r="9.71445"/>
+<circle fill="#333333" cx="14.67662" cy="14.68184" r="8.74177"/>
+<g opacity="0.5">
+	<path fill="#404040" d="M14.67664,5.65506c5.31283,0,9.62258,4.02878,9.70096,9.16886
+		c0.0007-0.04878,0.0073-0.09608,0.0073-0.14502c0-5.36355-4.34649-9.71152-9.70826-9.71152S4.96831,9.31535,4.96831,14.6789
+		c0,0.04893,0.0066,0.09624,0.0073,0.14502C5.05398,9.68384,9.36381,5.65506,14.67664,5.65506z"/>
+	<path opacity="0.28" fill="#404040" d="M4.97561,14.82392c-0.0007,0.04738-0.0073,0.09321-0.0073,0.14075
+		c0,5.20572,4.34657,9.42583,9.70833,9.42583C9.36381,24.3905,5.05398,20.1199,4.97561,14.82392z"/>
+	<path opacity="0.28" fill="#404040" d="M14.67664,24.3905c5.36177,0,9.70826-4.22011,9.70826-9.42583
+		c0-0.04754-0.0066-0.09336-0.0073-0.14075C24.29922,20.1199,19.98947,24.3905,14.67664,24.3905z"/>
+</g>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-1881.69006" y1="11.12411" x2="-1881.69006" y2="23.07154" gradientTransform="matrix(-1 0 0 -1 -1867.01343 31.77966)">
+	<stop  offset="0" style="stop-color:#595959"/>
+	<stop  offset="1" style="stop-color:#171616"/>
+</linearGradient>
+<circle fill="url(#SVGID_6_)" cx="14.67662" cy="14.68184" r="5.97371"/>
+<circle cx="14.67662" cy="14.6785" r="4.86733"/>
+</svg>
diff --git a/res/ComponentLibrary/SynthTechAlco-bg.svg b/res/ComponentLibrary/SynthTechAlco-bg.svg
new file mode 100644
index 00000000..6e9a583b
--- /dev/null
+++ b/res/ComponentLibrary/SynthTechAlco-bg.svg
@@ -0,0 +1,46 @@
+<?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="svg15246" 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="44.80079px"
+	 height="44.79687px" viewBox="0 0 44.80079 44.79687" enable-background="new 0 0 44.80079 44.79687" 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="30.830975" inkscape:cy="28.69175" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1434" inkscape:window-maximized="0" inkscape:window-width="847" inkscape:window-x="1707" inkscape:window-y="0" inkscape:zoom="5.6" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g opacity="0.8">
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.4004" y1="7.112929e-06" x2="22.4004" y2="44.80081">
+		<stop  offset="0" style="stop-color:#8A8788"/>
+		<stop  offset="1" style="stop-color:#000000"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_1_)" cx="22.4004" cy="22.40041" r="22.4004"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="22.4004" y1="7.112929e-06" x2="22.4004" y2="44.80081">
+		<stop  offset="0" style="stop-color:#8C898A"/>
+		<stop  offset="1" style="stop-color:#000000"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_2_)" cx="22.4004" cy="22.40041" r="22.4004"/>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="115.52751" y1="208.0656" x2="115.52751" y2="243.36119" gradientTransform="matrix(-1 0 0 0.50871 137.93398 -101.77183)">
+		<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_3_)" cx="22.40646" cy="13.0516" rx="12.84752" ry="8.97767"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-1236.68811" y1="-371.44757" x2="-1206.36499" y2="-371.44757" gradientTransform="matrix(0 -1 -1 0 -349.04718 -1199.1261)">
+		<stop  offset="0" style="stop-color:#454545"/>
+		<stop  offset="1" style="stop-color:#141414"/>
+	</linearGradient>
+	<circle fill="url(#SVGID_4_)" cx="22.40038" cy="22.40041" r="15.16154"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="22.40033" y1="36.31743" x2="22.40033" y2="8.48339">
+		<stop  offset="0.00559" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#D6D6D6"/>
+	</linearGradient>
+	<ellipse fill="url(#SVGID_5_)" cx="22.40033" cy="22.40041" rx="13.94376" ry="13.91702"/>
+	<path opacity="0.1" d="M22.3976,22.40171l12.07801,6.97324c1.22397-2.11998,1.86848-4.5253,1.86848-6.97324
+		s-0.64451-4.85327-1.86848-6.97324L22.3976,22.40171z"/>
+	<path opacity="0.1" d="M22.39762,22.40171l-12.07801-6.97324c-1.22397,2.11998-1.86848,4.5253-1.86848,6.97324
+		s0.64451,4.85327,1.86848,6.97324L22.39762,22.40171z"/>
+	<path opacity="0.8" fill="#FFFFFF" d="M22.39753,22.3979l3.62136,13.50211c1.1811-0.31617,2.31563-0.78566,3.37457-1.39645
+		c1.05894-0.61079,2.03318-1.35764,2.8978-2.22143L22.39753,22.3979z"/>
+	<path opacity="0.8" fill="#FFFFFF" d="M22.3976,22.39799L18.79477,8.95202c-1.17506,0.31485-2.30379,0.78239-3.35731,1.39064
+		s-2.02279,1.35199-2.88298,2.21219L22.3976,22.39799z"/>
+</g>
+</svg>
diff --git a/res/ComponentLibrary/SynthTechAlco_cap.svg b/res/ComponentLibrary/SynthTechAlco-fg.svg
similarity index 100%
rename from res/ComponentLibrary/SynthTechAlco_cap.svg
rename to res/ComponentLibrary/SynthTechAlco-fg.svg
diff --git a/res/ComponentLibrary/SynthTechAlco.svg b/res/ComponentLibrary/SynthTechAlco.svg
index 7c393e1e..7d0388e0 100644
--- a/res/ComponentLibrary/SynthTechAlco.svg
+++ b/res/ComponentLibrary/SynthTechAlco.svg
@@ -1,438 +1,102 @@
-<?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="15.804726mm"
-   height="15.803342mm"
-   viewBox="0 0 15.804726 15.803344"
-   version="1.1"
-   id="svg15246"
-   sodipodi:docname="SynthTechAlco.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <defs
-     id="defs15240">
-    <clipPath
-       id="clip89">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="19"
-         id="rect4864" />
-    </clipPath>
-    <clipPath
-       id="clip90">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.898438,0.128906 h 16.25 v 17.882813 h -16.25 z m 0,0"
-         id="path4861" />
-    </clipPath>
-    <mask
-       id="mask44">
-      <g
-         style="filter:url(#alpha)"
-         id="g4858"
-         transform="matrix(0.26458333,0,0,0.26458333,89.358789,128.57765)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4856" />
-      </g>
-    </mask>
-    <filter
-       id="alpha"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix4149" />
-    </filter>
-    <clipPath
-       id="clipPath17821">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="19"
-         id="rect17819" />
-    </clipPath>
-    <clipPath
-       id="clipPath17825">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.898438,0.128906 h 16.25 v 17.882813 h -16.25 z m 0,0"
-         id="path17823" />
-    </clipPath>
-    <clipPath
-       id="clip87">
-      <rect
-         y="0"
-         x="0"
-         width="24"
-         height="26"
-         id="rect4848" />
-    </clipPath>
-    <clipPath
-       id="clip88">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.683594,0.921875 h 22.679687 v 24.9375 H 0.683594 Z m 0,0"
-         id="path4845" />
-    </clipPath>
-    <mask
-       id="mask43">
-      <g
-         style="filter:url(#alpha)"
-         id="g4842"
-         transform="matrix(0.26458333,0,0,0.26458333,89.358789,128.57765)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4840" />
-      </g>
-    </mask>
-    <filter
-       id="filter17836"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix17834" />
-    </filter>
-    <clipPath
-       id="clipPath17840">
-      <rect
-         y="0"
-         x="0"
-         width="24"
-         height="26"
-         id="rect17838" />
-    </clipPath>
-    <clipPath
-       id="clipPath17844">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 0.683594,0.921875 h 22.679687 v 24.9375 H 0.683594 Z m 0,0"
-         id="path17842" />
-    </clipPath>
-    <clipPath
-       id="clip95">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect4912" />
-    </clipPath>
-    <clipPath
-       id="clip96">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.140625,0.140625 H 17.199219 V 17.199219 H 0.140625 Z m 0,0"
-         id="path4909" />
-    </clipPath>
-    <mask
-       id="mask47">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4906"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.33000201;stroke:none"
-           id="rect4904" />
-      </g>
-    </mask>
-    <filter
-       id="alpha-3"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix4149-6" />
-    </filter>
-    <clipPath
-       id="clipPath18541">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect18539" />
-    </clipPath>
-    <clipPath
-       id="clipPath18545">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.140625,0.140625 H 17.199219 V 17.199219 H 0.140625 Z m 0,0"
-         id="path18543" />
-    </clipPath>
-    <clipPath
-       id="clip93">
-      <rect
-         y="0"
-         x="0"
-         width="22"
-         height="24"
-         id="rect4896" />
-    </clipPath>
-    <clipPath
-       id="clip94">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.0390625,0.0390625 H 21.300781 V 23.421875 H 0.0390625 Z m 0,0"
-         id="path4893" />
-    </clipPath>
-    <mask
-       id="mask46">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4890"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4888" />
-      </g>
-    </mask>
-    <filter
-       id="filter18556"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix18554" />
-    </filter>
-    <clipPath
-       id="clipPath18560">
-      <rect
-         y="0"
-         x="0"
-         width="22"
-         height="24"
-         id="rect18558" />
-    </clipPath>
-    <clipPath
-       id="clipPath18564">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.0390625,0.0390625 H 21.300781 V 23.421875 H 0.0390625 Z m 0,0"
-         id="path18562" />
-    </clipPath>
-    <clipPath
-       id="clip91">
-      <rect
-         y="0"
-         x="0"
-         width="29"
-         height="32"
-         id="rect4880" />
-    </clipPath>
-    <clipPath
-       id="clip92">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.507812,0.5 H 28.855469 V 31.679688 H 0.507812 Z m 0,0"
-         id="path4877" />
-    </clipPath>
-    <mask
-       id="mask45">
-      <g
-         style="filter:url(#alpha-3)"
-         id="g4874"
-         transform="matrix(0.26458333,0,0,0.26458333,88.611154,119.19859)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.14999402;stroke:none"
-           id="rect4872" />
-      </g>
-    </mask>
-    <filter
-       id="filter18575"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix18573" />
-    </filter>
-    <clipPath
-       id="clipPath18579">
-      <rect
-         y="0"
-         x="0"
-         width="29"
-         height="32"
-         id="rect18577" />
-    </clipPath>
-    <clipPath
-       id="clipPath18583">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.507812,0.5 H 28.855469 V 31.679688 H 0.507812 Z m 0,0"
-         id="path18581" />
-    </clipPath>
-    <clipPath
-       id="clip202">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect5795" />
-    </clipPath>
-    <clipPath
-       id="clip203">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.855469,0.140625 H 17.914062 V 17.199219 H 0.855469 Z m 0,0"
-         id="path5792" />
-    </clipPath>
-    <mask
-       id="mask104">
-      <g
-         style="filter:url(#alpha-7)"
-         id="g5789"
-         transform="matrix(0.26458333,0,0,0.26458333,74.416306,97.613551)">
-        <rect
-           x="0"
-           y="0"
-           width="3052.8701"
-           height="3351.5"
-           style="fill:#000000;fill-opacity:0.33000201;stroke:none"
-           id="rect5787" />
-      </g>
-    </mask>
-    <filter
-       id="alpha-7"
-       filterUnits="objectBoundingBox"
-       x="0"
-       y="0"
-       width="1"
-       height="1">
-      <feColorMatrix
-         type="matrix"
-         in="SourceGraphic"
-         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
-         id="feColorMatrix4149-5" />
-    </filter>
-    <clipPath
-       id="clipPath18765">
-      <rect
-         y="0"
-         x="0"
-         width="18"
-         height="18"
-         id="rect18763" />
-    </clipPath>
-    <clipPath
-       id="clipPath18769">
-      <path
-         inkscape:connector-curvature="0"
-         d="M 0.855469,0.140625 H 17.914062 V 17.199219 H 0.855469 Z m 0,0"
-         id="path18767" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="30.830975"
-     inkscape:cy="28.69175"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="847"
-     inkscape:window-height="1434"
-     inkscape:window-x="1707"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     units="px"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata15243">
-    <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(-47.530972,-84.333058)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path8213"
-       d="m 63.335698,92.23473 c 0,4.364245 -3.537444,7.90167 -7.901692,7.90167 -4.365625,0 -7.903034,-3.537425 -7.903034,-7.90167 0,-4.36287 3.537409,-7.901672 7.903034,-7.901672 4.364248,0 7.901692,3.538802 7.901692,7.901672"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path8215"
-       d="m 61.12671,88.268735 c 0.162595,0.212217 0.281093,0.609092 0.263172,0.880569 l -0.0799,1.200269 c -0.01799,0.272853 0.07303,0.687642 0.203941,0.923287 l 0.566384,1.030771 c 0.12954,0.235645 0.188772,0.646299 0.12954,0.910883 l -0.257704,1.17409 c -0.05927,0.264583 -0.282504,0.607712 -0.497487,0.763432 l -0.952218,0.683507 c -0.216359,0.15572 -0.471276,0.487825 -0.56776,0.741384 l -0.4203,1.10381 c -0.09507,0.252179 -0.366536,0.555349 -0.602191,0.673862 l -1.051455,0.523652 c -0.23562,0.118512 -0.632495,0.150206 -0.88332,0.07028 L 55.8874,98.602643 c -0.25079,-0.07993 -0.660083,-0.07993 -0.909497,-0.0014 l -1.107969,0.348643 c -0.249414,0.07993 -0.647665,0.04685 -0.88332,-0.07166 l -1.034909,-0.522277 c -0.23562,-0.118512 -0.505742,-0.423058 -0.603568,-0.675237 l -0.418923,-1.10381 c -0.09645,-0.253568 -0.351402,-0.585677 -0.567761,-0.741393 L 49.409235,95.152002 C 49.194253,94.996283 48.971015,94.65315 48.913159,94.388566 L 48.655455,93.21448 c -0.05789,-0.264584 0,-0.675238 0.130916,-0.910883 l 0.567761,-1.030774 c 0.129504,-0.235645 0.221861,-0.650434 0.202565,-0.923283 l -0.07994,-1.200274 c -0.01799,-0.271473 0.100612,-0.668348 0.264583,-0.880565 l 0.720725,-0.94258 c 0.162596,-0.212217 0.508494,-0.420299 0.766198,-0.461641 l 1.127227,-0.181901 c 0.257669,-0.04134 0.626992,-0.225996 0.819926,-0.409275 l 0.853017,-0.814423 c 0.192899,-0.183278 0.563598,-0.33486 0.825429,-0.33486 h 1.158946 c 0.26042,0 0.632495,0.151582 0.824054,0.33624 l 0.837847,0.803395 c 0.192934,0.184658 0.562222,0.370695 0.819926,0.412033 l 1.1424,0.186038 c 0.25908,0.04272 0.603568,0.2508 0.767574,0.464396 z m 0,0"
-       style="fill:none;stroke:#545454;stroke-width:0.23495001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path8219"
-       d="m 56.022439,84.357862 c -0.19431,-0.01517 -0.389996,-0.0248 -0.589809,-0.0248 -0.197062,0 -0.394124,0.0097 -0.588398,0.0248 v 3.315561 h 1.178207 z m 0,0"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277775" />
-  </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="svg15246" 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="44.80079px"
+	 height="44.79687px" viewBox="0 0 44.80079 44.79687" enable-background="new 0 0 44.80079 44.79687" 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="30.830975" inkscape:cy="28.69175" inkscape:document-units="mm" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="1434" inkscape:window-maximized="0" inkscape:window-width="847" inkscape:window-x="1707" inkscape:window-y="0" inkscape:zoom="5.6" pagecolor="#ffffff" showgrid="false" units="px">
+	</sodipodi:namedview>
+<g>
+	<path opacity="0.24" fill="#616161" enable-background="new    " d="M22.4004,0C10.02903,0,0.00003,10.02899,0.00003,22.40044
+		c0,12.37137,10.02899,22.40037,22.40037,22.40037s22.40037-10.02899,22.40037-22.40037C44.80077,10.02899,34.77177,0,22.4004,0z
+		 M22.4004,37.56196c-8.37349,0-15.1616-6.7881-15.1616-15.16152c0-8.37349,6.7881-15.16159,15.1616-15.16159
+		s15.16152,6.7881,15.16152,15.16159C37.56192,30.77386,30.77389,37.56196,22.4004,37.56196z"/>
+	<g opacity="0.71">
+		<path d="M22.40043,0.75012c1.29184,0,2.5929,0.11694,3.86725,0.34741c0.30887,0.05591,0.54169,0.25806,0.68262,0.41772
+			c2.28137,2.58643,5.56633,4.17603,9.01242,4.36108c0.20985,0.01123,0.50885,0.06787,0.74165,0.27295
+			c1.95107,1.71899,3.56307,3.75415,4.7912,6.04883c0.14473,0.27026,0.1337,0.5708,0.09895,0.77539
+			c-0.56816,3.34473,0.22821,6.85376,2.18494,9.6272c0.11928,0.16895,0.2587,0.43506,0.24556,0.74194
+			c-0.11276,2.63379-0.69417,5.18921-1.72807,7.59522c-0.12018,0.27979-0.3606,0.45801-0.54121,0.55811
+			c-2.9665,1.64746-5.20812,4.46143-6.15006,7.72071c-0.05724,0.198-0.17699,0.47168-0.42244,0.65186
+			c-2.10883,1.54614-4.44751,2.68457-6.95098,3.3833C28.1484,43.27528,28.05888,43.287,27.9662,43.287
+			c-0.16582,0-0.34575-0.03833-0.52051-0.11133c-1.58391-0.65991-3.25978-0.99438-4.98105-0.99438
+			c-1.73848,0-3.42914,0.34106-5.02509,1.01367c-0.17586,0.07422-0.35703,0.11353-0.52393,0.11353
+			c-0.09091,0-0.1788-0.01172-0.26134-0.03418c-2.46192-0.67603-4.76518-1.77466-6.84587-3.26514
+			c-0.25853-0.1853-0.38179-0.47144-0.43968-0.67896c-0.94241-3.37842-3.25534-6.26758-6.34586-7.927
+			C2.83313,31.3014,2.581,31.11854,2.45726,30.82606c-0.978-2.31201-1.54013-4.76416-1.67076-7.28809
+			c-0.01299-0.25098,0.07942-0.52612,0.26018-0.77417c2.08139-2.85645,2.90819-6.48853,2.26839-9.96485
+			c-0.05495-0.29858-0.01959-0.58252,0.09959-0.79956c1.21214-2.20898,2.78243-4.17285,4.66736-5.8374
+			c0.23915-0.21118,0.54709-0.26685,0.76309-0.27637c3.51157-0.15356,6.85388-1.75708,9.17006-4.3999
+			c0.14253-0.1626,0.37843-0.36792,0.69257-0.42188C19.91984,0.85559,21.16222,0.75012,22.40043,0.75012 M22.40043,0.00012
+			c-1.30214,0-2.57832,0.11133-3.81961,0.32446c-0.44424,0.07642-0.83269,0.32788-1.12978,0.66699
+			c-2.18831,2.49683-5.32073,3.99976-8.63867,4.14478C8.36261,5.15613,7.92295,5.30188,7.58548,5.59998
+			C5.64724,7.3114,4.01039,9.35462,2.75714,11.63855c-0.21616,0.3938-0.26102,0.85425-0.17969,1.29614
+			c0.60423,3.2832-0.17113,6.6897-2.13692,9.38745c-0.26611,0.36523-0.42638,0.80322-0.40303,1.25464
+			c0.13786,2.66382,0.74008,5.20362,1.72902,7.54151c0.17482,0.41333,0.50638,0.73364,0.9017,0.9458
+			c2.92095,1.56836,5.08759,4.27539,5.97809,7.46753c0.12053,0.43213,0.36067,0.82593,0.72531,1.08716
+			c2.1162,1.51611,4.50704,2.67114,7.08409,3.37866c0.15114,0.0415,0.30553,0.06104,0.4599,0.06104
+			c0.27769,0,0.55553-0.06274,0.81529-0.17236c1.51038-0.63672,3.12221-0.95483,4.7337-0.95483
+			c1.59702,0,3.19373,0.31226,4.69263,0.93677c0.25797,0.10767,0.53363,0.16895,0.80894,0.16895
+			c0.15707,0,0.314-0.02002,0.46758-0.06274c2.62406-0.73242,5.05235-1.9314,7.19296-3.50098
+			c0.3483-0.25537,0.57954-0.63354,0.69945-1.04834c0.89284-3.08936,2.98249-5.71216,5.79366-7.2732
+			c0.37823-0.20996,0.6954-0.52026,0.8662-0.91772c1.04352-2.42847,1.66922-5.07788,1.7883-7.85938
+			c0.01852-0.43262-0.13245-0.85254-0.38205-1.2063c-1.85387-2.62769-2.59697-5.89844-2.05835-9.06934
+			c0.07271-0.42798,0.02777-0.87207-0.17711-1.25488c-1.27029-2.37329-2.95332-4.49243-4.95664-6.25757
+			c-0.32991-0.29077-0.75801-0.43555-1.19708-0.45923c-3.25977-0.17505-6.33017-1.65918-8.49034-4.10816
+			c-0.2935-0.33276-0.67516-0.58081-1.11179-0.65967C25.10281,0.12463,23.76635,0.00012,22.40043,0.00012L22.40043,0.00012z"/>
+	</g>
+	<path opacity="0.47" fill="#242424" d="M22.40044,1.50012c1.24678,0,2.50301,0.11279,3.73368,0.33545
+		c0.07452,0.01343,0.16705,0.07764,0.25372,0.17578c2.41368,2.73633,5.88892,4.41821,9.53479,4.61402
+		c0.12497,0.00659,0.2319,0.03906,0.28595,0.08667c1.88365,1.65967,3.43998,3.62451,4.62584,5.84009
+		c0.03372,0.06299,0.04144,0.17358,0.02071,0.29565c-0.60112,3.53882,0.24139,7.25122,2.31165,10.18555
+		c0.07237,0.10254,0.11209,0.20361,0.10893,0.27734c-0.10883,2.54248-0.66997,5.00904-1.66789,7.3313
+		c-0.02774,0.06445-0.10835,0.13867-0.21622,0.19824c-3.13848,1.74316-5.50998,4.72022-6.50637,8.16821
+		c-0.03415,0.11792-0.08864,0.21362-0.14548,0.25537c-2.03593,1.49268-4.29318,2.59131-6.70934,3.26562
+		c-0.01221,0.00342-0.03326,0.00757-0.06424,0.00757c-0.06584,0-0.15021-0.01953-0.23206-0.05371
+		c-1.67552-0.698-3.44844-1.052-5.26947-1.052c-1.839,0-3.6277,0.36084-5.31674,1.07275
+		c-0.08203,0.03467-0.1667,0.05444-0.23227,0.05444c-0.02357,0-0.04524-0.00269-0.06276-0.00732
+		c-2.37595-0.65259-4.59911-1.71289-6.6075-3.15161c-0.06248-0.04468-0.11867-0.14355-0.15421-0.27075
+		c-0.99701-3.57422-3.444-6.63086-6.71372-8.38648c-0.11613-0.06226-0.19978-0.13818-0.22945-0.2085
+		c-0.94385-2.2312-1.48639-4.59815-1.61252-7.03443c-0.00296-0.05737,0.02602-0.1687,0.11734-0.29395
+		c2.20204-3.02197,3.07674-6.8645,2.39984-10.54224c-0.02722-0.14795-0.00658-0.25562,0.0195-0.30298
+		c1.17032-2.13281,2.68646-4.02905,4.5063-5.63599c0.0576-0.05103,0.16684-0.0835,0.29944-0.08936
+		c3.71512-0.16235,7.2511-1.85913,9.70128-4.65479c0.08733-0.09961,0.18047-0.16431,0.25555-0.177
+		C20.00455,1.60193,21.20423,1.50012,22.40044,1.50012 M22.40044,0.75012c-1.23822,0-2.48059,0.10547-3.69269,0.31372
+		c-0.31415,0.05396-0.55005,0.25928-0.69257,0.42188c-2.31616,2.64282-5.65851,4.24634-9.17005,4.3999
+		c-0.216,0.00952-0.52399,0.06519-0.76312,0.27637c-1.88495,1.66455-3.4552,3.62842-4.66736,5.8374
+		c-0.1192,0.21704-0.15454,0.50098-0.09961,0.79956c0.63983,3.47632-0.18695,7.1084-2.26837,9.96485
+		c-0.18073,0.24805-0.27313,0.52319-0.26019,0.77417c0.13068,2.52393,0.69281,4.97608,1.67078,7.28809
+		c0.12372,0.29248,0.37585,0.47534,0.56561,0.57715c3.09052,1.65942,5.40344,4.54859,6.34589,7.927
+		c0.05786,0.20752,0.18115,0.49365,0.43964,0.67896c2.08069,1.49048,4.38397,2.58911,6.84589,3.26514
+		c0.08252,0.02246,0.17041,0.03418,0.26135,0.03418c0.16687,0,0.34808-0.03931,0.52393-0.11353
+		c1.59595-0.67261,3.28662-1.01367,5.02509-1.01367c1.72125,0,3.39716,0.33447,4.98102,0.99438
+		c0.1748,0.073,0.35474,0.11133,0.52051,0.11133c0.09271,0,0.18225-0.01172,0.26611-0.03516
+		c2.50342-0.69873,4.8421-1.83716,6.95093-3.3833c0.24548-0.18018,0.36523-0.45386,0.42249-0.65186
+		c0.94189-3.25928,3.18353-6.07325,6.15003-7.72071c0.1806-0.1001,0.42102-0.27832,0.5412-0.55811
+		c1.03394-2.40601,1.61536-4.96143,1.72809-7.59522c0.01312-0.30688-0.12628-0.573-0.24554-0.74194
+		c-1.95673-2.77344-2.75311-6.28247-2.18494-9.6272c0.03473-0.20459,0.04578-0.50513-0.09894-0.77539
+		c-1.22815-2.29468-2.84015-4.32983-4.7912-6.04883c-0.23285-0.20508-0.5318-0.26172-0.7417-0.27295
+		c-3.44604-0.18506-6.73102-1.77466-9.01239-4.36108c-0.14093-0.15967-0.37378-0.36182-0.68262-0.41772
+		C24.99334,0.86707,23.69226,0.75012,22.40044,0.75012L22.40044,0.75012z"/>
+	<path opacity="0.6" d="M43.16678,23.0333c-2.07024-2.93427-2.91275-6.64673-2.31163-10.18555
+		c0.02075-0.12207,0.01297-0.23262-0.02075-0.29564c-1.18584-2.21558-2.74216-4.18038-4.62578-5.84007
+		c-0.0541-0.04761-0.16098-0.08011-0.28595-0.08667c-3.64594-0.19577-7.12112-1.87767-9.53484-4.61403
+		c-0.08667-0.09811-0.17922-0.16235-0.25368-0.17578c-1.2307-0.22263-2.48695-0.33546-3.73367-0.33546
+		c-1.19621,0-2.39594,0.10185-3.56575,0.30304c-0.07507,0.01266-0.16823,0.07736-0.25551,0.177
+		C16.12904,4.77577,12.59304,6.47255,8.8779,6.6349c-0.1326,0.00587-0.24185,0.0383-0.29945,0.08934
+		c-1.81984,1.6069-3.33595,3.50319-4.5063,5.63599c-0.02602,0.04738-0.04669,0.15503-0.01945,0.30296
+		c0.67688,3.67775-0.19783,7.5203-2.39983,10.54222c-0.09132,0.12527-0.12032,0.23659-0.11734,0.29396
+		c0.12611,2.43629,0.66864,4.80324,1.61247,7.03446c0.02968,0.07027,0.1133,0.14626,0.22949,0.20851
+		c3.26965,1.7556,5.71671,4.81224,6.71372,8.38646c0.03548,0.12718,0.09171,0.22606,0.15419,0.27077
+		c2.00836,1.43867,4.23157,2.49901,6.60752,3.15155c0.01747,0.00465,0.03914,0.00732,0.06271,0.00732
+		c0.06561,0,0.15022-0.01976,0.23232-0.0544c1.689-0.7119,3.47771-1.07277,5.3167-1.07277c1.82106,0,3.59398,0.354,5.26947,1.05202
+		c0.08186,0.03418,0.16624,0.05371,0.23209,0.05371c0.03098,0,0.05203-0.0042,0.06424-0.00755
+		c2.41615-0.67436,4.67339-1.77299,6.70929-3.26569c0.05684-0.04173,0.11139-0.13741,0.14549-0.25536
+		c0.9964-3.44795,3.36792-6.42502,6.50635-8.16818c0.10788-0.05959,0.18852-0.13382,0.21622-0.19829
+		c0.99792-2.32224,1.55907-4.78882,1.66794-7.33124C43.27885,23.23693,43.23918,23.13584,43.16678,23.0333z M22.4004,37.56196
+		c-8.37349,0-15.1616-6.7881-15.1616-15.16152c0-8.37349,6.7881-15.16159,15.1616-15.16159s15.16152,6.7881,15.16152,15.16159
+		C37.56192,30.77386,30.77389,37.56196,22.4004,37.56196z"/>
+	<path fill="#E3E3E3" d="M23.46128,0.02557h-2.11143v7.27744c0,0.45242,0.36676,0.81919,0.81919,0.81919h0.47305
+		c0.45243,0,0.81919-0.36676,0.81919-0.81919V0.02557z"/>
+</g>
+</svg>