diff --git a/cells/a21o/sky130_fd_sc_hvl__a21o_1.svg b/cells/a21o/sky130_fd_sc_hvl__a21o_1.svg
index 6ff7aeb..4b44ba6 100644
--- a/cells/a21o/sky130_fd_sc_hvl__a21o_1.svg
+++ b/cells/a21o/sky130_fd_sc_hvl__a21o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 488.5 98.5 L 1436.5 98.5 L 1436.5 593.5 L 488.5 593.5 Z M 488.5 98.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image350"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 551.5 161.5 L 1373.5 161.5 L 1373.5 193.5 L 551.5 193.5 Z M 551.5 161.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image351"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 551.5 161.5 L 1373.5 161.5 L 1373.5 193.5 L 551.5 193.5 Z M 594.5 707.5 L 1340.5 707.5 L 1340.5 715.5 L 594.5 715.5 Z M 594.5 715.5 L 1340.5 715.5 L 1340.5 747.5 L 594.5 747.5 Z M 594.5 747.5 L 1340.5 747.5 L 1340.5 810.5 L 594.5 810.5 Z M 594.5 810.5 L 1340.5 810.5 L 1340.5 842.5 L 594.5 842.5 Z M 594.5 842.5 L 1340.5 842.5 L 1340.5 850.5 L 594.5 850.5 Z M 594.5 842.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 551.5 935.5 L 1373.5 935.5 L 1373.5 968.5 L 551.5 968.5 Z M 551.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image351"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1145.5 245.5 L 1199.5 245.5 L 1199.5 252.5 L 1145.5 252.5 Z M 997.5 245.5 L 1050.5 245.5 L 1050.5 252.5 L 997.5 252.5 Z M 848.5 245.5 L 902.5 245.5 L 902.5 252.5 L 848.5 252.5 Z M 725.5 245.5 L 779.5 245.5 L 779.5 252.5 L 725.5 252.5 Z M 1294.5 245.5 L 1344.5 245.5 L 1344.5 256.5 L 1294.5 256.5 Z M 579.5 245.5 L 630.5 245.5 L 630.5 256.5 L 579.5 256.5 Z M 1145.5 252.5 L 1199.5 252.5 L 1199.5 285.5 L 1145.5 285.5 Z M 997.5 252.5 L 1050.5 252.5 L 1050.5 285.5 L 997.5 285.5 Z M 725.5 252.5 L 779.5 252.5 L 779.5 285.5 L 725.5 285.5 Z M 848.5 252.5 L 902.5 252.5 L 902.5 285.5 L 848.5 285.5 Z M 579.5 256.5 L 630.5 256.5 L 630.5 288.5 L 579.5 288.5 Z M 1294.5 256.5 L 1344.5 256.5 L 1344.5 288.5 L 1294.5 288.5 Z M 725.5 285.5 L 779.5 285.5 L 779.5 329.5 L 725.5 329.5 Z M 997.5 285.5 L 1050.5 285.5 L 1050.5 329.5 L 997.5 329.5 Z M 848.5 285.5 L 902.5 285.5 L 902.5 331.5 L 848.5 331.5 Z M 579.5 288.5 L 630.5 288.5 L 630.5 332.5 L 579.5 332.5 Z M 1294.5 288.5 L 1344.5 288.5 L 1344.5 332.5 L 1294.5 332.5 Z M 1145.5 285.5 L 1199.5 285.5 L 1199.5 336.5 L 1145.5 336.5 Z M 725.5 329.5 L 779.5 329.5 L 779.5 362.5 L 725.5 362.5 Z M 997.5 329.5 L 1050.5 329.5 L 1050.5 362.5 L 997.5 362.5 Z M 848.5 331.5 L 902.5 331.5 L 902.5 364.5 L 848.5 364.5 Z M 1294.5 332.5 L 1344.5 332.5 L 1344.5 365.5 L 1294.5 365.5 Z M 579.5 332.5 L 630.5 332.5 L 630.5 365.5 L 579.5 365.5 Z M 1145.5 336.5 L 1199.5 336.5 L 1199.5 368.5 L 1145.5 368.5 Z M 997.5 362.5 L 1050.5 362.5 L 1050.5 408.5 L 997.5 408.5 Z M 725.5 362.5 L 779.5 362.5 L 779.5 408.5 L 725.5 408.5 Z M 1294.5 365.5 L 1344.5 365.5 L 1344.5 410.5 L 1294.5 410.5 Z M 579.5 365.5 L 630.5 365.5 L 630.5 410.5 L 579.5 410.5 Z M 848.5 364.5 L 902.5 364.5 L 902.5 411.5 L 848.5 411.5 Z M 1145.5 368.5 L 1199.5 368.5 L 1199.5 419.5 L 1145.5 419.5 Z M 725.5 408.5 L 779.5 408.5 L 779.5 441.5 L 725.5 441.5 Z M 997.5 408.5 L 1050.5 408.5 L 1050.5 441.5 L 997.5 441.5 Z M 1294.5 410.5 L 1344.5 410.5 L 1344.5 443.5 L 1294.5 443.5 Z M 579.5 410.5 L 630.5 410.5 L 630.5 443.5 L 579.5 443.5 Z M 848.5 411.5 L 902.5 411.5 L 902.5 444.5 L 848.5 444.5 Z M 1145.5 419.5 L 1199.5 419.5 L 1199.5 451.5 L 1145.5 451.5 Z M 725.5 441.5 L 779.5 441.5 L 779.5 485.5 L 725.5 485.5 Z M 997.5 441.5 L 1050.5 441.5 L 1050.5 485.5 L 997.5 485.5 Z M 1294.5 443.5 L 1344.5 443.5 L 1344.5 486.5 L 1294.5 486.5 Z M 579.5 443.5 L 630.5 443.5 L 630.5 486.5 L 579.5 486.5 Z M 848.5 444.5 L 902.5 444.5 L 902.5 490.5 L 848.5 490.5 Z M 725.5 485.5 L 779.5 485.5 L 779.5 518.5 L 725.5 518.5 Z M 997.5 485.5 L 1050.5 485.5 L 1050.5 518.5 L 997.5 518.5 Z M 1294.5 486.5 L 1344.5 486.5 L 1344.5 519.5 L 1294.5 519.5 Z M 579.5 486.5 L 630.5 486.5 L 630.5 519.5 L 579.5 519.5 Z M 848.5 490.5 L 902.5 490.5 L 902.5 522.5 L 848.5 522.5 Z M 725.5 518.5 L 779.5 518.5 L 779.5 530.5 L 725.5 530.5 Z M 579.5 519.5 L 630.5 519.5 L 630.5 530.5 L 579.5 530.5 Z M 848.5 522.5 L 902.5 522.5 L 902.5 530.5 L 848.5 530.5 Z M 997.5 518.5 L 1050.5 518.5 L 1050.5 530.5 L 997.5 530.5 Z M 1145.5 451.5 L 1199.5 451.5 L 1199.5 530.5 L 1145.5 530.5 Z M 1294.5 519.5 L 1344.5 519.5 L 1344.5 530.5 L 1294.5 530.5 Z M 551.5 935.5 L 1373.5 935.5 L 1373.5 968.5 L 551.5 968.5 Z M 551.5 935.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1191.5 707.5 L 1286.5 707.5 L 1286.5 850.5 L 1191.5 850.5 Z M 649.5 707.5 L 744.5 707.5 L 744.5 850.5 L 649.5 850.5 Z M 908.5 707.5 L 1003.5 707.5 L 1003.5 850.5 L 908.5 850.5 Z M 1056.5 707.5 L 1151.5 707.5 L 1151.5 850.5 L 1056.5 850.5 Z M 1056.5 707.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1199.5 245.5 L 1294.5 245.5 L 1294.5 530.5 L 1199.5 530.5 Z M 630.5 245.5 L 725.5 245.5 L 725.5 530.5 L 630.5 530.5 Z M 902.5 245.5 L 997.5 245.5 L 997.5 530.5 L 902.5 530.5 Z M 1050.5 245.5 L 1145.5 245.5 L 1145.5 530.5 L 1050.5 530.5 Z M 1050.5 245.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 580.5 161.5 L 613.5 161.5 L 613.5 193.5 L 580.5 193.5 Z M 1311.5 161.5 L 1343.5 161.5 L 1343.5 193.5 L 1311.5 193.5 Z M 1220.5 161.5 L 1252.5 161.5 L 1252.5 193.5 L 1220.5 193.5 Z M 1128.5 161.5 L 1161.5 161.5 L 1161.5 193.5 L 1128.5 193.5 Z M 1037.5 161.5 L 1069.5 161.5 L 1069.5 193.5 L 1037.5 193.5 Z M 946.5 161.5 L 978.5 161.5 L 978.5 193.5 L 946.5 193.5 Z M 854.5 161.5 L 887.5 161.5 L 887.5 193.5 L 854.5 193.5 Z M 763.5 161.5 L 795.5 161.5 L 795.5 193.5 L 763.5 193.5 Z M 672.5 161.5 L 704.5 161.5 L 704.5 193.5 L 672.5 193.5 Z M 654.5 252.5 L 687.5 252.5 L 687.5 285.5 L 654.5 285.5 Z M 1232.5 252.5 L 1264.5 252.5 L 1264.5 285.5 L 1232.5 285.5 Z M 1163.5 252.5 L 1196.5 252.5 L 1196.5 285.5 L 1163.5 285.5 Z M 1095.5 252.5 L 1127.5 252.5 L 1127.5 285.5 L 1095.5 285.5 Z M 791.5 252.5 L 824.5 252.5 L 824.5 285.5 L 791.5 285.5 Z M 723.5 252.5 L 755.5 252.5 L 755.5 285.5 L 723.5 285.5 Z M 672.5 844.5 L 705.5 844.5 L 705.5 876.5 L 672.5 876.5 Z M 1306.5 844.5 L 1339.5 844.5 L 1339.5 876.5 L 1306.5 876.5 Z M 1238.5 844.5 L 1270.5 844.5 L 1270.5 876.5 L 1238.5 876.5 Z M 1169.5 844.5 L 1202.5 844.5 L 1202.5 876.5 L 1169.5 876.5 Z M 1101.5 844.5 L 1133.5 844.5 L 1133.5 876.5 L 1101.5 876.5 Z M 947.5 844.5 L 979.5 844.5 L 979.5 876.5 L 947.5 876.5 Z M 878.5 844.5 L 910.5 844.5 L 910.5 876.5 L 878.5 876.5 Z M 809.5 844.5 L 842.5 844.5 L 842.5 876.5 L 809.5 876.5 Z M 741.5 844.5 L 773.5 844.5 L 773.5 876.5 L 741.5 876.5 Z M 580.5 935.5 L 613.5 935.5 L 613.5 968.5 L 580.5 968.5 Z M 1311.5 935.5 L 1343.5 935.5 L 1343.5 968.5 L 1311.5 968.5 Z M 1220.5 935.5 L 1252.5 935.5 L 1252.5 968.5 L 1220.5 968.5 Z M 1128.5 935.5 L 1161.5 935.5 L 1161.5 968.5 L 1128.5 968.5 Z M 1037.5 935.5 L 1069.5 935.5 L 1069.5 968.5 L 1037.5 968.5 Z M 946.5 935.5 L 978.5 935.5 L 978.5 968.5 L 946.5 968.5 Z M 854.5 935.5 L 887.5 935.5 L 887.5 968.5 L 854.5 968.5 Z M 763.5 935.5 L 795.5 935.5 L 795.5 968.5 L 763.5 968.5 Z M 672.5 935.5 L 704.5 935.5 L 704.5 968.5 L 672.5 968.5 Z M 672.5 935.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface347">
+<g id="surface376">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -216,6 +216,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 600.433594 352.519531 L 614.910156 373.5 L 608.457031 373.5 L 597.292969 356.445312 L 586.074219 373.5 L 579.734375 373.5 L 594.207031 352.519531 L 580.632812 332.601562 L 586.972656 332.601562 L 597.460938 348.648438 L 608.007812 332.601562 L 614.234375 332.601562 Z M 600.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 580 742 L 613 742 M 580 710 L 613 710 M 580 710 L 580 742 M 613 710 L 613 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 580 742 L 613 742 M 580 710 L 613 710 M 613 742 L 613 710 M 580 742 L 580 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 551 122 L 551 131 M 546 127 L 555 127 M 550 128 L 552 128 M 550 126 L 552 126 M 550 126 L 550 128 M 552 126 L 552 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.svg b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.svg
index 36e7ced..46a9eeb 100644
--- a/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.svg
+++ b/cells/a21oi/sky130_fd_sc_hvl__a21oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 751.5 707.5 L 1254.5 707.5 L 1254.5 715.5 L 751.5 715.5 Z M 751.5 715.5 L 1254.5 715.5 L 1254.5 747.5 L 751.5 747.5 Z M 751.5 747.5 L 1254.5 747.5 L 1254.5 810.5 L 751.5 810.5 Z M 751.5 810.5 L 1254.5 810.5 L 1254.5 842.5 L 751.5 842.5 Z M 751.5 842.5 L 1254.5 842.5 L 1254.5 850.5 L 751.5 850.5 Z M 751.5 842.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 696.5 245.5 L 751.5 245.5 L 751.5 252.5 L 696.5 252.5 Z M 1036.5 245.5 L 1089.5 245.5 L 1089.5 252.5 L 1036.5 252.5 Z M 1184.5 245.5 L 1254.5 245.5 L 1254.5 252.5 L 1184.5 252.5 Z M 846.5 245.5 L 941.5 245.5 L 941.5 252.5 L 846.5 252.5 Z M 846.5 252.5 L 941.5 252.5 L 941.5 285.5 L 846.5 285.5 Z M 696.5 252.5 L 751.5 252.5 L 751.5 285.5 L 696.5 285.5 Z M 1036.5 252.5 L 1089.5 252.5 L 1089.5 285.5 L 1036.5 285.5 Z M 1184.5 252.5 L 1254.5 252.5 L 1254.5 285.5 L 1184.5 285.5 Z M 846.5 285.5 L 941.5 285.5 L 941.5 329.5 L 846.5 329.5 Z M 696.5 285.5 L 751.5 285.5 L 751.5 331.5 L 696.5 331.5 Z M 1184.5 285.5 L 1254.5 285.5 L 1254.5 331.5 L 1184.5 331.5 Z M 1036.5 285.5 L 1089.5 285.5 L 1089.5 331.5 L 1036.5 331.5 Z M 846.5 329.5 L 941.5 329.5 L 941.5 362.5 L 846.5 362.5 Z M 1184.5 331.5 L 1254.5 331.5 L 1254.5 364.5 L 1184.5 364.5 Z M 696.5 331.5 L 751.5 331.5 L 751.5 364.5 L 696.5 364.5 Z M 1036.5 331.5 L 1089.5 331.5 L 1089.5 364.5 L 1036.5 364.5 Z M 846.5 362.5 L 941.5 362.5 L 941.5 408.5 L 846.5 408.5 Z M 696.5 364.5 L 751.5 364.5 L 751.5 411.5 L 696.5 411.5 Z M 1036.5 364.5 L 1089.5 364.5 L 1089.5 411.5 L 1036.5 411.5 Z M 1184.5 364.5 L 1254.5 364.5 L 1254.5 411.5 L 1184.5 411.5 Z M 846.5 408.5 L 941.5 408.5 L 941.5 441.5 L 846.5 441.5 Z M 1036.5 411.5 L 1089.5 411.5 L 1089.5 444.5 L 1036.5 444.5 Z M 696.5 411.5 L 751.5 411.5 L 751.5 444.5 L 696.5 444.5 Z M 1184.5 411.5 L 1254.5 411.5 L 1254.5 444.5 L 1184.5 444.5 Z M 846.5 441.5 L 941.5 441.5 L 941.5 485.5 L 846.5 485.5 Z M 696.5 444.5 L 751.5 444.5 L 751.5 490.5 L 696.5 490.5 Z M 1184.5 444.5 L 1254.5 444.5 L 1254.5 490.5 L 1184.5 490.5 Z M 1036.5 444.5 L 1089.5 444.5 L 1089.5 490.5 L 1036.5 490.5 Z M 846.5 485.5 L 941.5 485.5 L 941.5 518.5 L 846.5 518.5 Z M 696.5 490.5 L 751.5 490.5 L 751.5 522.5 L 696.5 522.5 Z M 1036.5 490.5 L 1089.5 490.5 L 1089.5 522.5 L 1036.5 522.5 Z M 1184.5 490.5 L 1254.5 490.5 L 1254.5 522.5 L 1184.5 522.5 Z M 1036.5 522.5 L 1089.5 522.5 L 1089.5 530.5 L 1036.5 530.5 Z M 696.5 522.5 L 751.5 522.5 L 751.5 530.5 L 696.5 530.5 Z M 846.5 518.5 L 941.5 518.5 L 941.5 530.5 L 846.5 530.5 Z M 1184.5 522.5 L 1254.5 522.5 L 1254.5 530.5 L 1184.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1108.5 707.5 L 1203.5 707.5 L 1203.5 850.5 L 1108.5 850.5 Z M 806.5 707.5 L 901.5 707.5 L 901.5 850.5 L 806.5 850.5 Z M 941.5 707.5 L 1036.5 707.5 L 1036.5 850.5 L 941.5 850.5 Z M 941.5 707.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1089.5 245.5 L 1184.5 245.5 L 1184.5 530.5 L 1089.5 530.5 Z M 751.5 245.5 L 846.5 245.5 L 846.5 530.5 L 751.5 530.5 Z M 941.5 245.5 L 1036.5 245.5 L 1036.5 530.5 L 941.5 530.5 Z M 941.5 245.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 774.5 252.5 L 807.5 252.5 L 807.5 285.5 L 774.5 285.5 Z M 980.5 252.5 L 1012.5 252.5 L 1012.5 285.5 L 980.5 285.5 Z M 911.5 252.5 L 944.5 252.5 L 944.5 285.5 L 911.5 285.5 Z M 843.5 252.5 L 875.5 252.5 L 875.5 285.5 L 843.5 285.5 Z M 715.5 844.5 L 748.5 844.5 L 748.5 876.5 L 715.5 876.5 Z M 1226.5 844.5 L 1259.5 844.5 L 1259.5 876.5 L 1226.5 876.5 Z M 1158.5 844.5 L 1190.5 844.5 L 1190.5 876.5 L 1158.5 876.5 Z M 989.5 844.5 L 1022.5 844.5 L 1022.5 876.5 L 989.5 876.5 Z M 921.5 844.5 L 953.5 844.5 L 953.5 876.5 L 921.5 876.5 Z M 852.5 844.5 L 885.5 844.5 L 885.5 876.5 L 852.5 876.5 Z M 784.5 844.5 L 816.5 844.5 L 816.5 876.5 L 784.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface354">
+<g id="surface383">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -218,6 +218,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1240.210938 357.457031 L 1240.210938 373.5 L 1234.992188 373.5 L 1234.992188 357.457031 L 1219.230469 332.601562 L 1225.679688 332.601562 L 1237.6875 352.519531 L 1249.355469 332.601562 L 1255.582031 332.601562 Z M 1240.210938 357.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1221 742 L 1253 742 M 1221 710 L 1253 710 M 1221 710 L 1221 742 M 1253 710 L 1253 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1221 742 L 1253 742 M 1221 710 L 1253 710 M 1253 742 L 1253 710 M 1221 742 L 1221 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22o/sky130_fd_sc_hvl__a22o_1.svg b/cells/a22o/sky130_fd_sc_hvl__a22o_1.svg
index 70381d1..b8639cf 100644
--- a/cells/a22o/sky130_fd_sc_hvl__a22o_1.svg
+++ b/cells/a22o/sky130_fd_sc_hvl__a22o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 396.5 98.5 L 1526.5 98.5 L 1526.5 593.5 L 396.5 593.5 Z M 396.5 98.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 458.5 161.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 487.5 707.5 L 1430.5 707.5 L 1430.5 718.5 L 487.5 718.5 Z M 487.5 718.5 L 1430.5 718.5 L 1430.5 751.5 L 487.5 751.5 Z M 487.5 751.5 L 1430.5 751.5 L 1430.5 806.5 L 487.5 806.5 Z M 487.5 806.5 L 1430.5 806.5 L 1430.5 838.5 L 487.5 838.5 Z M 487.5 838.5 L 1430.5 838.5 L 1430.5 850.5 L 487.5 850.5 Z M 487.5 838.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 487.5 245.5 L 541.5 245.5 L 541.5 252.5 L 487.5 252.5 Z M 759.5 245.5 L 844.5 245.5 L 844.5 252.5 L 759.5 252.5 Z M 1236.5 245.5 L 1289.5 245.5 L 1289.5 252.5 L 1236.5 252.5 Z M 1087.5 245.5 L 1141.5 245.5 L 1141.5 252.5 L 1087.5 252.5 Z M 636.5 245.5 L 691.5 245.5 L 691.5 252.5 L 636.5 252.5 Z M 1384.5 245.5 L 1435.5 245.5 L 1435.5 256.5 L 1384.5 256.5 Z M 1087.5 252.5 L 1141.5 252.5 L 1141.5 285.5 L 1087.5 285.5 Z M 487.5 252.5 L 541.5 252.5 L 541.5 285.5 L 487.5 285.5 Z M 759.5 252.5 L 844.5 252.5 L 844.5 285.5 L 759.5 285.5 Z M 1236.5 252.5 L 1289.5 252.5 L 1289.5 285.5 L 1236.5 285.5 Z M 636.5 252.5 L 691.5 252.5 L 691.5 285.5 L 636.5 285.5 Z M 1384.5 256.5 L 1435.5 256.5 L 1435.5 288.5 L 1384.5 288.5 Z M 939.5 245.5 L 992.5 245.5 L 992.5 294.5 L 939.5 294.5 Z M 939.5 294.5 L 992.5 294.5 L 992.5 326.5 L 939.5 326.5 Z M 1236.5 285.5 L 1289.5 285.5 L 1289.5 329.5 L 1236.5 329.5 Z M 636.5 285.5 L 691.5 285.5 L 691.5 331.5 L 636.5 331.5 Z M 1087.5 285.5 L 1141.5 285.5 L 1141.5 331.5 L 1087.5 331.5 Z M 759.5 285.5 L 844.5 285.5 L 844.5 331.5 L 759.5 331.5 Z M 487.5 285.5 L 541.5 285.5 L 541.5 331.5 L 487.5 331.5 Z M 1384.5 288.5 L 1435.5 288.5 L 1435.5 332.5 L 1384.5 332.5 Z M 939.5 326.5 L 992.5 326.5 L 992.5 359.5 L 939.5 359.5 Z M 1236.5 329.5 L 1289.5 329.5 L 1289.5 362.5 L 1236.5 362.5 Z M 487.5 331.5 L 541.5 331.5 L 541.5 364.5 L 487.5 364.5 Z M 759.5 331.5 L 844.5 331.5 L 844.5 364.5 L 759.5 364.5 Z M 1087.5 331.5 L 1141.5 331.5 L 1141.5 364.5 L 1087.5 364.5 Z M 636.5 331.5 L 691.5 331.5 L 691.5 364.5 L 636.5 364.5 Z M 1384.5 332.5 L 1435.5 332.5 L 1435.5 365.5 L 1384.5 365.5 Z M 939.5 359.5 L 992.5 359.5 L 992.5 391.5 L 939.5 391.5 Z M 1236.5 362.5 L 1289.5 362.5 L 1289.5 408.5 L 1236.5 408.5 Z M 1384.5 365.5 L 1435.5 365.5 L 1435.5 410.5 L 1384.5 410.5 Z M 759.5 364.5 L 844.5 364.5 L 844.5 411.5 L 759.5 411.5 Z M 1087.5 364.5 L 1141.5 364.5 L 1141.5 411.5 L 1087.5 411.5 Z M 487.5 364.5 L 541.5 364.5 L 541.5 411.5 L 487.5 411.5 Z M 636.5 364.5 L 691.5 364.5 L 691.5 411.5 L 636.5 411.5 Z M 939.5 391.5 L 992.5 391.5 L 992.5 425.5 L 939.5 425.5 Z M 1236.5 408.5 L 1289.5 408.5 L 1289.5 441.5 L 1236.5 441.5 Z M 1384.5 410.5 L 1435.5 410.5 L 1435.5 443.5 L 1384.5 443.5 Z M 636.5 411.5 L 691.5 411.5 L 691.5 444.5 L 636.5 444.5 Z M 759.5 411.5 L 844.5 411.5 L 844.5 444.5 L 759.5 444.5 Z M 1087.5 411.5 L 1141.5 411.5 L 1141.5 444.5 L 1087.5 444.5 Z M 487.5 411.5 L 541.5 411.5 L 541.5 444.5 L 487.5 444.5 Z M 939.5 425.5 L 992.5 425.5 L 992.5 458.5 L 939.5 458.5 Z M 1236.5 441.5 L 1289.5 441.5 L 1289.5 485.5 L 1236.5 485.5 Z M 1384.5 443.5 L 1435.5 443.5 L 1435.5 486.5 L 1384.5 486.5 Z M 939.5 458.5 L 992.5 458.5 L 992.5 490.5 L 939.5 490.5 Z M 1087.5 444.5 L 1141.5 444.5 L 1141.5 490.5 L 1087.5 490.5 Z M 759.5 444.5 L 844.5 444.5 L 844.5 490.5 L 759.5 490.5 Z M 487.5 444.5 L 541.5 444.5 L 541.5 490.5 L 487.5 490.5 Z M 636.5 444.5 L 691.5 444.5 L 691.5 490.5 L 636.5 490.5 Z M 1236.5 485.5 L 1289.5 485.5 L 1289.5 518.5 L 1236.5 518.5 Z M 1384.5 486.5 L 1435.5 486.5 L 1435.5 519.5 L 1384.5 519.5 Z M 1087.5 490.5 L 1141.5 490.5 L 1141.5 522.5 L 1087.5 522.5 Z M 636.5 490.5 L 691.5 490.5 L 691.5 522.5 L 636.5 522.5 Z M 939.5 490.5 L 992.5 490.5 L 992.5 522.5 L 939.5 522.5 Z M 487.5 490.5 L 541.5 490.5 L 541.5 522.5 L 487.5 522.5 Z M 759.5 490.5 L 844.5 490.5 L 844.5 522.5 L 759.5 522.5 Z M 1087.5 522.5 L 1141.5 522.5 L 1141.5 530.5 L 1087.5 530.5 Z M 1384.5 519.5 L 1435.5 519.5 L 1435.5 530.5 L 1384.5 530.5 Z M 759.5 522.5 L 844.5 522.5 L 844.5 530.5 L 759.5 530.5 Z M 487.5 522.5 L 541.5 522.5 L 541.5 530.5 L 487.5 530.5 Z M 939.5 522.5 L 992.5 522.5 L 992.5 530.5 L 939.5 530.5 Z M 636.5 522.5 L 691.5 522.5 L 691.5 530.5 L 636.5 530.5 Z M 1236.5 518.5 L 1289.5 518.5 L 1289.5 530.5 L 1236.5 530.5 Z M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1281.5 707.5 L 1376.5 707.5 L 1376.5 850.5 L 1281.5 850.5 Z M 537.5 707.5 L 633.5 707.5 L 633.5 850.5 L 537.5 850.5 Z M 857.5 707.5 L 952.5 707.5 L 952.5 850.5 L 857.5 850.5 Z M 992.5 707.5 L 1087.5 707.5 L 1087.5 850.5 L 992.5 850.5 Z M 1145.5 707.5 L 1241.5 707.5 L 1241.5 850.5 L 1145.5 850.5 Z M 1145.5 707.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1289.5 245.5 L 1384.5 245.5 L 1384.5 530.5 L 1289.5 530.5 Z M 541.5 245.5 L 636.5 245.5 L 636.5 530.5 L 541.5 530.5 Z M 844.5 245.5 L 939.5 245.5 L 939.5 530.5 L 844.5 530.5 Z M 992.5 245.5 L 1087.5 245.5 L 1087.5 530.5 L 992.5 530.5 Z M 1141.5 245.5 L 1236.5 245.5 L 1236.5 530.5 L 1141.5 530.5 Z M 1141.5 245.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image414"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 488.5 161.5 L 520.5 161.5 L 520.5 193.5 L 488.5 193.5 Z M 1401.5 161.5 L 1434.5 161.5 L 1434.5 193.5 L 1401.5 193.5 Z M 1310.5 161.5 L 1342.5 161.5 L 1342.5 193.5 L 1310.5 193.5 Z M 1219.5 161.5 L 1251.5 161.5 L 1251.5 193.5 L 1219.5 193.5 Z M 1127.5 161.5 L 1160.5 161.5 L 1160.5 193.5 L 1127.5 193.5 Z M 1036.5 161.5 L 1068.5 161.5 L 1068.5 193.5 L 1036.5 193.5 Z M 945.5 161.5 L 977.5 161.5 L 977.5 193.5 L 945.5 193.5 Z M 853.5 161.5 L 886.5 161.5 L 886.5 193.5 L 853.5 193.5 Z M 762.5 161.5 L 794.5 161.5 L 794.5 193.5 L 762.5 193.5 Z M 671.5 161.5 L 703.5 161.5 L 703.5 193.5 L 671.5 193.5 Z M 579.5 161.5 L 612.5 161.5 L 612.5 193.5 L 579.5 193.5 Z M 566.5 252.5 L 598.5 252.5 L 598.5 285.5 L 566.5 285.5 Z M 1307.5 252.5 L 1339.5 252.5 L 1339.5 285.5 L 1307.5 285.5 Z M 1239.5 252.5 L 1271.5 252.5 L 1271.5 285.5 L 1239.5 285.5 Z M 1170.5 252.5 L 1202.5 252.5 L 1202.5 285.5 L 1170.5 285.5 Z M 703.5 252.5 L 735.5 252.5 L 735.5 285.5 L 703.5 285.5 Z M 634.5 252.5 L 667.5 252.5 L 667.5 285.5 L 634.5 285.5 Z M 573.5 844.5 L 605.5 844.5 L 605.5 876.5 L 573.5 876.5 Z M 1396.5 844.5 L 1428.5 844.5 L 1428.5 876.5 L 1396.5 876.5 Z M 1327.5 844.5 L 1359.5 844.5 L 1359.5 876.5 L 1327.5 876.5 Z M 1259.5 844.5 L 1291.5 844.5 L 1291.5 876.5 L 1259.5 876.5 Z M 1190.5 844.5 L 1222.5 844.5 L 1222.5 876.5 L 1190.5 876.5 Z M 847.5 844.5 L 879.5 844.5 L 879.5 876.5 L 847.5 876.5 Z M 778.5 844.5 L 810.5 844.5 L 810.5 876.5 L 778.5 876.5 Z M 710.5 844.5 L 742.5 844.5 L 742.5 876.5 L 710.5 876.5 Z M 641.5 844.5 L 673.5 844.5 L 673.5 876.5 L 641.5 876.5 Z M 488.5 935.5 L 520.5 935.5 L 520.5 968.5 L 488.5 968.5 Z M 1401.5 935.5 L 1434.5 935.5 L 1434.5 968.5 L 1401.5 968.5 Z M 1310.5 935.5 L 1342.5 935.5 L 1342.5 968.5 L 1310.5 968.5 Z M 1219.5 935.5 L 1251.5 935.5 L 1251.5 968.5 L 1219.5 968.5 Z M 1127.5 935.5 L 1160.5 935.5 L 1160.5 968.5 L 1127.5 968.5 Z M 1036.5 935.5 L 1068.5 935.5 L 1068.5 968.5 L 1036.5 968.5 Z M 945.5 935.5 L 977.5 935.5 L 977.5 968.5 L 945.5 968.5 Z M 853.5 935.5 L 886.5 935.5 L 886.5 968.5 L 853.5 968.5 Z M 762.5 935.5 L 794.5 935.5 L 794.5 968.5 L 762.5 968.5 Z M 671.5 935.5 L 703.5 935.5 L 703.5 968.5 L 671.5 968.5 Z M 579.5 935.5 L 612.5 935.5 L 612.5 968.5 L 579.5 968.5 Z M 579.5 935.5 "/>
 </clipPath>
-<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image386"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface377">
+<g id="surface406">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -236,6 +236,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 508.433594 352.519531 L 522.910156 373.5 L 516.457031 373.5 L 505.292969 356.445312 L 494.074219 373.5 L 487.734375 373.5 L 502.207031 352.519531 L 488.632812 332.601562 L 494.972656 332.601562 L 505.460938 348.648438 L 516.007812 332.601562 L 522.234375 332.601562 Z M 508.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 488 742 L 520 742 M 488 710 L 520 710 M 488 710 L 488 742 M 520 710 L 520 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 488 742 L 520 742 M 488 710 L 520 710 M 520 742 L 520 710 M 488 742 L 488 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 458 122 L 458 131 M 453 127 L 462 127 M 457 128 L 459 128 M 457 126 L 459 126 M 457 126 L 457 128 M 459 126 L 459 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.svg b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.svg
index 2dc0616..af093b0 100644
--- a/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.svg
+++ b/cells/a22oi/sky130_fd_sc_hvl__a22oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 535.5 98.5 L 1391.5 98.5 L 1391.5 593.5 L 535.5 593.5 Z M 535.5 98.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 597.5 161.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 642.5 707.5 L 1264.5 707.5 L 1264.5 715.5 L 642.5 715.5 Z M 642.5 715.5 L 1264.5 715.5 L 1264.5 747.5 L 642.5 747.5 Z M 642.5 747.5 L 1264.5 747.5 L 1264.5 810.5 L 642.5 810.5 Z M 642.5 810.5 L 1264.5 810.5 L 1264.5 842.5 L 642.5 842.5 Z M 642.5 842.5 L 1264.5 842.5 L 1264.5 850.5 L 642.5 850.5 Z M 642.5 842.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 629.5 245.5 L 683.5 245.5 L 683.5 252.5 L 629.5 252.5 Z M 1075.5 245.5 L 1128.5 245.5 L 1128.5 252.5 L 1075.5 252.5 Z M 927.5 245.5 L 980.5 245.5 L 980.5 252.5 L 927.5 252.5 Z M 1223.5 245.5 L 1278.5 245.5 L 1278.5 252.5 L 1223.5 252.5 Z M 927.5 252.5 L 980.5 252.5 L 980.5 285.5 L 927.5 285.5 Z M 1223.5 252.5 L 1278.5 252.5 L 1278.5 285.5 L 1223.5 285.5 Z M 629.5 252.5 L 683.5 252.5 L 683.5 285.5 L 629.5 285.5 Z M 1075.5 252.5 L 1128.5 252.5 L 1128.5 285.5 L 1075.5 285.5 Z M 778.5 245.5 L 831.5 245.5 L 831.5 294.5 L 778.5 294.5 Z M 778.5 294.5 L 831.5 294.5 L 831.5 326.5 L 778.5 326.5 Z M 1075.5 285.5 L 1128.5 285.5 L 1128.5 329.5 L 1075.5 329.5 Z M 927.5 285.5 L 980.5 285.5 L 980.5 331.5 L 927.5 331.5 Z M 629.5 285.5 L 683.5 285.5 L 683.5 331.5 L 629.5 331.5 Z M 1223.5 285.5 L 1278.5 285.5 L 1278.5 331.5 L 1223.5 331.5 Z M 778.5 326.5 L 831.5 326.5 L 831.5 359.5 L 778.5 359.5 Z M 1075.5 329.5 L 1128.5 329.5 L 1128.5 362.5 L 1075.5 362.5 Z M 629.5 331.5 L 683.5 331.5 L 683.5 364.5 L 629.5 364.5 Z M 1223.5 331.5 L 1278.5 331.5 L 1278.5 364.5 L 1223.5 364.5 Z M 927.5 331.5 L 980.5 331.5 L 980.5 364.5 L 927.5 364.5 Z M 778.5 359.5 L 831.5 359.5 L 831.5 391.5 L 778.5 391.5 Z M 1075.5 362.5 L 1128.5 362.5 L 1128.5 408.5 L 1075.5 408.5 Z M 927.5 364.5 L 980.5 364.5 L 980.5 411.5 L 927.5 411.5 Z M 629.5 364.5 L 683.5 364.5 L 683.5 411.5 L 629.5 411.5 Z M 1223.5 364.5 L 1278.5 364.5 L 1278.5 411.5 L 1223.5 411.5 Z M 778.5 391.5 L 831.5 391.5 L 831.5 425.5 L 778.5 425.5 Z M 1075.5 408.5 L 1128.5 408.5 L 1128.5 441.5 L 1075.5 441.5 Z M 629.5 411.5 L 683.5 411.5 L 683.5 444.5 L 629.5 444.5 Z M 927.5 411.5 L 980.5 411.5 L 980.5 444.5 L 927.5 444.5 Z M 1223.5 411.5 L 1278.5 411.5 L 1278.5 444.5 L 1223.5 444.5 Z M 778.5 425.5 L 831.5 425.5 L 831.5 458.5 L 778.5 458.5 Z M 1075.5 441.5 L 1128.5 441.5 L 1128.5 485.5 L 1075.5 485.5 Z M 1223.5 444.5 L 1278.5 444.5 L 1278.5 490.5 L 1223.5 490.5 Z M 778.5 458.5 L 831.5 458.5 L 831.5 490.5 L 778.5 490.5 Z M 629.5 444.5 L 683.5 444.5 L 683.5 490.5 L 629.5 490.5 Z M 927.5 444.5 L 980.5 444.5 L 980.5 490.5 L 927.5 490.5 Z M 1075.5 485.5 L 1128.5 485.5 L 1128.5 518.5 L 1075.5 518.5 Z M 778.5 490.5 L 831.5 490.5 L 831.5 522.5 L 778.5 522.5 Z M 927.5 490.5 L 980.5 490.5 L 980.5 522.5 L 927.5 522.5 Z M 629.5 490.5 L 683.5 490.5 L 683.5 522.5 L 629.5 522.5 Z M 1223.5 490.5 L 1278.5 490.5 L 1278.5 522.5 L 1223.5 522.5 Z M 1223.5 522.5 L 1278.5 522.5 L 1278.5 530.5 L 1223.5 530.5 Z M 927.5 522.5 L 980.5 522.5 L 980.5 530.5 L 927.5 530.5 Z M 778.5 522.5 L 831.5 522.5 L 831.5 530.5 L 778.5 530.5 Z M 1075.5 518.5 L 1128.5 518.5 L 1128.5 530.5 L 1075.5 530.5 Z M 629.5 522.5 L 683.5 522.5 L 683.5 530.5 L 629.5 530.5 Z M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1115.5 707.5 L 1210.5 707.5 L 1210.5 850.5 L 1115.5 850.5 Z M 696.5 707.5 L 791.5 707.5 L 791.5 850.5 L 696.5 850.5 Z M 831.5 707.5 L 927.5 707.5 L 927.5 850.5 L 831.5 850.5 Z M 980.5 707.5 L 1075.5 707.5 L 1075.5 850.5 L 980.5 850.5 Z M 980.5 707.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1128.5 245.5 L 1223.5 245.5 L 1223.5 530.5 L 1128.5 530.5 Z M 683.5 245.5 L 778.5 245.5 L 778.5 530.5 L 683.5 530.5 Z M 831.5 245.5 L 927.5 245.5 L 927.5 530.5 L 831.5 530.5 Z M 980.5 245.5 L 1075.5 245.5 L 1075.5 530.5 L 980.5 530.5 Z M 980.5 245.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 627.5 161.5 L 659.5 161.5 L 659.5 193.5 L 627.5 193.5 Z M 1266.5 161.5 L 1299.5 161.5 L 1299.5 193.5 L 1266.5 193.5 Z M 1175.5 161.5 L 1207.5 161.5 L 1207.5 193.5 L 1175.5 193.5 Z M 1084.5 161.5 L 1116.5 161.5 L 1116.5 193.5 L 1084.5 193.5 Z M 992.5 161.5 L 1025.5 161.5 L 1025.5 193.5 L 992.5 193.5 Z M 901.5 161.5 L 933.5 161.5 L 933.5 193.5 L 901.5 193.5 Z M 809.5 161.5 L 842.5 161.5 L 842.5 193.5 L 809.5 193.5 Z M 718.5 161.5 L 751.5 161.5 L 751.5 193.5 L 718.5 193.5 Z M 1009.5 252.5 L 1042.5 252.5 L 1042.5 285.5 L 1009.5 285.5 Z M 1146.5 252.5 L 1179.5 252.5 L 1179.5 285.5 L 1146.5 285.5 Z M 1078.5 252.5 L 1110.5 252.5 L 1110.5 285.5 L 1078.5 285.5 Z M 620.5 844.5 L 652.5 844.5 L 652.5 876.5 L 620.5 876.5 Z M 1278.5 844.5 L 1310.5 844.5 L 1310.5 876.5 L 1278.5 876.5 Z M 1209.5 844.5 L 1241.5 844.5 L 1241.5 876.5 L 1209.5 876.5 Z M 1141.5 844.5 L 1173.5 844.5 L 1173.5 876.5 L 1141.5 876.5 Z M 1072.5 844.5 L 1104.5 844.5 L 1104.5 876.5 L 1072.5 876.5 Z M 1004.5 844.5 L 1036.5 844.5 L 1036.5 876.5 L 1004.5 876.5 Z M 689.5 844.5 L 721.5 844.5 L 721.5 876.5 L 689.5 876.5 Z M 627.5 935.5 L 659.5 935.5 L 659.5 968.5 L 627.5 968.5 Z M 1266.5 935.5 L 1299.5 935.5 L 1299.5 968.5 L 1266.5 968.5 Z M 1175.5 935.5 L 1207.5 935.5 L 1207.5 968.5 L 1175.5 968.5 Z M 1084.5 935.5 L 1116.5 935.5 L 1116.5 968.5 L 1084.5 968.5 Z M 992.5 935.5 L 1025.5 935.5 L 1025.5 968.5 L 992.5 968.5 Z M 901.5 935.5 L 933.5 935.5 L 933.5 968.5 L 901.5 968.5 Z M 809.5 935.5 L 842.5 935.5 L 842.5 968.5 L 809.5 968.5 Z M 718.5 935.5 L 751.5 935.5 L 751.5 968.5 L 718.5 968.5 Z M 718.5 935.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface354">
+<g id="surface383">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -220,6 +220,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 742.667969 629.523438 L 743.117188 625.316406 L 744.296875 621.894531 L 746.148438 619.203125 L 748.671875 617.296875 L 751.867188 616.117188 L 755.796875 615.722656 L 757.589844 615.835938 L 759.332031 616.117188 L 760.957031 616.566406 L 762.414062 617.238281 L 763.761719 618.082031 L 765.050781 619.035156 L 766.0625 620.210938 L 766.960938 621.445312 L 767.632812 622.792969 L 768.136719 624.195312 L 768.417969 625.765625 L 768.53125 627.394531 L 768.304688 629.695312 L 767.6875 631.824219 L 766.625 633.789062 L 765.164062 635.640625 L 763.257812 637.378906 L 760.957031 638.894531 L 760.117188 639.398438 L 754.503906 642.429688 L 753.046875 643.269531 L 751.757812 644.113281 L 750.632812 644.953125 L 749.738281 645.792969 L 748.953125 646.636719 L 748.390625 647.476562 L 748.109375 647.984375 L 747.886719 648.429688 L 747.71875 648.992188 L 747.550781 649.496094 L 747.378906 650.058594 L 747.324219 650.621094 L 768.25 650.621094 L 768.25 655.5 L 741.769531 655.5 L 741.882812 653.535156 L 742.164062 651.742188 L 742.5 650.058594 L 742.949219 648.597656 L 743.453125 647.195312 L 744.070312 645.960938 L 744.742188 644.898438 L 745.585938 643.832031 L 746.59375 642.765625 L 747.71875 641.753906 L 749.007812 640.746094 L 750.523438 639.734375 L 750.859375 639.511719 L 751.25 639.285156 L 751.644531 639.007812 L 752.039062 638.78125 L 752.484375 638.558594 L 752.933594 638.277344 L 758.097656 635.359375 L 759.722656 634.292969 L 761.070312 633.117188 L 762.136719 631.882812 L 762.863281 630.535156 L 763.3125 629.078125 L 763.480469 627.503906 L 763.371094 626.441406 L 763.203125 625.375 L 762.808594 624.421875 L 762.359375 623.523438 L 761.6875 622.738281 L 760.957031 621.953125 L 760.171875 621.390625 L 759.386719 620.886719 L 758.488281 620.550781 L 757.589844 620.269531 L 756.636719 620.101562 L 755.628906 620.042969 L 753.441406 620.324219 L 751.589844 620.996094 L 750.074219 622.175781 L 748.953125 623.804688 L 748.167969 625.933594 L 747.71875 628.460938 L 747.660156 628.683594 L 747.660156 629.019531 L 747.605469 629.1875 L 747.605469 629.523438 Z M 742.667969 629.523438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 718 460 L 751 460 M 718 428 L 751 428 M 718 428 L 718 460 M 751 428 L 751 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 718 460 L 751 460 M 718 428 L 751 428 M 751 460 L 751 428 M 718 460 L 718 428 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 597 122 L 597 131 M 592 127 L 601 127 M 596 128 L 598 128 M 596 126 L 598 126 M 596 126 L 596 128 M 598 126 L 598 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2/sky130_fd_sc_hvl__and2_1.svg b/cells/and2/sky130_fd_sc_hvl__and2_1.svg
index 255179b..25fcf5d 100644
--- a/cells/and2/sky130_fd_sc_hvl__and2_1.svg
+++ b/cells/and2/sky130_fd_sc_hvl__and2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 1054.5 707.5 L 1254.5 707.5 L 1254.5 715.5 L 1054.5 715.5 Z M 1054.5 715.5 L 1254.5 715.5 L 1254.5 747.5 L 1054.5 747.5 Z M 1054.5 747.5 L 1254.5 747.5 L 1254.5 770.5 L 1054.5 770.5 Z M 672.5 770.5 L 1254.5 770.5 L 1254.5 794.5 L 672.5 794.5 Z M 672.5 794.5 L 1254.5 794.5 L 1254.5 826.5 L 672.5 826.5 Z M 672.5 826.5 L 1254.5 826.5 L 1254.5 850.5 L 672.5 850.5 Z M 672.5 826.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1030.5 245.5 L 1104.5 245.5 L 1104.5 252.5 L 1030.5 252.5 Z M 1200.5 245.5 L 1254.5 245.5 L 1254.5 252.5 L 1200.5 252.5 Z M 1200.5 252.5 L 1254.5 252.5 L 1254.5 285.5 L 1200.5 285.5 Z M 1030.5 252.5 L 1104.5 252.5 L 1104.5 285.5 L 1030.5 285.5 Z M 1200.5 285.5 L 1254.5 285.5 L 1254.5 331.5 L 1200.5 331.5 Z M 1030.5 285.5 L 1104.5 285.5 L 1104.5 331.5 L 1030.5 331.5 Z M 1030.5 331.5 L 1104.5 331.5 L 1104.5 364.5 L 1030.5 364.5 Z M 1200.5 331.5 L 1254.5 331.5 L 1254.5 364.5 L 1200.5 364.5 Z M 1200.5 364.5 L 1254.5 364.5 L 1254.5 411.5 L 1200.5 411.5 Z M 1030.5 364.5 L 1104.5 364.5 L 1104.5 411.5 L 1030.5 411.5 Z M 1200.5 411.5 L 1254.5 411.5 L 1254.5 444.5 L 1200.5 444.5 Z M 1030.5 411.5 L 1104.5 411.5 L 1104.5 444.5 L 1030.5 444.5 Z M 1030.5 444.5 L 1104.5 444.5 L 1104.5 450.5 L 1030.5 450.5 Z M 861.5 450.5 L 914.5 450.5 L 914.5 474.5 L 861.5 474.5 Z M 711.5 450.5 L 766.5 450.5 L 766.5 474.5 L 711.5 474.5 Z M 1009.5 450.5 L 1104.5 450.5 L 1104.5 490.5 L 1009.5 490.5 Z M 1200.5 444.5 L 1254.5 444.5 L 1254.5 490.5 L 1200.5 490.5 Z M 711.5 474.5 L 766.5 474.5 L 766.5 506.5 L 711.5 506.5 Z M 861.5 474.5 L 914.5 474.5 L 914.5 506.5 L 861.5 506.5 Z M 1009.5 490.5 L 1104.5 490.5 L 1104.5 522.5 L 1009.5 522.5 Z M 1200.5 490.5 L 1254.5 490.5 L 1254.5 522.5 L 1200.5 522.5 Z M 1009.5 522.5 L 1104.5 522.5 L 1104.5 530.5 L 1009.5 530.5 Z M 1200.5 522.5 L 1254.5 522.5 L 1254.5 530.5 L 1200.5 530.5 Z M 711.5 506.5 L 766.5 506.5 L 766.5 530.5 L 711.5 530.5 Z M 861.5 506.5 L 914.5 506.5 L 914.5 530.5 L 861.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1108.5 707.5 L 1203.5 707.5 L 1203.5 850.5 L 1108.5 850.5 Z M 722.5 770.5 L 817.5 770.5 L 817.5 850.5 L 722.5 850.5 Z M 857.5 770.5 L 952.5 770.5 L 952.5 850.5 L 857.5 850.5 Z M 857.5 770.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1104.5 245.5 L 1200.5 245.5 L 1200.5 530.5 L 1104.5 530.5 Z M 766.5 450.5 L 861.5 450.5 L 861.5 530.5 L 766.5 530.5 Z M 914.5 450.5 L 1009.5 450.5 L 1009.5 530.5 L 914.5 530.5 Z M 914.5 450.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 664.5 252.5 L 696.5 252.5 L 696.5 285.5 L 664.5 285.5 Z M 1143.5 252.5 L 1176.5 252.5 L 1176.5 285.5 L 1143.5 285.5 Z M 1075.5 252.5 L 1107.5 252.5 L 1107.5 285.5 L 1075.5 285.5 Z M 1006.5 252.5 L 1039.5 252.5 L 1039.5 285.5 L 1006.5 285.5 Z M 938.5 252.5 L 970.5 252.5 L 970.5 285.5 L 938.5 285.5 Z M 801.5 252.5 L 833.5 252.5 L 833.5 285.5 L 801.5 285.5 Z M 732.5 252.5 L 765.5 252.5 L 765.5 285.5 L 732.5 285.5 Z M 964.5 844.5 L 996.5 844.5 L 996.5 876.5 L 964.5 876.5 Z M 1101.5 844.5 L 1133.5 844.5 L 1133.5 876.5 L 1101.5 876.5 Z M 1032.5 844.5 L 1065.5 844.5 L 1065.5 876.5 L 1032.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface323">
+<g id="surface352">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -204,6 +204,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1241.433594 352.519531 L 1255.910156 373.5 L 1249.457031 373.5 L 1238.292969 356.445312 L 1227.074219 373.5 L 1220.734375 373.5 L 1235.207031 352.519531 L 1221.632812 332.601562 L 1227.972656 332.601562 L 1238.460938 348.648438 L 1249.007812 332.601562 L 1255.234375 332.601562 Z M 1241.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1221 742 L 1253 742 M 1221 710 L 1253 710 M 1221 710 L 1221 742 M 1253 710 L 1253 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1221 742 L 1253 742 M 1221 710 L 1253 710 M 1253 742 L 1253 710 M 1221 742 L 1221 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3/sky130_fd_sc_hvl__and3_1.svg b/cells/and3/sky130_fd_sc_hvl__and3_1.svg
index 9fba48a..cfcd327 100644
--- a/cells/and3/sky130_fd_sc_hvl__and3_1.svg
+++ b/cells/and3/sky130_fd_sc_hvl__and3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 535.5 98.5 L 1391.5 98.5 L 1391.5 593.5 L 535.5 593.5 Z M 535.5 98.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image343"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 597.5 161.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 634.5 707.5 L 1300.5 707.5 L 1300.5 731.5 L 634.5 731.5 Z M 634.5 731.5 L 1300.5 731.5 L 1300.5 763.5 L 634.5 763.5 Z M 634.5 763.5 L 1300.5 763.5 L 1300.5 787.5 L 634.5 787.5 Z M 1100.5 787.5 L 1300.5 787.5 L 1300.5 810.5 L 1100.5 810.5 Z M 1100.5 810.5 L 1300.5 810.5 L 1300.5 842.5 L 1100.5 842.5 Z M 1100.5 842.5 L 1300.5 842.5 L 1300.5 850.5 L 1100.5 850.5 Z M 1100.5 842.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1093.5 245.5 L 1147.5 245.5 L 1147.5 252.5 L 1093.5 252.5 Z M 1242.5 245.5 L 1297.5 245.5 L 1297.5 252.5 L 1242.5 252.5 Z M 1242.5 252.5 L 1297.5 252.5 L 1297.5 285.5 L 1242.5 285.5 Z M 1093.5 252.5 L 1147.5 252.5 L 1147.5 285.5 L 1093.5 285.5 Z M 1093.5 285.5 L 1147.5 285.5 L 1147.5 331.5 L 1093.5 331.5 Z M 1242.5 285.5 L 1297.5 285.5 L 1297.5 331.5 L 1242.5 331.5 Z M 1242.5 331.5 L 1297.5 331.5 L 1297.5 364.5 L 1242.5 364.5 Z M 1093.5 331.5 L 1147.5 331.5 L 1147.5 364.5 L 1093.5 364.5 Z M 1093.5 364.5 L 1147.5 364.5 L 1147.5 380.5 L 1093.5 380.5 Z M 775.5 380.5 L 829.5 380.5 L 829.5 400.5 L 775.5 400.5 Z M 924.5 380.5 L 977.5 380.5 L 977.5 404.5 L 924.5 404.5 Z M 626.5 380.5 L 680.5 380.5 L 680.5 404.5 L 626.5 404.5 Z M 1242.5 364.5 L 1297.5 364.5 L 1297.5 411.5 L 1242.5 411.5 Z M 1072.5 380.5 L 1147.5 380.5 L 1147.5 411.5 L 1072.5 411.5 Z M 775.5 400.5 L 829.5 400.5 L 829.5 432.5 L 775.5 432.5 Z M 924.5 404.5 L 977.5 404.5 L 977.5 436.5 L 924.5 436.5 Z M 626.5 404.5 L 680.5 404.5 L 680.5 436.5 L 626.5 436.5 Z M 1072.5 411.5 L 1147.5 411.5 L 1147.5 444.5 L 1072.5 444.5 Z M 1242.5 411.5 L 1297.5 411.5 L 1297.5 444.5 L 1242.5 444.5 Z M 626.5 436.5 L 680.5 436.5 L 680.5 460.5 L 626.5 460.5 Z M 775.5 432.5 L 829.5 432.5 L 829.5 460.5 L 775.5 460.5 Z M 1072.5 444.5 L 1147.5 444.5 L 1147.5 460.5 L 1072.5 460.5 Z M 924.5 436.5 L 977.5 436.5 L 977.5 460.5 L 924.5 460.5 Z M 1242.5 444.5 L 1297.5 444.5 L 1297.5 490.5 L 1242.5 490.5 Z M 1093.5 460.5 L 1147.5 460.5 L 1147.5 490.5 L 1093.5 490.5 Z M 1242.5 490.5 L 1297.5 490.5 L 1297.5 522.5 L 1242.5 522.5 Z M 1093.5 490.5 L 1147.5 490.5 L 1147.5 522.5 L 1093.5 522.5 Z M 1242.5 522.5 L 1297.5 522.5 L 1297.5 530.5 L 1242.5 530.5 Z M 1093.5 522.5 L 1147.5 522.5 L 1147.5 530.5 L 1093.5 530.5 Z M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 964.5 707.5 L 1059.5 707.5 L 1059.5 787.5 L 964.5 787.5 Z M 693.5 707.5 L 789.5 707.5 L 789.5 787.5 L 693.5 787.5 Z M 829.5 707.5 L 924.5 707.5 L 924.5 787.5 L 829.5 787.5 Z M 1154.5 707.5 L 1249.5 707.5 L 1249.5 850.5 L 1154.5 850.5 Z M 1154.5 707.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 829.5 380.5 L 924.5 380.5 L 924.5 460.5 L 829.5 460.5 Z M 680.5 380.5 L 775.5 380.5 L 775.5 460.5 L 680.5 460.5 Z M 977.5 380.5 L 1072.5 380.5 L 1072.5 460.5 L 977.5 460.5 Z M 1147.5 245.5 L 1242.5 245.5 L 1242.5 530.5 L 1147.5 530.5 Z M 1147.5 245.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 627.5 161.5 L 659.5 161.5 L 659.5 193.5 L 627.5 193.5 Z M 1266.5 161.5 L 1299.5 161.5 L 1299.5 193.5 L 1266.5 193.5 Z M 1175.5 161.5 L 1207.5 161.5 L 1207.5 193.5 L 1175.5 193.5 Z M 1084.5 161.5 L 1116.5 161.5 L 1116.5 193.5 L 1084.5 193.5 Z M 992.5 161.5 L 1025.5 161.5 L 1025.5 193.5 L 992.5 193.5 Z M 901.5 161.5 L 933.5 161.5 L 933.5 193.5 L 901.5 193.5 Z M 809.5 161.5 L 842.5 161.5 L 842.5 193.5 L 809.5 193.5 Z M 718.5 161.5 L 751.5 161.5 L 751.5 193.5 L 718.5 193.5 Z M 710.5 252.5 L 742.5 252.5 L 742.5 285.5 L 710.5 285.5 Z M 1159.5 252.5 L 1191.5 252.5 L 1191.5 285.5 L 1159.5 285.5 Z M 1090.5 252.5 L 1123.5 252.5 L 1123.5 285.5 L 1090.5 285.5 Z M 1022.5 252.5 L 1054.5 252.5 L 1054.5 285.5 L 1022.5 285.5 Z M 847.5 252.5 L 879.5 252.5 L 879.5 285.5 L 847.5 285.5 Z M 778.5 252.5 L 810.5 252.5 L 810.5 285.5 L 778.5 285.5 Z M 1070.5 844.5 L 1103.5 844.5 L 1103.5 876.5 L 1070.5 876.5 Z M 1171.5 844.5 L 1203.5 844.5 L 1203.5 876.5 L 1171.5 876.5 Z M 627.5 935.5 L 659.5 935.5 L 659.5 968.5 L 627.5 968.5 Z M 1266.5 935.5 L 1299.5 935.5 L 1299.5 968.5 L 1266.5 968.5 Z M 1175.5 935.5 L 1207.5 935.5 L 1207.5 968.5 L 1175.5 968.5 Z M 1084.5 935.5 L 1116.5 935.5 L 1116.5 968.5 L 1084.5 968.5 Z M 992.5 935.5 L 1025.5 935.5 L 1025.5 968.5 L 992.5 968.5 Z M 901.5 935.5 L 933.5 935.5 L 933.5 968.5 L 901.5 968.5 Z M 809.5 935.5 L 842.5 935.5 L 842.5 968.5 L 809.5 968.5 Z M 718.5 935.5 L 751.5 935.5 L 751.5 968.5 L 718.5 968.5 Z M 718.5 935.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface340">
+<g id="surface368">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -222,6 +222,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1286.433594 352.519531 L 1300.910156 373.5 L 1294.457031 373.5 L 1283.292969 356.445312 L 1272.074219 373.5 L 1265.734375 373.5 L 1280.207031 352.519531 L 1266.632812 332.601562 L 1272.972656 332.601562 L 1283.460938 348.648438 L 1294.007812 332.601562 L 1300.234375 332.601562 Z M 1286.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1266 742 L 1299 742 M 1266 710 L 1299 710 M 1266 710 L 1266 742 M 1299 710 L 1299 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1266 742 L 1299 742 M 1266 710 L 1299 710 M 1299 742 L 1299 710 M 1266 742 L 1266 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 597 122 L 597 131 M 592 127 L 601 127 M 596 128 L 598 128 M 596 126 L 598 126 M 596 126 L 596 128 M 598 126 L 598 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_1.svg b/cells/buf/sky130_fd_sc_hvl__buf_1.svg
index 0603e65..c4e0354 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_1.svg
+++ b/cells/buf/sky130_fd_sc_hvl__buf_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 672.5 98.5 L 1255.5 98.5 L 1255.5 593.5 L 672.5 593.5 Z M 672.5 98.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 735.5 161.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 765.5 707.5 L 965.5 707.5 L 965.5 718.5 L 765.5 718.5 Z M 765.5 718.5 L 965.5 718.5 L 965.5 751.5 L 765.5 751.5 Z M 765.5 751.5 L 965.5 751.5 L 965.5 770.5 L 765.5 770.5 Z M 765.5 770.5 L 1155.5 770.5 L 1155.5 806.5 L 765.5 806.5 Z M 765.5 806.5 L 1155.5 806.5 L 1155.5 838.5 L 765.5 838.5 Z M 765.5 838.5 L 1155.5 838.5 L 1155.5 850.5 L 765.5 850.5 Z M 765.5 838.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 781.5 245.5 L 835.5 245.5 L 835.5 252.5 L 781.5 252.5 Z M 930.5 245.5 L 985.5 245.5 L 985.5 252.5 L 930.5 252.5 Z M 930.5 252.5 L 985.5 252.5 L 985.5 285.5 L 930.5 285.5 Z M 781.5 252.5 L 835.5 252.5 L 835.5 285.5 L 781.5 285.5 Z M 781.5 285.5 L 835.5 285.5 L 835.5 331.5 L 781.5 331.5 Z M 930.5 285.5 L 985.5 285.5 L 985.5 331.5 L 930.5 331.5 Z M 781.5 331.5 L 835.5 331.5 L 835.5 364.5 L 781.5 364.5 Z M 930.5 331.5 L 985.5 331.5 L 985.5 364.5 L 930.5 364.5 Z M 930.5 364.5 L 985.5 364.5 L 985.5 387.5 L 930.5 387.5 Z M 1101.5 387.5 L 1155.5 387.5 L 1155.5 395.5 L 1101.5 395.5 Z M 781.5 364.5 L 835.5 364.5 L 835.5 411.5 L 781.5 411.5 Z M 930.5 387.5 L 1006.5 387.5 L 1006.5 411.5 L 930.5 411.5 Z M 1101.5 395.5 L 1155.5 395.5 L 1155.5 427.5 L 1101.5 427.5 Z M 781.5 411.5 L 835.5 411.5 L 835.5 444.5 L 781.5 444.5 Z M 930.5 411.5 L 1006.5 411.5 L 1006.5 444.5 L 930.5 444.5 Z M 781.5 444.5 L 835.5 444.5 L 835.5 490.5 L 781.5 490.5 Z M 930.5 444.5 L 1006.5 444.5 L 1006.5 490.5 L 930.5 490.5 Z M 1101.5 427.5 L 1155.5 427.5 L 1155.5 490.5 L 1101.5 490.5 Z M 930.5 490.5 L 1006.5 490.5 L 1006.5 522.5 L 930.5 522.5 Z M 781.5 490.5 L 835.5 490.5 L 835.5 522.5 L 781.5 522.5 Z M 1101.5 490.5 L 1155.5 490.5 L 1155.5 522.5 L 1101.5 522.5 Z M 781.5 522.5 L 835.5 522.5 L 835.5 530.5 L 781.5 530.5 Z M 930.5 522.5 L 1006.5 522.5 L 1006.5 530.5 L 930.5 530.5 Z M 1101.5 522.5 L 1155.5 522.5 L 1155.5 530.5 L 1101.5 530.5 Z M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 815.5 707.5 L 910.5 707.5 L 910.5 850.5 L 815.5 850.5 Z M 1006.5 770.5 L 1101.5 770.5 L 1101.5 850.5 L 1006.5 850.5 Z M 1006.5 770.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 835.5 245.5 L 930.5 245.5 L 930.5 530.5 L 835.5 530.5 Z M 1006.5 387.5 L 1101.5 387.5 L 1101.5 530.5 L 1006.5 530.5 Z M 1006.5 387.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 765.5 161.5 L 797.5 161.5 L 797.5 193.5 L 765.5 193.5 Z M 1130.5 161.5 L 1163.5 161.5 L 1163.5 193.5 L 1130.5 193.5 Z M 1039.5 161.5 L 1071.5 161.5 L 1071.5 193.5 L 1039.5 193.5 Z M 947.5 161.5 L 980.5 161.5 L 980.5 193.5 L 947.5 193.5 Z M 856.5 161.5 L 888.5 161.5 L 888.5 193.5 L 856.5 193.5 Z M 876.5 252.5 L 908.5 252.5 L 908.5 285.5 L 876.5 285.5 Z M 945.5 252.5 L 977.5 252.5 L 977.5 285.5 L 945.5 285.5 Z M 839.5 844.5 L 871.5 844.5 L 871.5 876.5 L 839.5 876.5 Z M 1045.5 844.5 L 1077.5 844.5 L 1077.5 876.5 L 1045.5 876.5 Z M 976.5 844.5 L 1008.5 844.5 L 1008.5 876.5 L 976.5 876.5 Z M 908.5 844.5 L 940.5 844.5 L 940.5 876.5 L 908.5 876.5 Z M 765.5 935.5 L 797.5 935.5 L 797.5 968.5 L 765.5 968.5 Z M 1130.5 935.5 L 1163.5 935.5 L 1163.5 968.5 L 1130.5 968.5 Z M 1039.5 935.5 L 1071.5 935.5 L 1071.5 968.5 L 1039.5 968.5 Z M 947.5 935.5 L 980.5 935.5 L 980.5 968.5 L 947.5 968.5 Z M 856.5 935.5 L 888.5 935.5 L 888.5 968.5 L 856.5 968.5 Z M 856.5 935.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface325">
+<g id="surface354">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -207,6 +207,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 785.433594 352.519531 L 799.910156 373.5 L 793.457031 373.5 L 782.292969 356.445312 L 771.074219 373.5 L 764.734375 373.5 L 779.207031 352.519531 L 765.632812 332.601562 L 771.972656 332.601562 L 782.460938 348.648438 L 793.007812 332.601562 L 799.234375 332.601562 Z M 785.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 765 742 L 797 742 M 765 710 L 797 710 M 765 710 L 765 742 M 797 710 L 797 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 765 742 L 797 742 M 765 710 L 797 710 M 797 742 L 797 710 M 765 742 L 765 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 735 122 L 735 131 M 730 127 L 739 127 M 734 128 L 736 128 M 734 126 L 736 126 M 734 126 L 734 128 M 736 126 L 736 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_16.svg b/cells/buf/sky130_fd_sc_hvl__buf_16.svg
index 0956daf..e84eeb7 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_16.svg
+++ b/cells/buf/sky130_fd_sc_hvl__buf_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 338.5 L 1743.5 338.5 L 1743.5 559.5 L 174.5 559.5 Z M 174.5 338.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 202.5 366.5 L 1715.5 366.5 L 1715.5 380.5 L 202.5 380.5 Z M 202.5 366.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 202.5 366.5 L 1715.5 366.5 L 1715.5 380.5 L 202.5 380.5 Z M 215.5 596.5 L 1698.5 596.5 L 1698.5 604.5 L 215.5 604.5 Z M 215.5 604.5 L 1698.5 604.5 L 1698.5 618.5 L 215.5 618.5 Z M 215.5 618.5 L 1698.5 618.5 L 1698.5 633.5 L 215.5 633.5 Z M 215.5 633.5 L 1698.5 633.5 L 1698.5 647.5 L 215.5 647.5 Z M 215.5 647.5 L 1698.5 647.5 L 1698.5 660.5 L 215.5 660.5 Z M 215.5 647.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 202.5 713.5 L 1715.5 713.5 L 1715.5 727.5 L 202.5 727.5 Z M 202.5 713.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1609.5 403.5 L 1633.5 403.5 L 1633.5 407.5 L 1609.5 407.5 Z M 1476.5 403.5 L 1500.5 403.5 L 1500.5 407.5 L 1476.5 407.5 Z M 1211.5 403.5 L 1234.5 403.5 L 1234.5 407.5 L 1211.5 407.5 Z M 679.5 403.5 L 703.5 403.5 L 703.5 407.5 L 679.5 407.5 Z M 1144.5 403.5 L 1168.5 403.5 L 1168.5 407.5 L 1144.5 407.5 Z M 546.5 403.5 L 570.5 403.5 L 570.5 407.5 L 546.5 407.5 Z M 1410.5 403.5 L 1434.5 403.5 L 1434.5 407.5 L 1410.5 407.5 Z M 1078.5 403.5 L 1102.5 403.5 L 1102.5 407.5 L 1078.5 407.5 Z M 413.5 403.5 L 437.5 403.5 L 437.5 407.5 L 413.5 407.5 Z M 1011.5 403.5 L 1035.5 403.5 L 1035.5 407.5 L 1011.5 407.5 Z M 280.5 403.5 L 304.5 403.5 L 304.5 407.5 L 280.5 407.5 Z M 1543.5 403.5 L 1567.5 403.5 L 1567.5 407.5 L 1543.5 407.5 Z M 1343.5 403.5 L 1367.5 403.5 L 1367.5 407.5 L 1343.5 407.5 Z M 945.5 403.5 L 969.5 403.5 L 969.5 407.5 L 945.5 407.5 Z M 878.5 403.5 L 902.5 403.5 L 902.5 407.5 L 878.5 407.5 Z M 1277.5 403.5 L 1301.5 403.5 L 1301.5 407.5 L 1277.5 407.5 Z M 812.5 403.5 L 836.5 403.5 L 836.5 407.5 L 812.5 407.5 Z M 745.5 403.5 L 769.5 403.5 L 769.5 407.5 L 745.5 407.5 Z M 1676.5 403.5 L 1698.5 403.5 L 1698.5 408.5 L 1676.5 408.5 Z M 613.5 403.5 L 636.5 403.5 L 636.5 408.5 L 613.5 408.5 Z M 480.5 403.5 L 503.5 403.5 L 503.5 408.5 L 480.5 408.5 Z M 347.5 403.5 L 371.5 403.5 L 371.5 408.5 L 347.5 408.5 Z M 215.5 403.5 L 238.5 403.5 L 238.5 408.5 L 215.5 408.5 Z M 679.5 407.5 L 703.5 407.5 L 703.5 421.5 L 679.5 421.5 Z M 280.5 407.5 L 304.5 407.5 L 304.5 421.5 L 280.5 421.5 Z M 1476.5 407.5 L 1500.5 407.5 L 1500.5 421.5 L 1476.5 421.5 Z M 413.5 407.5 L 437.5 407.5 L 437.5 421.5 L 413.5 421.5 Z M 1410.5 407.5 L 1434.5 407.5 L 1434.5 421.5 L 1410.5 421.5 Z M 1343.5 407.5 L 1367.5 407.5 L 1367.5 421.5 L 1343.5 421.5 Z M 1277.5 407.5 L 1301.5 407.5 L 1301.5 421.5 L 1277.5 421.5 Z M 546.5 407.5 L 570.5 407.5 L 570.5 421.5 L 546.5 421.5 Z M 1211.5 407.5 L 1234.5 407.5 L 1234.5 421.5 L 1211.5 421.5 Z M 1144.5 407.5 L 1168.5 407.5 L 1168.5 421.5 L 1144.5 421.5 Z M 745.5 407.5 L 769.5 407.5 L 769.5 421.5 L 745.5 421.5 Z M 878.5 407.5 L 902.5 407.5 L 902.5 421.5 L 878.5 421.5 Z M 945.5 407.5 L 969.5 407.5 L 969.5 421.5 L 945.5 421.5 Z M 1011.5 407.5 L 1035.5 407.5 L 1035.5 421.5 L 1011.5 421.5 Z M 1078.5 407.5 L 1102.5 407.5 L 1102.5 421.5 L 1078.5 421.5 Z M 1609.5 407.5 L 1633.5 407.5 L 1633.5 421.5 L 1609.5 421.5 Z M 812.5 407.5 L 836.5 407.5 L 836.5 421.5 L 812.5 421.5 Z M 1543.5 407.5 L 1567.5 407.5 L 1567.5 421.5 L 1543.5 421.5 Z M 1676.5 408.5 L 1698.5 408.5 L 1698.5 423.5 L 1676.5 423.5 Z M 215.5 408.5 L 238.5 408.5 L 238.5 423.5 L 215.5 423.5 Z M 613.5 408.5 L 636.5 408.5 L 636.5 423.5 L 613.5 423.5 Z M 347.5 408.5 L 371.5 408.5 L 371.5 423.5 L 347.5 423.5 Z M 480.5 408.5 L 503.5 408.5 L 503.5 423.5 L 480.5 423.5 Z M 613.5 423.5 L 636.5 423.5 L 636.5 437.5 L 613.5 437.5 Z M 480.5 423.5 L 503.5 423.5 L 503.5 437.5 L 480.5 437.5 Z M 347.5 423.5 L 371.5 423.5 L 371.5 437.5 L 347.5 437.5 Z M 1144.5 421.5 L 1168.5 421.5 L 1168.5 440.5 L 1144.5 440.5 Z M 878.5 421.5 L 902.5 421.5 L 902.5 440.5 L 878.5 440.5 Z M 1676.5 423.5 L 1698.5 423.5 L 1698.5 440.5 L 1676.5 440.5 Z M 1078.5 421.5 L 1102.5 421.5 L 1102.5 440.5 L 1078.5 440.5 Z M 1277.5 421.5 L 1301.5 421.5 L 1301.5 440.5 L 1277.5 440.5 Z M 1343.5 421.5 L 1367.5 421.5 L 1367.5 440.5 L 1343.5 440.5 Z M 1543.5 421.5 L 1567.5 421.5 L 1567.5 440.5 L 1543.5 440.5 Z M 1011.5 421.5 L 1035.5 421.5 L 1035.5 440.5 L 1011.5 440.5 Z M 679.5 421.5 L 703.5 421.5 L 703.5 440.5 L 679.5 440.5 Z M 945.5 421.5 L 969.5 421.5 L 969.5 440.5 L 945.5 440.5 Z M 1476.5 421.5 L 1500.5 421.5 L 1500.5 440.5 L 1476.5 440.5 Z M 1609.5 421.5 L 1633.5 421.5 L 1633.5 440.5 L 1609.5 440.5 Z M 1211.5 421.5 L 1234.5 421.5 L 1234.5 440.5 L 1211.5 440.5 Z M 745.5 421.5 L 769.5 421.5 L 769.5 440.5 L 745.5 440.5 Z M 1410.5 421.5 L 1434.5 421.5 L 1434.5 440.5 L 1410.5 440.5 Z M 812.5 421.5 L 836.5 421.5 L 836.5 440.5 L 812.5 440.5 Z M 413.5 421.5 L 437.5 421.5 L 437.5 446.5 L 413.5 446.5 Z M 546.5 421.5 L 570.5 421.5 L 570.5 446.5 L 546.5 446.5 Z M 215.5 423.5 L 238.5 423.5 L 238.5 446.5 L 215.5 446.5 Z M 280.5 421.5 L 304.5 421.5 L 304.5 446.5 L 280.5 446.5 Z M 347.5 437.5 L 371.5 437.5 L 371.5 452.5 L 347.5 452.5 Z M 613.5 437.5 L 636.5 437.5 L 636.5 452.5 L 613.5 452.5 Z M 480.5 437.5 L 503.5 437.5 L 503.5 452.5 L 480.5 452.5 Z M 1011.5 440.5 L 1035.5 440.5 L 1035.5 455.5 L 1011.5 455.5 Z M 1676.5 440.5 L 1698.5 440.5 L 1698.5 455.5 L 1676.5 455.5 Z M 1609.5 440.5 L 1633.5 440.5 L 1633.5 455.5 L 1609.5 455.5 Z M 679.5 440.5 L 703.5 440.5 L 703.5 455.5 L 679.5 455.5 Z M 1543.5 440.5 L 1567.5 440.5 L 1567.5 455.5 L 1543.5 455.5 Z M 745.5 440.5 L 769.5 440.5 L 769.5 455.5 L 745.5 455.5 Z M 1476.5 440.5 L 1500.5 440.5 L 1500.5 455.5 L 1476.5 455.5 Z M 1078.5 440.5 L 1102.5 440.5 L 1102.5 455.5 L 1078.5 455.5 Z M 812.5 440.5 L 836.5 440.5 L 836.5 455.5 L 812.5 455.5 Z M 1410.5 440.5 L 1434.5 440.5 L 1434.5 455.5 L 1410.5 455.5 Z M 1211.5 440.5 L 1234.5 440.5 L 1234.5 455.5 L 1211.5 455.5 Z M 1277.5 440.5 L 1301.5 440.5 L 1301.5 455.5 L 1277.5 455.5 Z M 1343.5 440.5 L 1367.5 440.5 L 1367.5 455.5 L 1343.5 455.5 Z M 878.5 440.5 L 902.5 440.5 L 902.5 455.5 L 878.5 455.5 Z M 1144.5 440.5 L 1168.5 440.5 L 1168.5 455.5 L 1144.5 455.5 Z M 945.5 440.5 L 969.5 440.5 L 969.5 455.5 L 945.5 455.5 Z M 280.5 446.5 L 304.5 446.5 L 304.5 461.5 L 280.5 461.5 Z M 546.5 446.5 L 570.5 446.5 L 570.5 461.5 L 546.5 461.5 Z M 215.5 446.5 L 238.5 446.5 L 238.5 461.5 L 215.5 461.5 Z M 413.5 446.5 L 437.5 446.5 L 437.5 461.5 L 413.5 461.5 Z M 613.5 452.5 L 636.5 452.5 L 636.5 466.5 L 613.5 466.5 Z M 347.5 452.5 L 371.5 452.5 L 371.5 466.5 L 347.5 466.5 Z M 480.5 452.5 L 503.5 452.5 L 503.5 466.5 L 480.5 466.5 Z M 1343.5 455.5 L 1367.5 455.5 L 1367.5 474.5 L 1343.5 474.5 Z M 1410.5 455.5 L 1434.5 455.5 L 1434.5 474.5 L 1410.5 474.5 Z M 745.5 455.5 L 769.5 455.5 L 769.5 474.5 L 745.5 474.5 Z M 1211.5 455.5 L 1234.5 455.5 L 1234.5 474.5 L 1211.5 474.5 Z M 945.5 455.5 L 969.5 455.5 L 969.5 474.5 L 945.5 474.5 Z M 1144.5 455.5 L 1168.5 455.5 L 1168.5 474.5 L 1144.5 474.5 Z M 1078.5 455.5 L 1102.5 455.5 L 1102.5 474.5 L 1078.5 474.5 Z M 1676.5 455.5 L 1698.5 455.5 L 1698.5 474.5 L 1676.5 474.5 Z M 1609.5 455.5 L 1633.5 455.5 L 1633.5 474.5 L 1609.5 474.5 Z M 878.5 455.5 L 902.5 455.5 L 902.5 474.5 L 878.5 474.5 Z M 812.5 455.5 L 836.5 455.5 L 836.5 474.5 L 812.5 474.5 Z M 1277.5 455.5 L 1301.5 455.5 L 1301.5 474.5 L 1277.5 474.5 Z M 1543.5 455.5 L 1567.5 455.5 L 1567.5 474.5 L 1543.5 474.5 Z M 1476.5 455.5 L 1500.5 455.5 L 1500.5 474.5 L 1476.5 474.5 Z M 1011.5 455.5 L 1035.5 455.5 L 1035.5 474.5 L 1011.5 474.5 Z M 679.5 455.5 L 703.5 455.5 L 703.5 474.5 L 679.5 474.5 Z M 215.5 461.5 L 238.5 461.5 L 238.5 480.5 L 215.5 480.5 Z M 613.5 466.5 L 636.5 466.5 L 636.5 481.5 L 613.5 481.5 Z M 347.5 466.5 L 371.5 466.5 L 371.5 481.5 L 347.5 481.5 Z M 480.5 466.5 L 503.5 466.5 L 503.5 481.5 L 480.5 481.5 Z M 280.5 461.5 L 304.5 461.5 L 304.5 482.5 L 280.5 482.5 Z M 413.5 461.5 L 437.5 461.5 L 437.5 482.5 L 413.5 482.5 Z M 546.5 461.5 L 570.5 461.5 L 570.5 482.5 L 546.5 482.5 Z M 1011.5 474.5 L 1035.5 474.5 L 1035.5 489.5 L 1011.5 489.5 Z M 745.5 474.5 L 769.5 474.5 L 769.5 489.5 L 745.5 489.5 Z M 1676.5 474.5 L 1698.5 474.5 L 1698.5 489.5 L 1676.5 489.5 Z M 878.5 474.5 L 902.5 474.5 L 902.5 489.5 L 878.5 489.5 Z M 1609.5 474.5 L 1633.5 474.5 L 1633.5 489.5 L 1609.5 489.5 Z M 679.5 474.5 L 703.5 474.5 L 703.5 489.5 L 679.5 489.5 Z M 1543.5 474.5 L 1567.5 474.5 L 1567.5 489.5 L 1543.5 489.5 Z M 1476.5 474.5 L 1500.5 474.5 L 1500.5 489.5 L 1476.5 489.5 Z M 1410.5 474.5 L 1434.5 474.5 L 1434.5 489.5 L 1410.5 489.5 Z M 1144.5 474.5 L 1168.5 474.5 L 1168.5 489.5 L 1144.5 489.5 Z M 1211.5 474.5 L 1234.5 474.5 L 1234.5 489.5 L 1211.5 489.5 Z M 812.5 474.5 L 836.5 474.5 L 836.5 489.5 L 812.5 489.5 Z M 1277.5 474.5 L 1301.5 474.5 L 1301.5 489.5 L 1277.5 489.5 Z M 1343.5 474.5 L 1367.5 474.5 L 1367.5 489.5 L 1343.5 489.5 Z M 1078.5 474.5 L 1102.5 474.5 L 1102.5 489.5 L 1078.5 489.5 Z M 945.5 474.5 L 969.5 474.5 L 969.5 489.5 L 945.5 489.5 Z M 347.5 481.5 L 371.5 481.5 L 371.5 495.5 L 347.5 495.5 Z M 215.5 480.5 L 238.5 480.5 L 238.5 495.5 L 215.5 495.5 Z M 613.5 481.5 L 636.5 481.5 L 636.5 495.5 L 613.5 495.5 Z M 480.5 481.5 L 503.5 481.5 L 503.5 495.5 L 480.5 495.5 Z M 280.5 482.5 L 304.5 482.5 L 304.5 497.5 L 280.5 497.5 Z M 413.5 482.5 L 437.5 482.5 L 437.5 497.5 L 413.5 497.5 Z M 546.5 482.5 L 570.5 482.5 L 570.5 497.5 L 546.5 497.5 Z M 613.5 495.5 L 636.5 495.5 L 636.5 510.5 L 613.5 510.5 Z M 480.5 495.5 L 503.5 495.5 L 503.5 510.5 L 480.5 510.5 Z M 347.5 495.5 L 371.5 495.5 L 371.5 510.5 L 347.5 510.5 Z M 1676.5 489.5 L 1698.5 489.5 L 1698.5 512.5 L 1676.5 512.5 Z M 215.5 495.5 L 238.5 495.5 L 238.5 512.5 L 215.5 512.5 Z M 1410.5 489.5 L 1434.5 489.5 L 1434.5 513.5 L 1410.5 513.5 Z M 1543.5 489.5 L 1567.5 489.5 L 1567.5 513.5 L 1543.5 513.5 Z M 1011.5 489.5 L 1035.5 489.5 L 1035.5 513.5 L 1011.5 513.5 Z M 1211.5 489.5 L 1234.5 489.5 L 1234.5 513.5 L 1211.5 513.5 Z M 1476.5 489.5 L 1500.5 489.5 L 1500.5 513.5 L 1476.5 513.5 Z M 413.5 497.5 L 437.5 497.5 L 437.5 513.5 L 413.5 513.5 Z M 1277.5 489.5 L 1301.5 489.5 L 1301.5 513.5 L 1277.5 513.5 Z M 280.5 497.5 L 304.5 497.5 L 304.5 513.5 L 280.5 513.5 Z M 1609.5 489.5 L 1633.5 489.5 L 1633.5 513.5 L 1609.5 513.5 Z M 878.5 489.5 L 902.5 489.5 L 902.5 513.5 L 878.5 513.5 Z M 546.5 497.5 L 570.5 497.5 L 570.5 513.5 L 546.5 513.5 Z M 945.5 489.5 L 969.5 489.5 L 969.5 513.5 L 945.5 513.5 Z M 1078.5 489.5 L 1102.5 489.5 L 1102.5 513.5 L 1078.5 513.5 Z M 812.5 489.5 L 836.5 489.5 L 836.5 513.5 L 812.5 513.5 Z M 1343.5 489.5 L 1367.5 489.5 L 1367.5 513.5 L 1343.5 513.5 Z M 679.5 489.5 L 703.5 489.5 L 703.5 513.5 L 679.5 513.5 Z M 1144.5 489.5 L 1168.5 489.5 L 1168.5 513.5 L 1144.5 513.5 Z M 745.5 489.5 L 769.5 489.5 L 769.5 513.5 L 745.5 513.5 Z M 215.5 512.5 L 238.5 512.5 L 238.5 526.5 L 215.5 526.5 Z M 1676.5 512.5 L 1698.5 512.5 L 1698.5 526.5 L 1676.5 526.5 Z M 945.5 513.5 L 969.5 513.5 L 969.5 528.5 L 945.5 528.5 Z M 1543.5 513.5 L 1567.5 513.5 L 1567.5 528.5 L 1543.5 528.5 Z M 280.5 513.5 L 304.5 513.5 L 304.5 528.5 L 280.5 528.5 Z M 1476.5 513.5 L 1500.5 513.5 L 1500.5 528.5 L 1476.5 528.5 Z M 679.5 513.5 L 703.5 513.5 L 703.5 528.5 L 679.5 528.5 Z M 1410.5 513.5 L 1434.5 513.5 L 1434.5 528.5 L 1410.5 528.5 Z M 1011.5 513.5 L 1035.5 513.5 L 1035.5 528.5 L 1011.5 528.5 Z M 1144.5 513.5 L 1168.5 513.5 L 1168.5 528.5 L 1144.5 528.5 Z M 413.5 513.5 L 437.5 513.5 L 437.5 528.5 L 413.5 528.5 Z M 1277.5 513.5 L 1301.5 513.5 L 1301.5 528.5 L 1277.5 528.5 Z M 1343.5 513.5 L 1367.5 513.5 L 1367.5 528.5 L 1343.5 528.5 Z M 546.5 513.5 L 570.5 513.5 L 570.5 528.5 L 546.5 528.5 Z M 1211.5 513.5 L 1234.5 513.5 L 1234.5 528.5 L 1211.5 528.5 Z M 745.5 513.5 L 769.5 513.5 L 769.5 528.5 L 745.5 528.5 Z M 878.5 513.5 L 902.5 513.5 L 902.5 528.5 L 878.5 528.5 Z M 1078.5 513.5 L 1102.5 513.5 L 1102.5 528.5 L 1078.5 528.5 Z M 1609.5 513.5 L 1633.5 513.5 L 1633.5 528.5 L 1609.5 528.5 Z M 812.5 513.5 L 836.5 513.5 L 836.5 528.5 L 812.5 528.5 Z M 1078.5 528.5 L 1102.5 528.5 L 1102.5 531.5 L 1078.5 531.5 Z M 1609.5 528.5 L 1633.5 528.5 L 1633.5 531.5 L 1609.5 531.5 Z M 613.5 510.5 L 636.5 510.5 L 636.5 531.5 L 613.5 531.5 Z M 1676.5 526.5 L 1698.5 526.5 L 1698.5 531.5 L 1676.5 531.5 Z M 1476.5 528.5 L 1500.5 528.5 L 1500.5 531.5 L 1476.5 531.5 Z M 1144.5 528.5 L 1168.5 528.5 L 1168.5 531.5 L 1144.5 531.5 Z M 945.5 528.5 L 969.5 528.5 L 969.5 531.5 L 945.5 531.5 Z M 679.5 528.5 L 703.5 528.5 L 703.5 531.5 L 679.5 531.5 Z M 280.5 528.5 L 304.5 528.5 L 304.5 531.5 L 280.5 531.5 Z M 546.5 528.5 L 570.5 528.5 L 570.5 531.5 L 546.5 531.5 Z M 347.5 510.5 L 371.5 510.5 L 371.5 531.5 L 347.5 531.5 Z M 413.5 528.5 L 437.5 528.5 L 437.5 531.5 L 413.5 531.5 Z M 878.5 528.5 L 902.5 528.5 L 902.5 531.5 L 878.5 531.5 Z M 1543.5 528.5 L 1567.5 528.5 L 1567.5 531.5 L 1543.5 531.5 Z M 480.5 510.5 L 503.5 510.5 L 503.5 531.5 L 480.5 531.5 Z M 1211.5 528.5 L 1234.5 528.5 L 1234.5 531.5 L 1211.5 531.5 Z M 745.5 528.5 L 769.5 528.5 L 769.5 531.5 L 745.5 531.5 Z M 812.5 528.5 L 836.5 528.5 L 836.5 531.5 L 812.5 531.5 Z M 215.5 526.5 L 238.5 526.5 L 238.5 531.5 L 215.5 531.5 Z M 1410.5 528.5 L 1434.5 528.5 L 1434.5 531.5 L 1410.5 531.5 Z M 1277.5 528.5 L 1301.5 528.5 L 1301.5 531.5 L 1277.5 531.5 Z M 1011.5 528.5 L 1035.5 528.5 L 1035.5 531.5 L 1011.5 531.5 Z M 1343.5 528.5 L 1367.5 528.5 L 1367.5 531.5 L 1343.5 531.5 Z M 202.5 713.5 L 1715.5 713.5 L 1715.5 727.5 L 202.5 727.5 Z M 202.5 713.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1633.5 596.5 L 1676.5 596.5 L 1676.5 660.5 L 1633.5 660.5 Z M 238.5 596.5 L 280.5 596.5 L 280.5 660.5 L 238.5 660.5 Z M 304.5 596.5 L 347.5 596.5 L 347.5 660.5 L 304.5 660.5 Z M 371.5 596.5 L 413.5 596.5 L 413.5 660.5 L 371.5 660.5 Z M 437.5 596.5 L 480.5 596.5 L 480.5 660.5 L 437.5 660.5 Z M 503.5 596.5 L 546.5 596.5 L 546.5 660.5 L 503.5 660.5 Z M 570.5 596.5 L 613.5 596.5 L 613.5 660.5 L 570.5 660.5 Z M 636.5 596.5 L 679.5 596.5 L 679.5 660.5 L 636.5 660.5 Z M 703.5 596.5 L 745.5 596.5 L 745.5 660.5 L 703.5 660.5 Z M 769.5 596.5 L 812.5 596.5 L 812.5 660.5 L 769.5 660.5 Z M 836.5 596.5 L 878.5 596.5 L 878.5 660.5 L 836.5 660.5 Z M 902.5 596.5 L 945.5 596.5 L 945.5 660.5 L 902.5 660.5 Z M 969.5 596.5 L 1011.5 596.5 L 1011.5 660.5 L 969.5 660.5 Z M 1035.5 596.5 L 1078.5 596.5 L 1078.5 660.5 L 1035.5 660.5 Z M 1102.5 596.5 L 1144.5 596.5 L 1144.5 660.5 L 1102.5 660.5 Z M 1168.5 596.5 L 1211.5 596.5 L 1211.5 660.5 L 1168.5 660.5 Z M 1234.5 596.5 L 1277.5 596.5 L 1277.5 660.5 L 1234.5 660.5 Z M 1301.5 596.5 L 1343.5 596.5 L 1343.5 660.5 L 1301.5 660.5 Z M 1367.5 596.5 L 1410.5 596.5 L 1410.5 660.5 L 1367.5 660.5 Z M 1434.5 596.5 L 1476.5 596.5 L 1476.5 660.5 L 1434.5 660.5 Z M 1500.5 596.5 L 1543.5 596.5 L 1543.5 660.5 L 1500.5 660.5 Z M 1567.5 596.5 L 1609.5 596.5 L 1609.5 660.5 L 1567.5 660.5 Z M 1567.5 596.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1633.5 403.5 L 1676.5 403.5 L 1676.5 531.5 L 1633.5 531.5 Z M 238.5 403.5 L 280.5 403.5 L 280.5 531.5 L 238.5 531.5 Z M 304.5 403.5 L 347.5 403.5 L 347.5 531.5 L 304.5 531.5 Z M 371.5 403.5 L 413.5 403.5 L 413.5 531.5 L 371.5 531.5 Z M 437.5 403.5 L 480.5 403.5 L 480.5 531.5 L 437.5 531.5 Z M 503.5 403.5 L 546.5 403.5 L 546.5 531.5 L 503.5 531.5 Z M 570.5 403.5 L 613.5 403.5 L 613.5 531.5 L 570.5 531.5 Z M 636.5 403.5 L 679.5 403.5 L 679.5 531.5 L 636.5 531.5 Z M 703.5 403.5 L 745.5 403.5 L 745.5 531.5 L 703.5 531.5 Z M 769.5 403.5 L 812.5 403.5 L 812.5 531.5 L 769.5 531.5 Z M 836.5 403.5 L 878.5 403.5 L 878.5 531.5 L 836.5 531.5 Z M 902.5 403.5 L 945.5 403.5 L 945.5 531.5 L 902.5 531.5 Z M 969.5 403.5 L 1011.5 403.5 L 1011.5 531.5 L 969.5 531.5 Z M 1035.5 403.5 L 1078.5 403.5 L 1078.5 531.5 L 1035.5 531.5 Z M 1102.5 403.5 L 1144.5 403.5 L 1144.5 531.5 L 1102.5 531.5 Z M 1168.5 403.5 L 1211.5 403.5 L 1211.5 531.5 L 1168.5 531.5 Z M 1234.5 403.5 L 1277.5 403.5 L 1277.5 531.5 L 1234.5 531.5 Z M 1301.5 403.5 L 1343.5 403.5 L 1343.5 531.5 L 1301.5 531.5 Z M 1367.5 403.5 L 1410.5 403.5 L 1410.5 531.5 L 1367.5 531.5 Z M 1434.5 403.5 L 1476.5 403.5 L 1476.5 531.5 L 1434.5 531.5 Z M 1500.5 403.5 L 1543.5 403.5 L 1543.5 531.5 L 1500.5 531.5 Z M 1567.5 403.5 L 1609.5 403.5 L 1609.5 531.5 L 1567.5 531.5 Z M 1567.5 403.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 216.5 366.5 L 230.5 366.5 L 230.5 380.5 L 216.5 380.5 Z M 1688.5 366.5 L 1702.5 366.5 L 1702.5 380.5 L 1688.5 380.5 Z M 1647.5 366.5 L 1661.5 366.5 L 1661.5 380.5 L 1647.5 380.5 Z M 1606.5 366.5 L 1620.5 366.5 L 1620.5 380.5 L 1606.5 380.5 Z M 1565.5 366.5 L 1579.5 366.5 L 1579.5 380.5 L 1565.5 380.5 Z M 1524.5 366.5 L 1539.5 366.5 L 1539.5 380.5 L 1524.5 380.5 Z M 1483.5 366.5 L 1498.5 366.5 L 1498.5 380.5 L 1483.5 380.5 Z M 1442.5 366.5 L 1457.5 366.5 L 1457.5 380.5 L 1442.5 380.5 Z M 1401.5 366.5 L 1416.5 366.5 L 1416.5 380.5 L 1401.5 380.5 Z M 1361.5 366.5 L 1375.5 366.5 L 1375.5 380.5 L 1361.5 380.5 Z M 1320.5 366.5 L 1334.5 366.5 L 1334.5 380.5 L 1320.5 380.5 Z M 1279.5 366.5 L 1293.5 366.5 L 1293.5 380.5 L 1279.5 380.5 Z M 1238.5 366.5 L 1252.5 366.5 L 1252.5 380.5 L 1238.5 380.5 Z M 1197.5 366.5 L 1211.5 366.5 L 1211.5 380.5 L 1197.5 380.5 Z M 1156.5 366.5 L 1171.5 366.5 L 1171.5 380.5 L 1156.5 380.5 Z M 1115.5 366.5 L 1130.5 366.5 L 1130.5 380.5 L 1115.5 380.5 Z M 1074.5 366.5 L 1089.5 366.5 L 1089.5 380.5 L 1074.5 380.5 Z M 1033.5 366.5 L 1048.5 366.5 L 1048.5 380.5 L 1033.5 380.5 Z M 992.5 366.5 L 1007.5 366.5 L 1007.5 380.5 L 992.5 380.5 Z M 952.5 366.5 L 966.5 366.5 L 966.5 380.5 L 952.5 380.5 Z M 911.5 366.5 L 925.5 366.5 L 925.5 380.5 L 911.5 380.5 Z M 870.5 366.5 L 884.5 366.5 L 884.5 380.5 L 870.5 380.5 Z M 829.5 366.5 L 843.5 366.5 L 843.5 380.5 L 829.5 380.5 Z M 788.5 366.5 L 803.5 366.5 L 803.5 380.5 L 788.5 380.5 Z M 747.5 366.5 L 762.5 366.5 L 762.5 380.5 L 747.5 380.5 Z M 706.5 366.5 L 721.5 366.5 L 721.5 380.5 L 706.5 380.5 Z M 665.5 366.5 L 680.5 366.5 L 680.5 380.5 L 665.5 380.5 Z M 624.5 366.5 L 639.5 366.5 L 639.5 380.5 L 624.5 380.5 Z M 584.5 366.5 L 598.5 366.5 L 598.5 380.5 L 584.5 380.5 Z M 543.5 366.5 L 557.5 366.5 L 557.5 380.5 L 543.5 380.5 Z M 502.5 366.5 L 516.5 366.5 L 516.5 380.5 L 502.5 380.5 Z M 461.5 366.5 L 475.5 366.5 L 475.5 380.5 L 461.5 380.5 Z M 420.5 366.5 L 434.5 366.5 L 434.5 380.5 L 420.5 380.5 Z M 379.5 366.5 L 394.5 366.5 L 394.5 380.5 L 379.5 380.5 Z M 338.5 366.5 L 353.5 366.5 L 353.5 380.5 L 338.5 380.5 Z M 297.5 366.5 L 312.5 366.5 L 312.5 380.5 L 297.5 380.5 Z M 256.5 366.5 L 271.5 366.5 L 271.5 380.5 L 256.5 380.5 Z M 1016.5 409.5 L 1030.5 409.5 L 1030.5 421.5 L 1016.5 421.5 Z M 1149.5 409.5 L 1163.5 409.5 L 1163.5 421.5 L 1149.5 421.5 Z M 1282.5 409.5 L 1296.5 409.5 L 1296.5 421.5 L 1282.5 421.5 Z M 1548.5 409.5 L 1562.5 409.5 L 1562.5 421.5 L 1548.5 421.5 Z M 883.5 409.5 L 897.5 409.5 L 897.5 421.5 L 883.5 421.5 Z M 750.5 409.5 L 765.5 409.5 L 765.5 421.5 L 750.5 421.5 Z M 1415.5 409.5 L 1429.5 409.5 L 1429.5 421.5 L 1415.5 421.5 Z M 613.5 409.5 L 627.5 409.5 L 627.5 423.5 L 613.5 423.5 Z M 478.5 409.5 L 493.5 409.5 L 493.5 423.5 L 478.5 423.5 Z M 347.5 409.5 L 362.5 409.5 L 362.5 423.5 L 347.5 423.5 Z M 215.5 409.5 L 230.5 409.5 L 230.5 423.5 L 215.5 423.5 Z M 1687.5 409.5 L 1702.5 409.5 L 1702.5 423.5 L 1687.5 423.5 Z M 1657.5 409.5 L 1671.5 409.5 L 1671.5 424.5 L 1657.5 424.5 Z M 1179.5 409.5 L 1194.5 409.5 L 1194.5 424.5 L 1179.5 424.5 Z M 914.5 409.5 L 928.5 409.5 L 928.5 424.5 L 914.5 424.5 Z M 1445.5 409.5 L 1460.5 409.5 L 1460.5 424.5 L 1445.5 424.5 Z M 1118.5 409.5 L 1133.5 409.5 L 1133.5 424.5 L 1118.5 424.5 Z M 582.5 409.5 L 597.5 409.5 L 597.5 424.5 L 582.5 424.5 Z M 781.5 409.5 L 795.5 409.5 L 795.5 424.5 L 781.5 424.5 Z M 509.5 409.5 L 523.5 409.5 L 523.5 424.5 L 509.5 424.5 Z M 1251.5 409.5 L 1266.5 409.5 L 1266.5 424.5 L 1251.5 424.5 Z M 719.5 409.5 L 734.5 409.5 L 734.5 424.5 L 719.5 424.5 Z M 1282.5 421.5 L 1296.5 421.5 L 1296.5 424.5 L 1282.5 424.5 Z M 1312.5 409.5 L 1327.5 409.5 L 1327.5 424.5 L 1312.5 424.5 Z M 1578.5 409.5 L 1593.5 409.5 L 1593.5 424.5 L 1578.5 424.5 Z M 1384.5 409.5 L 1398.5 409.5 L 1398.5 424.5 L 1384.5 424.5 Z M 448.5 409.5 L 462.5 409.5 L 462.5 424.5 L 448.5 424.5 Z M 1517.5 409.5 L 1531.5 409.5 L 1531.5 424.5 L 1517.5 424.5 Z M 644.5 409.5 L 658.5 409.5 L 658.5 424.5 L 644.5 424.5 Z M 750.5 421.5 L 765.5 421.5 L 765.5 424.5 L 750.5 424.5 Z M 246.5 409.5 L 260.5 409.5 L 260.5 424.5 L 246.5 424.5 Z M 1548.5 421.5 L 1562.5 421.5 L 1562.5 424.5 L 1548.5 424.5 Z M 852.5 409.5 L 867.5 409.5 L 867.5 424.5 L 852.5 424.5 Z M 1016.5 421.5 L 1030.5 421.5 L 1030.5 424.5 L 1016.5 424.5 Z M 478.5 423.5 L 493.5 423.5 L 493.5 424.5 L 478.5 424.5 Z M 1415.5 421.5 L 1429.5 421.5 L 1429.5 424.5 L 1415.5 424.5 Z M 316.5 409.5 L 331.5 409.5 L 331.5 424.5 L 316.5 424.5 Z M 883.5 421.5 L 897.5 421.5 L 897.5 424.5 L 883.5 424.5 Z M 215.5 423.5 L 230.5 423.5 L 230.5 424.5 L 215.5 424.5 Z M 1149.5 421.5 L 1163.5 421.5 L 1163.5 424.5 L 1149.5 424.5 Z M 378.5 409.5 L 392.5 409.5 L 392.5 424.5 L 378.5 424.5 Z M 1047.5 409.5 L 1061.5 409.5 L 1061.5 424.5 L 1047.5 424.5 Z M 347.5 423.5 L 362.5 423.5 L 362.5 424.5 L 347.5 424.5 Z M 1687.5 423.5 L 1702.5 423.5 L 1702.5 424.5 L 1687.5 424.5 Z M 985.5 409.5 L 1000.5 409.5 L 1000.5 424.5 L 985.5 424.5 Z M 613.5 423.5 L 627.5 423.5 L 627.5 424.5 L 613.5 424.5 Z M 817.5 508.5 L 831.5 508.5 L 831.5 513.5 L 817.5 513.5 Z M 949.5 508.5 L 964.5 508.5 L 964.5 513.5 L 949.5 513.5 Z M 684.5 508.5 L 698.5 508.5 L 698.5 513.5 L 684.5 513.5 Z M 1215.5 508.5 L 1230.5 508.5 L 1230.5 513.5 L 1215.5 513.5 Z M 1614.5 508.5 L 1628.5 508.5 L 1628.5 513.5 L 1614.5 513.5 Z M 1348.5 508.5 L 1363.5 508.5 L 1363.5 513.5 L 1348.5 513.5 Z M 1481.5 508.5 L 1496.5 508.5 L 1496.5 513.5 L 1481.5 513.5 Z M 1082.5 508.5 L 1097.5 508.5 L 1097.5 513.5 L 1082.5 513.5 Z M 1481.5 513.5 L 1496.5 513.5 L 1496.5 522.5 L 1481.5 522.5 Z M 817.5 513.5 L 831.5 513.5 L 831.5 522.5 L 817.5 522.5 Z M 1348.5 513.5 L 1363.5 513.5 L 1363.5 522.5 L 1348.5 522.5 Z M 684.5 513.5 L 698.5 513.5 L 698.5 522.5 L 684.5 522.5 Z M 949.5 513.5 L 964.5 513.5 L 964.5 522.5 L 949.5 522.5 Z M 1215.5 513.5 L 1230.5 513.5 L 1230.5 522.5 L 1215.5 522.5 Z M 1614.5 513.5 L 1628.5 513.5 L 1628.5 522.5 L 1614.5 522.5 Z M 1082.5 513.5 L 1097.5 513.5 L 1097.5 522.5 L 1082.5 522.5 Z M 1561.5 571.5 L 1576.5 571.5 L 1576.5 580.5 L 1561.5 580.5 Z M 897.5 571.5 L 911.5 571.5 L 911.5 580.5 L 897.5 580.5 Z M 764.5 571.5 L 778.5 571.5 L 778.5 580.5 L 764.5 580.5 Z M 999.5 571.5 L 1013.5 571.5 L 1013.5 580.5 L 999.5 580.5 Z M 1398.5 571.5 L 1412.5 571.5 L 1412.5 580.5 L 1398.5 580.5 Z M 866.5 571.5 L 880.5 571.5 L 880.5 580.5 L 866.5 580.5 Z M 733.5 571.5 L 748.5 571.5 L 748.5 580.5 L 733.5 580.5 Z M 1265.5 571.5 L 1279.5 571.5 L 1279.5 580.5 L 1265.5 580.5 Z M 1295.5 571.5 L 1310.5 571.5 L 1310.5 580.5 L 1295.5 580.5 Z M 1030.5 571.5 L 1044.5 571.5 L 1044.5 580.5 L 1030.5 580.5 Z M 1530.5 571.5 L 1545.5 571.5 L 1545.5 580.5 L 1530.5 580.5 Z M 1428.5 571.5 L 1443.5 571.5 L 1443.5 580.5 L 1428.5 580.5 Z M 1132.5 571.5 L 1146.5 571.5 L 1146.5 580.5 L 1132.5 580.5 Z M 1162.5 571.5 L 1177.5 571.5 L 1177.5 580.5 L 1162.5 580.5 Z M 1561.5 580.5 L 1576.5 580.5 L 1576.5 585.5 L 1561.5 585.5 Z M 1398.5 580.5 L 1412.5 580.5 L 1412.5 585.5 L 1398.5 585.5 Z M 897.5 580.5 L 911.5 580.5 L 911.5 585.5 L 897.5 585.5 Z M 866.5 580.5 L 880.5 580.5 L 880.5 585.5 L 866.5 585.5 Z M 1132.5 580.5 L 1146.5 580.5 L 1146.5 585.5 L 1132.5 585.5 Z M 1428.5 580.5 L 1443.5 580.5 L 1443.5 585.5 L 1428.5 585.5 Z M 1295.5 580.5 L 1310.5 580.5 L 1310.5 585.5 L 1295.5 585.5 Z M 1030.5 580.5 L 1044.5 580.5 L 1044.5 585.5 L 1030.5 585.5 Z M 1162.5 580.5 L 1177.5 580.5 L 1177.5 585.5 L 1162.5 585.5 Z M 999.5 580.5 L 1013.5 580.5 L 1013.5 585.5 L 999.5 585.5 Z M 642.5 571.5 L 656.5 571.5 L 656.5 585.5 L 642.5 585.5 Z M 764.5 580.5 L 778.5 580.5 L 778.5 585.5 L 764.5 585.5 Z M 1265.5 580.5 L 1279.5 580.5 L 1279.5 585.5 L 1265.5 585.5 Z M 1530.5 580.5 L 1545.5 580.5 L 1545.5 585.5 L 1530.5 585.5 Z M 611.5 571.5 L 626.5 571.5 L 626.5 585.5 L 611.5 585.5 Z M 733.5 580.5 L 748.5 580.5 L 748.5 585.5 L 733.5 585.5 Z M 883.5 669.5 L 897.5 669.5 L 897.5 684.5 L 883.5 684.5 Z M 1687.5 669.5 L 1702.5 669.5 L 1702.5 684.5 L 1687.5 684.5 Z M 1657.5 669.5 L 1671.5 669.5 L 1671.5 684.5 L 1657.5 684.5 Z M 1578.5 669.5 L 1593.5 669.5 L 1593.5 684.5 L 1578.5 684.5 Z M 1548.5 669.5 L 1562.5 669.5 L 1562.5 684.5 L 1548.5 684.5 Z M 1517.5 669.5 L 1531.5 669.5 L 1531.5 684.5 L 1517.5 684.5 Z M 1445.5 669.5 L 1460.5 669.5 L 1460.5 684.5 L 1445.5 684.5 Z M 1415.5 669.5 L 1429.5 669.5 L 1429.5 684.5 L 1415.5 684.5 Z M 1384.5 669.5 L 1398.5 669.5 L 1398.5 684.5 L 1384.5 684.5 Z M 1047.5 669.5 L 1061.5 669.5 L 1061.5 684.5 L 1047.5 684.5 Z M 1016.5 669.5 L 1030.5 669.5 L 1030.5 684.5 L 1016.5 684.5 Z M 985.5 669.5 L 1000.5 669.5 L 1000.5 684.5 L 985.5 684.5 Z M 642.5 669.5 L 656.5 669.5 L 656.5 684.5 L 642.5 684.5 Z M 1312.5 669.5 L 1327.5 669.5 L 1327.5 684.5 L 1312.5 684.5 Z M 1282.5 669.5 L 1296.5 669.5 L 1296.5 684.5 L 1282.5 684.5 Z M 1251.5 669.5 L 1266.5 669.5 L 1266.5 684.5 L 1251.5 684.5 Z M 485.5 669.5 L 500.5 669.5 L 500.5 684.5 L 485.5 684.5 Z M 454.5 669.5 L 469.5 669.5 L 469.5 684.5 L 454.5 684.5 Z M 378.5 669.5 L 392.5 669.5 L 392.5 684.5 L 378.5 684.5 Z M 347.5 669.5 L 362.5 669.5 L 362.5 684.5 L 347.5 684.5 Z M 316.5 669.5 L 331.5 669.5 L 331.5 684.5 L 316.5 684.5 Z M 750.5 669.5 L 765.5 669.5 L 765.5 684.5 L 750.5 684.5 Z M 719.5 669.5 L 734.5 669.5 L 734.5 684.5 L 719.5 684.5 Z M 611.5 669.5 L 626.5 669.5 L 626.5 684.5 L 611.5 684.5 Z M 243.5 669.5 L 257.5 669.5 L 257.5 684.5 L 243.5 684.5 Z M 212.5 669.5 L 227.5 669.5 L 227.5 684.5 L 212.5 684.5 Z M 852.5 669.5 L 867.5 669.5 L 867.5 684.5 L 852.5 684.5 Z M 914.5 669.5 L 928.5 669.5 L 928.5 684.5 L 914.5 684.5 Z M 1179.5 669.5 L 1194.5 669.5 L 1194.5 684.5 L 1179.5 684.5 Z M 1149.5 669.5 L 1163.5 669.5 L 1163.5 684.5 L 1149.5 684.5 Z M 1118.5 669.5 L 1133.5 669.5 L 1133.5 684.5 L 1118.5 684.5 Z M 781.5 669.5 L 795.5 669.5 L 795.5 684.5 L 781.5 684.5 Z M 581.5 669.5 L 595.5 669.5 L 595.5 684.5 L 581.5 684.5 Z M 516.5 669.5 L 530.5 669.5 L 530.5 684.5 L 516.5 684.5 Z M 216.5 713.5 L 230.5 713.5 L 230.5 727.5 L 216.5 727.5 Z M 1688.5 713.5 L 1702.5 713.5 L 1702.5 727.5 L 1688.5 727.5 Z M 1647.5 713.5 L 1661.5 713.5 L 1661.5 727.5 L 1647.5 727.5 Z M 1606.5 713.5 L 1620.5 713.5 L 1620.5 727.5 L 1606.5 727.5 Z M 1565.5 713.5 L 1579.5 713.5 L 1579.5 727.5 L 1565.5 727.5 Z M 1524.5 713.5 L 1539.5 713.5 L 1539.5 727.5 L 1524.5 727.5 Z M 1483.5 713.5 L 1498.5 713.5 L 1498.5 727.5 L 1483.5 727.5 Z M 1442.5 713.5 L 1457.5 713.5 L 1457.5 727.5 L 1442.5 727.5 Z M 1401.5 713.5 L 1416.5 713.5 L 1416.5 727.5 L 1401.5 727.5 Z M 1361.5 713.5 L 1375.5 713.5 L 1375.5 727.5 L 1361.5 727.5 Z M 1320.5 713.5 L 1334.5 713.5 L 1334.5 727.5 L 1320.5 727.5 Z M 1279.5 713.5 L 1293.5 713.5 L 1293.5 727.5 L 1279.5 727.5 Z M 1238.5 713.5 L 1252.5 713.5 L 1252.5 727.5 L 1238.5 727.5 Z M 1197.5 713.5 L 1211.5 713.5 L 1211.5 727.5 L 1197.5 727.5 Z M 1156.5 713.5 L 1171.5 713.5 L 1171.5 727.5 L 1156.5 727.5 Z M 1115.5 713.5 L 1130.5 713.5 L 1130.5 727.5 L 1115.5 727.5 Z M 1074.5 713.5 L 1089.5 713.5 L 1089.5 727.5 L 1074.5 727.5 Z M 1033.5 713.5 L 1048.5 713.5 L 1048.5 727.5 L 1033.5 727.5 Z M 992.5 713.5 L 1007.5 713.5 L 1007.5 727.5 L 992.5 727.5 Z M 952.5 713.5 L 966.5 713.5 L 966.5 727.5 L 952.5 727.5 Z M 911.5 713.5 L 925.5 713.5 L 925.5 727.5 L 911.5 727.5 Z M 870.5 713.5 L 884.5 713.5 L 884.5 727.5 L 870.5 727.5 Z M 829.5 713.5 L 843.5 713.5 L 843.5 727.5 L 829.5 727.5 Z M 788.5 713.5 L 803.5 713.5 L 803.5 727.5 L 788.5 727.5 Z M 747.5 713.5 L 762.5 713.5 L 762.5 727.5 L 747.5 727.5 Z M 706.5 713.5 L 721.5 713.5 L 721.5 727.5 L 706.5 727.5 Z M 665.5 713.5 L 680.5 713.5 L 680.5 727.5 L 665.5 727.5 Z M 624.5 713.5 L 639.5 713.5 L 639.5 727.5 L 624.5 727.5 Z M 584.5 713.5 L 598.5 713.5 L 598.5 727.5 L 584.5 727.5 Z M 543.5 713.5 L 557.5 713.5 L 557.5 727.5 L 543.5 727.5 Z M 502.5 713.5 L 516.5 713.5 L 516.5 727.5 L 502.5 727.5 Z M 461.5 713.5 L 475.5 713.5 L 475.5 727.5 L 461.5 727.5 Z M 420.5 713.5 L 434.5 713.5 L 434.5 727.5 L 420.5 727.5 Z M 379.5 713.5 L 394.5 713.5 L 394.5 727.5 L 379.5 727.5 Z M 338.5 713.5 L 353.5 713.5 L 353.5 727.5 L 338.5 727.5 Z M 297.5 713.5 L 312.5 713.5 L 312.5 727.5 L 297.5 727.5 Z M 256.5 713.5 L 271.5 713.5 L 271.5 727.5 L 256.5 727.5 Z M 256.5 713.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -205,6 +205,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 513.464844 581.972656 L 506.371094 581.972656 L 504.429688 587.5 L 501.929688 587.5 L 508.492188 569.097656 L 511.523438 569.097656 L 517.984375 587.5 L 515.359375 587.5 Z M 512.808594 580.003906 L 509.984375 571.621094 L 506.953125 580.003906 Z M 512.808594 580.003906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 502 508 L 516 508 M 502 494 L 516 494 M 502 494 L 502 508 M 516 494 L 516 508 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 502 508 L 516 508 M 502 494 L 516 494 M 516 508 L 516 494 M 502 508 L 502 494 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 202 354 L 202 363 M 197 359 L 206 359 M 201 360 L 203 360 M 201 358 L 203 358 M 201 358 L 201 360 M 203 358 L 203 360 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_2.svg b/cells/buf/sky130_fd_sc_hvl__buf_2.svg
index fb9d1d8..f5ae562 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_2.svg
+++ b/cells/buf/sky130_fd_sc_hvl__buf_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 715.5 707.5 L 1254.5 707.5 L 1254.5 715.5 L 715.5 715.5 Z M 715.5 715.5 L 1254.5 715.5 L 1254.5 747.5 L 715.5 747.5 Z M 715.5 747.5 L 1254.5 747.5 L 1254.5 787.5 L 715.5 787.5 Z M 715.5 787.5 L 1067.5 787.5 L 1067.5 810.5 L 715.5 810.5 Z M 715.5 810.5 L 1067.5 810.5 L 1067.5 842.5 L 715.5 842.5 Z M 715.5 842.5 L 1067.5 842.5 L 1067.5 850.5 L 715.5 850.5 Z M 715.5 842.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 711.5 245.5 L 766.5 245.5 L 766.5 252.5 L 711.5 252.5 Z M 1009.5 245.5 L 1064.5 245.5 L 1064.5 252.5 L 1009.5 252.5 Z M 861.5 245.5 L 914.5 245.5 L 914.5 252.5 L 861.5 252.5 Z M 711.5 252.5 L 766.5 252.5 L 766.5 285.5 L 711.5 285.5 Z M 861.5 252.5 L 914.5 252.5 L 914.5 285.5 L 861.5 285.5 Z M 1009.5 252.5 L 1064.5 252.5 L 1064.5 285.5 L 1009.5 285.5 Z M 1009.5 285.5 L 1064.5 285.5 L 1064.5 328.5 L 1009.5 328.5 Z M 861.5 285.5 L 914.5 285.5 L 914.5 331.5 L 861.5 331.5 Z M 711.5 285.5 L 766.5 285.5 L 766.5 331.5 L 711.5 331.5 Z M 1009.5 328.5 L 1064.5 328.5 L 1064.5 361.5 L 1009.5 361.5 Z M 711.5 331.5 L 766.5 331.5 L 766.5 364.5 L 711.5 364.5 Z M 861.5 331.5 L 914.5 331.5 L 914.5 364.5 L 861.5 364.5 Z M 1009.5 361.5 L 1064.5 361.5 L 1064.5 387.5 L 1009.5 387.5 Z M 1200.5 387.5 L 1254.5 387.5 L 1254.5 395.5 L 1200.5 395.5 Z M 1009.5 387.5 L 1104.5 387.5 L 1104.5 405.5 L 1009.5 405.5 Z M 711.5 364.5 L 766.5 364.5 L 766.5 411.5 L 711.5 411.5 Z M 861.5 364.5 L 914.5 364.5 L 914.5 411.5 L 861.5 411.5 Z M 1200.5 395.5 L 1254.5 395.5 L 1254.5 427.5 L 1200.5 427.5 Z M 1009.5 405.5 L 1104.5 405.5 L 1104.5 438.5 L 1009.5 438.5 Z M 861.5 411.5 L 914.5 411.5 L 914.5 444.5 L 861.5 444.5 Z M 711.5 411.5 L 766.5 411.5 L 766.5 444.5 L 711.5 444.5 Z M 1009.5 438.5 L 1104.5 438.5 L 1104.5 482.5 L 1009.5 482.5 Z M 861.5 444.5 L 914.5 444.5 L 914.5 490.5 L 861.5 490.5 Z M 711.5 444.5 L 766.5 444.5 L 766.5 490.5 L 711.5 490.5 Z M 1200.5 427.5 L 1254.5 427.5 L 1254.5 490.5 L 1200.5 490.5 Z M 1009.5 482.5 L 1104.5 482.5 L 1104.5 514.5 L 1009.5 514.5 Z M 1200.5 490.5 L 1254.5 490.5 L 1254.5 522.5 L 1200.5 522.5 Z M 711.5 490.5 L 766.5 490.5 L 766.5 522.5 L 711.5 522.5 Z M 861.5 490.5 L 914.5 490.5 L 914.5 522.5 L 861.5 522.5 Z M 861.5 522.5 L 914.5 522.5 L 914.5 530.5 L 861.5 530.5 Z M 711.5 522.5 L 766.5 522.5 L 766.5 530.5 L 711.5 530.5 Z M 1009.5 514.5 L 1104.5 514.5 L 1104.5 530.5 L 1009.5 530.5 Z M 1200.5 522.5 L 1254.5 522.5 L 1254.5 530.5 L 1200.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1108.5 707.5 L 1203.5 707.5 L 1203.5 787.5 L 1108.5 787.5 Z M 770.5 707.5 L 865.5 707.5 L 865.5 850.5 L 770.5 850.5 Z M 918.5 707.5 L 1013.5 707.5 L 1013.5 850.5 L 918.5 850.5 Z M 918.5 707.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 766.5 245.5 L 861.5 245.5 L 861.5 530.5 L 766.5 530.5 Z M 1104.5 387.5 L 1200.5 387.5 L 1200.5 530.5 L 1104.5 530.5 Z M 914.5 245.5 L 1009.5 245.5 L 1009.5 530.5 L 914.5 530.5 Z M 914.5 245.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 664.5 252.5 L 696.5 252.5 L 696.5 285.5 L 664.5 285.5 Z M 1143.5 252.5 L 1176.5 252.5 L 1176.5 285.5 L 1143.5 285.5 Z M 1075.5 252.5 L 1107.5 252.5 L 1107.5 285.5 L 1075.5 285.5 Z M 1006.5 252.5 L 1039.5 252.5 L 1039.5 285.5 L 1006.5 285.5 Z M 938.5 252.5 L 970.5 252.5 L 970.5 285.5 L 938.5 285.5 Z M 801.5 252.5 L 833.5 252.5 L 833.5 285.5 L 801.5 285.5 Z M 732.5 252.5 L 765.5 252.5 L 765.5 285.5 L 732.5 285.5 Z M 666.5 844.5 L 698.5 844.5 L 698.5 876.5 L 666.5 876.5 Z M 1147.5 844.5 L 1180.5 844.5 L 1180.5 876.5 L 1147.5 876.5 Z M 1079.5 844.5 L 1111.5 844.5 L 1111.5 876.5 L 1079.5 876.5 Z M 1010.5 844.5 L 1043.5 844.5 L 1043.5 876.5 L 1010.5 876.5 Z M 942.5 844.5 L 974.5 844.5 L 974.5 876.5 L 942.5 876.5 Z M 803.5 844.5 L 835.5 844.5 L 835.5 876.5 L 803.5 876.5 Z M 734.5 844.5 L 767.5 844.5 L 767.5 876.5 L 734.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface305">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -186,6 +186,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 875.433594 634.519531 L 889.910156 655.5 L 883.457031 655.5 L 872.292969 638.445312 L 861.074219 655.5 L 854.734375 655.5 L 869.207031 634.519531 L 855.632812 614.601562 L 861.972656 614.601562 L 872.460938 630.648438 L 883.007812 614.601562 L 889.234375 614.601562 Z M 875.433594 634.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 855 460 L 888 460 M 855 428 L 888 428 M 855 428 L 855 460 M 888 428 L 888 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 460 L 888 460 M 855 428 L 888 428 M 888 460 L 888 428 M 855 460 L 855 428 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_32.svg b/cells/buf/sky130_fd_sc_hvl__buf_32.svg
index f9a073b..e2eb9ca 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_32.svg
+++ b/cells/buf/sky130_fd_sc_hvl__buf_32.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 428.5 L 1743.5 428.5 L 1743.5 547.5 L 174.5 547.5 Z M 174.5 428.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 189.5 443.5 L 1728.5 443.5 L 1728.5 450.5 L 189.5 450.5 Z M 189.5 443.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 189.5 443.5 L 1728.5 443.5 L 1728.5 450.5 L 189.5 450.5 Z M 196.5 566.5 L 1719.5 566.5 L 1719.5 570.5 L 196.5 570.5 Z M 196.5 570.5 L 1719.5 570.5 L 1719.5 578.5 L 196.5 578.5 Z M 196.5 578.5 L 1719.5 578.5 L 1719.5 586.5 L 196.5 586.5 Z M 196.5 586.5 L 1719.5 586.5 L 1719.5 594.5 L 196.5 594.5 Z M 196.5 594.5 L 1719.5 594.5 L 1719.5 601.5 L 196.5 601.5 Z M 196.5 594.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 189.5 629.5 L 1728.5 629.5 L 1728.5 637.5 L 189.5 637.5 Z M 189.5 629.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1671.5 463.5 L 1684.5 463.5 L 1684.5 465.5 L 1671.5 465.5 Z M 1600.5 463.5 L 1613.5 463.5 L 1613.5 465.5 L 1600.5 465.5 Z M 1457.5 463.5 L 1470.5 463.5 L 1470.5 465.5 L 1457.5 465.5 Z M 1171.5 463.5 L 1184.5 463.5 L 1184.5 465.5 L 1171.5 465.5 Z M 599.5 463.5 L 612.5 463.5 L 612.5 465.5 L 599.5 465.5 Z M 517.5 463.5 L 530.5 463.5 L 530.5 465.5 L 517.5 465.5 Z M 1421.5 463.5 L 1434.5 463.5 L 1434.5 465.5 L 1421.5 465.5 Z M 1100.5 463.5 L 1112.5 463.5 L 1112.5 465.5 L 1100.5 465.5 Z M 445.5 463.5 L 458.5 463.5 L 458.5 465.5 L 445.5 465.5 Z M 1064.5 463.5 L 1077.5 463.5 L 1077.5 465.5 L 1064.5 465.5 Z M 374.5 463.5 L 387.5 463.5 L 387.5 465.5 L 374.5 465.5 Z M 1564.5 463.5 L 1577.5 463.5 L 1577.5 465.5 L 1564.5 465.5 Z M 1385.5 463.5 L 1398.5 463.5 L 1398.5 465.5 L 1385.5 465.5 Z M 1028.5 463.5 L 1041.5 463.5 L 1041.5 465.5 L 1028.5 465.5 Z M 303.5 463.5 L 315.5 463.5 L 315.5 465.5 L 303.5 465.5 Z M 992.5 463.5 L 1005.5 463.5 L 1005.5 465.5 L 992.5 465.5 Z M 231.5 463.5 L 244.5 463.5 L 244.5 465.5 L 231.5 465.5 Z M 1350.5 463.5 L 1363.5 463.5 L 1363.5 465.5 L 1350.5 465.5 Z M 957.5 463.5 L 969.5 463.5 L 969.5 465.5 L 957.5 465.5 Z M 921.5 463.5 L 934.5 463.5 L 934.5 465.5 L 921.5 465.5 Z M 1636.5 463.5 L 1648.5 463.5 L 1648.5 465.5 L 1636.5 465.5 Z M 1528.5 463.5 L 1541.5 463.5 L 1541.5 465.5 L 1528.5 465.5 Z M 1314.5 463.5 L 1327.5 463.5 L 1327.5 465.5 L 1314.5 465.5 Z M 885.5 463.5 L 898.5 463.5 L 898.5 465.5 L 885.5 465.5 Z M 849.5 463.5 L 862.5 463.5 L 862.5 465.5 L 849.5 465.5 Z M 1278.5 463.5 L 1291.5 463.5 L 1291.5 465.5 L 1278.5 465.5 Z M 814.5 463.5 L 827.5 463.5 L 827.5 465.5 L 814.5 465.5 Z M 778.5 463.5 L 791.5 463.5 L 791.5 465.5 L 778.5 465.5 Z M 1493.5 463.5 L 1505.5 463.5 L 1505.5 465.5 L 1493.5 465.5 Z M 1242.5 463.5 L 1255.5 463.5 L 1255.5 465.5 L 1242.5 465.5 Z M 742.5 463.5 L 755.5 463.5 L 755.5 465.5 L 742.5 465.5 Z M 707.5 463.5 L 719.5 463.5 L 719.5 465.5 L 707.5 465.5 Z M 1207.5 463.5 L 1220.5 463.5 L 1220.5 465.5 L 1207.5 465.5 Z M 671.5 463.5 L 684.5 463.5 L 684.5 465.5 L 671.5 465.5 Z M 635.5 463.5 L 648.5 463.5 L 648.5 465.5 L 635.5 465.5 Z M 1707.5 463.5 L 1719.5 463.5 L 1719.5 466.5 L 1707.5 466.5 Z M 553.5 463.5 L 576.5 463.5 L 576.5 466.5 L 553.5 466.5 Z M 1135.5 463.5 L 1148.5 463.5 L 1148.5 466.5 L 1135.5 466.5 Z M 481.5 463.5 L 494.5 463.5 L 494.5 466.5 L 481.5 466.5 Z M 410.5 463.5 L 423.5 463.5 L 423.5 466.5 L 410.5 466.5 Z M 338.5 463.5 L 351.5 463.5 L 351.5 466.5 L 338.5 466.5 Z M 267.5 463.5 L 280.5 463.5 L 280.5 466.5 L 267.5 466.5 Z M 196.5 463.5 L 208.5 463.5 L 208.5 466.5 L 196.5 466.5 Z M 231.5 465.5 L 244.5 465.5 L 244.5 472.5 L 231.5 472.5 Z M 1457.5 465.5 L 1470.5 465.5 L 1470.5 472.5 L 1457.5 472.5 Z M 1421.5 465.5 L 1434.5 465.5 L 1434.5 472.5 L 1421.5 472.5 Z M 635.5 465.5 L 648.5 465.5 L 648.5 472.5 L 635.5 472.5 Z M 1385.5 465.5 L 1398.5 465.5 L 1398.5 472.5 L 1385.5 472.5 Z M 303.5 465.5 L 315.5 465.5 L 315.5 472.5 L 303.5 472.5 Z M 1350.5 465.5 L 1363.5 465.5 L 1363.5 472.5 L 1350.5 472.5 Z M 1314.5 465.5 L 1327.5 465.5 L 1327.5 472.5 L 1314.5 472.5 Z M 374.5 465.5 L 387.5 465.5 L 387.5 472.5 L 374.5 472.5 Z M 1278.5 465.5 L 1291.5 465.5 L 1291.5 472.5 L 1278.5 472.5 Z M 445.5 465.5 L 458.5 465.5 L 458.5 472.5 L 445.5 472.5 Z M 1242.5 465.5 L 1255.5 465.5 L 1255.5 472.5 L 1242.5 472.5 Z M 1207.5 465.5 L 1220.5 465.5 L 1220.5 472.5 L 1207.5 472.5 Z M 517.5 465.5 L 530.5 465.5 L 530.5 472.5 L 517.5 472.5 Z M 1171.5 465.5 L 1184.5 465.5 L 1184.5 472.5 L 1171.5 472.5 Z M 1100.5 465.5 L 1112.5 465.5 L 1112.5 472.5 L 1100.5 472.5 Z M 599.5 465.5 L 612.5 465.5 L 612.5 472.5 L 599.5 472.5 Z M 1671.5 465.5 L 1684.5 465.5 L 1684.5 472.5 L 1671.5 472.5 Z M 849.5 465.5 L 862.5 465.5 L 862.5 472.5 L 849.5 472.5 Z M 885.5 465.5 L 898.5 465.5 L 898.5 472.5 L 885.5 472.5 Z M 921.5 465.5 L 934.5 465.5 L 934.5 472.5 L 921.5 472.5 Z M 957.5 465.5 L 969.5 465.5 L 969.5 472.5 L 957.5 472.5 Z M 992.5 465.5 L 1005.5 465.5 L 1005.5 472.5 L 992.5 472.5 Z M 1028.5 465.5 L 1041.5 465.5 L 1041.5 472.5 L 1028.5 472.5 Z M 1064.5 465.5 L 1077.5 465.5 L 1077.5 472.5 L 1064.5 472.5 Z M 814.5 465.5 L 827.5 465.5 L 827.5 472.5 L 814.5 472.5 Z M 671.5 465.5 L 684.5 465.5 L 684.5 472.5 L 671.5 472.5 Z M 1636.5 465.5 L 1648.5 465.5 L 1648.5 472.5 L 1636.5 472.5 Z M 707.5 465.5 L 719.5 465.5 L 719.5 472.5 L 707.5 472.5 Z M 1600.5 465.5 L 1613.5 465.5 L 1613.5 472.5 L 1600.5 472.5 Z M 1564.5 465.5 L 1577.5 465.5 L 1577.5 472.5 L 1564.5 472.5 Z M 742.5 465.5 L 755.5 465.5 L 755.5 472.5 L 742.5 472.5 Z M 1528.5 465.5 L 1541.5 465.5 L 1541.5 472.5 L 1528.5 472.5 Z M 1493.5 465.5 L 1505.5 465.5 L 1505.5 472.5 L 1493.5 472.5 Z M 778.5 465.5 L 791.5 465.5 L 791.5 472.5 L 778.5 472.5 Z M 1135.5 466.5 L 1148.5 466.5 L 1148.5 473.5 L 1135.5 473.5 Z M 338.5 466.5 L 351.5 466.5 L 351.5 473.5 L 338.5 473.5 Z M 196.5 466.5 L 208.5 466.5 L 208.5 473.5 L 196.5 473.5 Z M 410.5 466.5 L 423.5 466.5 L 423.5 473.5 L 410.5 473.5 Z M 1707.5 466.5 L 1719.5 466.5 L 1719.5 473.5 L 1707.5 473.5 Z M 481.5 466.5 L 494.5 466.5 L 494.5 473.5 L 481.5 473.5 Z M 553.5 466.5 L 576.5 466.5 L 576.5 473.5 L 553.5 473.5 Z M 267.5 466.5 L 280.5 466.5 L 280.5 473.5 L 267.5 473.5 Z M 410.5 473.5 L 423.5 473.5 L 423.5 481.5 L 410.5 481.5 Z M 338.5 473.5 L 351.5 473.5 L 351.5 481.5 L 338.5 481.5 Z M 267.5 473.5 L 280.5 473.5 L 280.5 481.5 L 267.5 481.5 Z M 553.5 473.5 L 576.5 473.5 L 576.5 481.5 L 553.5 481.5 Z M 481.5 473.5 L 494.5 473.5 L 494.5 481.5 L 481.5 481.5 Z M 1636.5 472.5 L 1648.5 472.5 L 1648.5 483.5 L 1636.5 483.5 Z M 1385.5 472.5 L 1398.5 472.5 L 1398.5 483.5 L 1385.5 483.5 Z M 1314.5 472.5 L 1327.5 472.5 L 1327.5 483.5 L 1314.5 483.5 Z M 742.5 472.5 L 755.5 472.5 L 755.5 483.5 L 742.5 483.5 Z M 599.5 472.5 L 612.5 472.5 L 612.5 483.5 L 599.5 483.5 Z M 707.5 472.5 L 719.5 472.5 L 719.5 483.5 L 707.5 483.5 Z M 1600.5 472.5 L 1613.5 472.5 L 1613.5 483.5 L 1600.5 483.5 Z M 1278.5 472.5 L 1291.5 472.5 L 1291.5 483.5 L 1278.5 483.5 Z M 992.5 472.5 L 1005.5 472.5 L 1005.5 483.5 L 992.5 483.5 Z M 957.5 472.5 L 969.5 472.5 L 969.5 483.5 L 957.5 483.5 Z M 1242.5 472.5 L 1255.5 472.5 L 1255.5 483.5 L 1242.5 483.5 Z M 1207.5 472.5 L 1220.5 472.5 L 1220.5 483.5 L 1207.5 483.5 Z M 1671.5 472.5 L 1684.5 472.5 L 1684.5 483.5 L 1671.5 483.5 Z M 849.5 472.5 L 862.5 472.5 L 862.5 483.5 L 849.5 483.5 Z M 1707.5 473.5 L 1719.5 473.5 L 1719.5 483.5 L 1707.5 483.5 Z M 1135.5 473.5 L 1148.5 473.5 L 1148.5 483.5 L 1135.5 483.5 Z M 1421.5 472.5 L 1434.5 472.5 L 1434.5 483.5 L 1421.5 483.5 Z M 1564.5 472.5 L 1577.5 472.5 L 1577.5 483.5 L 1564.5 483.5 Z M 778.5 472.5 L 791.5 472.5 L 791.5 483.5 L 778.5 483.5 Z M 1064.5 472.5 L 1077.5 472.5 L 1077.5 483.5 L 1064.5 483.5 Z M 814.5 472.5 L 827.5 472.5 L 827.5 483.5 L 814.5 483.5 Z M 1350.5 472.5 L 1363.5 472.5 L 1363.5 483.5 L 1350.5 483.5 Z M 1493.5 472.5 L 1505.5 472.5 L 1505.5 483.5 L 1493.5 483.5 Z M 1457.5 472.5 L 1470.5 472.5 L 1470.5 483.5 L 1457.5 483.5 Z M 1028.5 472.5 L 1041.5 472.5 L 1041.5 483.5 L 1028.5 483.5 Z M 1100.5 472.5 L 1112.5 472.5 L 1112.5 483.5 L 1100.5 483.5 Z M 1171.5 472.5 L 1184.5 472.5 L 1184.5 483.5 L 1171.5 483.5 Z M 635.5 472.5 L 648.5 472.5 L 648.5 483.5 L 635.5 483.5 Z M 885.5 472.5 L 898.5 472.5 L 898.5 483.5 L 885.5 483.5 Z M 671.5 472.5 L 684.5 472.5 L 684.5 483.5 L 671.5 483.5 Z M 921.5 472.5 L 934.5 472.5 L 934.5 483.5 L 921.5 483.5 Z M 1528.5 472.5 L 1541.5 472.5 L 1541.5 483.5 L 1528.5 483.5 Z M 231.5 472.5 L 244.5 472.5 L 244.5 486.5 L 231.5 486.5 Z M 196.5 473.5 L 208.5 473.5 L 208.5 486.5 L 196.5 486.5 Z M 374.5 472.5 L 387.5 472.5 L 387.5 486.5 L 374.5 486.5 Z M 303.5 472.5 L 315.5 472.5 L 315.5 486.5 L 303.5 486.5 Z M 517.5 472.5 L 530.5 472.5 L 530.5 486.5 L 517.5 486.5 Z M 445.5 472.5 L 458.5 472.5 L 458.5 486.5 L 445.5 486.5 Z M 267.5 481.5 L 280.5 481.5 L 280.5 489.5 L 267.5 489.5 Z M 553.5 481.5 L 576.5 481.5 L 576.5 489.5 L 553.5 489.5 Z M 481.5 481.5 L 494.5 481.5 L 494.5 489.5 L 481.5 489.5 Z M 338.5 481.5 L 351.5 481.5 L 351.5 489.5 L 338.5 489.5 Z M 410.5 481.5 L 423.5 481.5 L 423.5 489.5 L 410.5 489.5 Z M 1600.5 483.5 L 1613.5 483.5 L 1613.5 491.5 L 1600.5 491.5 Z M 707.5 483.5 L 719.5 483.5 L 719.5 491.5 L 707.5 491.5 Z M 1564.5 483.5 L 1577.5 483.5 L 1577.5 491.5 L 1564.5 491.5 Z M 599.5 483.5 L 612.5 483.5 L 612.5 491.5 L 599.5 491.5 Z M 1528.5 483.5 L 1541.5 483.5 L 1541.5 491.5 L 1528.5 491.5 Z M 635.5 483.5 L 648.5 483.5 L 648.5 491.5 L 635.5 491.5 Z M 1493.5 483.5 L 1505.5 483.5 L 1505.5 491.5 L 1493.5 491.5 Z M 1457.5 483.5 L 1470.5 483.5 L 1470.5 491.5 L 1457.5 491.5 Z M 671.5 483.5 L 684.5 483.5 L 684.5 491.5 L 671.5 491.5 Z M 742.5 483.5 L 755.5 483.5 L 755.5 491.5 L 742.5 491.5 Z M 1421.5 483.5 L 1434.5 483.5 L 1434.5 491.5 L 1421.5 491.5 Z M 992.5 483.5 L 1005.5 483.5 L 1005.5 491.5 L 992.5 491.5 Z M 1385.5 483.5 L 1398.5 483.5 L 1398.5 491.5 L 1385.5 491.5 Z M 778.5 483.5 L 791.5 483.5 L 791.5 491.5 L 778.5 491.5 Z M 1064.5 483.5 L 1077.5 483.5 L 1077.5 491.5 L 1064.5 491.5 Z M 1100.5 483.5 L 1112.5 483.5 L 1112.5 491.5 L 1100.5 491.5 Z M 1350.5 483.5 L 1363.5 483.5 L 1363.5 491.5 L 1350.5 491.5 Z M 1242.5 483.5 L 1255.5 483.5 L 1255.5 491.5 L 1242.5 491.5 Z M 1314.5 483.5 L 1327.5 483.5 L 1327.5 491.5 L 1314.5 491.5 Z M 814.5 483.5 L 827.5 483.5 L 827.5 491.5 L 814.5 491.5 Z M 1278.5 483.5 L 1291.5 483.5 L 1291.5 491.5 L 1278.5 491.5 Z M 849.5 483.5 L 862.5 483.5 L 862.5 491.5 L 849.5 491.5 Z M 885.5 483.5 L 898.5 483.5 L 898.5 491.5 L 885.5 491.5 Z M 1207.5 483.5 L 1220.5 483.5 L 1220.5 491.5 L 1207.5 491.5 Z M 1171.5 483.5 L 1184.5 483.5 L 1184.5 491.5 L 1171.5 491.5 Z M 1135.5 483.5 L 1148.5 483.5 L 1148.5 491.5 L 1135.5 491.5 Z M 957.5 483.5 L 969.5 483.5 L 969.5 491.5 L 957.5 491.5 Z M 1707.5 483.5 L 1719.5 483.5 L 1719.5 491.5 L 1707.5 491.5 Z M 1028.5 483.5 L 1041.5 483.5 L 1041.5 491.5 L 1028.5 491.5 Z M 1671.5 483.5 L 1684.5 483.5 L 1684.5 491.5 L 1671.5 491.5 Z M 1636.5 483.5 L 1648.5 483.5 L 1648.5 491.5 L 1636.5 491.5 Z M 921.5 483.5 L 934.5 483.5 L 934.5 491.5 L 921.5 491.5 Z M 303.5 486.5 L 315.5 486.5 L 315.5 494.5 L 303.5 494.5 Z M 517.5 486.5 L 530.5 486.5 L 530.5 494.5 L 517.5 494.5 Z M 196.5 486.5 L 208.5 486.5 L 208.5 494.5 L 196.5 494.5 Z M 374.5 486.5 L 387.5 486.5 L 387.5 494.5 L 374.5 494.5 Z M 445.5 486.5 L 458.5 486.5 L 458.5 494.5 L 445.5 494.5 Z M 231.5 486.5 L 244.5 486.5 L 244.5 494.5 L 231.5 494.5 Z M 267.5 489.5 L 280.5 489.5 L 280.5 497.5 L 267.5 497.5 Z M 481.5 489.5 L 494.5 489.5 L 494.5 497.5 L 481.5 497.5 Z M 410.5 489.5 L 423.5 489.5 L 423.5 497.5 L 410.5 497.5 Z M 338.5 489.5 L 351.5 489.5 L 351.5 497.5 L 338.5 497.5 Z M 1528.5 491.5 L 1541.5 491.5 L 1541.5 501.5 L 1528.5 501.5 Z M 957.5 491.5 L 969.5 491.5 L 969.5 501.5 L 957.5 501.5 Z M 1493.5 491.5 L 1505.5 491.5 L 1505.5 501.5 L 1493.5 501.5 Z M 885.5 491.5 L 898.5 491.5 L 898.5 501.5 L 885.5 501.5 Z M 849.5 491.5 L 862.5 491.5 L 862.5 501.5 L 849.5 501.5 Z M 1457.5 491.5 L 1470.5 491.5 L 1470.5 501.5 L 1457.5 501.5 Z M 1171.5 491.5 L 1184.5 491.5 L 1184.5 501.5 L 1171.5 501.5 Z M 1028.5 491.5 L 1041.5 491.5 L 1041.5 501.5 L 1028.5 501.5 Z M 1135.5 491.5 L 1148.5 491.5 L 1148.5 501.5 L 1135.5 501.5 Z M 1421.5 491.5 L 1434.5 491.5 L 1434.5 501.5 L 1421.5 501.5 Z M 1278.5 491.5 L 1291.5 491.5 L 1291.5 501.5 L 1278.5 501.5 Z M 1385.5 491.5 L 1398.5 491.5 L 1398.5 501.5 L 1385.5 501.5 Z M 1207.5 491.5 L 1220.5 491.5 L 1220.5 501.5 L 1207.5 501.5 Z M 1707.5 491.5 L 1719.5 491.5 L 1719.5 501.5 L 1707.5 501.5 Z M 1564.5 491.5 L 1577.5 491.5 L 1577.5 501.5 L 1564.5 501.5 Z M 1671.5 491.5 L 1684.5 491.5 L 1684.5 501.5 L 1671.5 501.5 Z M 1350.5 491.5 L 1363.5 491.5 L 1363.5 501.5 L 1350.5 501.5 Z M 1600.5 491.5 L 1613.5 491.5 L 1613.5 501.5 L 1600.5 501.5 Z M 992.5 491.5 L 1005.5 491.5 L 1005.5 501.5 L 992.5 501.5 Z M 1242.5 491.5 L 1255.5 491.5 L 1255.5 501.5 L 1242.5 501.5 Z M 1636.5 491.5 L 1648.5 491.5 L 1648.5 501.5 L 1636.5 501.5 Z M 814.5 491.5 L 827.5 491.5 L 827.5 501.5 L 814.5 501.5 Z M 1064.5 491.5 L 1077.5 491.5 L 1077.5 501.5 L 1064.5 501.5 Z M 1314.5 491.5 L 1327.5 491.5 L 1327.5 501.5 L 1314.5 501.5 Z M 1100.5 491.5 L 1112.5 491.5 L 1112.5 501.5 L 1100.5 501.5 Z M 707.5 491.5 L 719.5 491.5 L 719.5 501.5 L 707.5 501.5 Z M 635.5 491.5 L 648.5 491.5 L 648.5 501.5 L 635.5 501.5 Z M 778.5 491.5 L 791.5 491.5 L 791.5 501.5 L 778.5 501.5 Z M 599.5 491.5 L 612.5 491.5 L 612.5 501.5 L 599.5 501.5 Z M 742.5 491.5 L 755.5 491.5 L 755.5 501.5 L 742.5 501.5 Z M 671.5 491.5 L 684.5 491.5 L 684.5 501.5 L 671.5 501.5 Z M 921.5 491.5 L 934.5 491.5 L 934.5 501.5 L 921.5 501.5 Z M 196.5 494.5 L 208.5 494.5 L 208.5 504.5 L 196.5 504.5 Z M 231.5 494.5 L 244.5 494.5 L 244.5 505.5 L 231.5 505.5 Z M 303.5 494.5 L 315.5 494.5 L 315.5 505.5 L 303.5 505.5 Z M 338.5 497.5 L 351.5 497.5 L 351.5 505.5 L 338.5 505.5 Z M 267.5 497.5 L 280.5 497.5 L 280.5 505.5 L 267.5 505.5 Z M 517.5 494.5 L 530.5 494.5 L 530.5 505.5 L 517.5 505.5 Z M 374.5 494.5 L 387.5 494.5 L 387.5 505.5 L 374.5 505.5 Z M 445.5 494.5 L 458.5 494.5 L 458.5 505.5 L 445.5 505.5 Z M 481.5 497.5 L 494.5 497.5 L 494.5 505.5 L 481.5 505.5 Z M 410.5 497.5 L 423.5 497.5 L 423.5 505.5 L 410.5 505.5 Z M 553.5 489.5 L 576.5 489.5 L 576.5 506.5 L 553.5 506.5 Z M 707.5 501.5 L 719.5 501.5 L 719.5 509.5 L 707.5 509.5 Z M 1564.5 501.5 L 1577.5 501.5 L 1577.5 509.5 L 1564.5 509.5 Z M 599.5 501.5 L 612.5 501.5 L 612.5 509.5 L 599.5 509.5 Z M 1528.5 501.5 L 1541.5 501.5 L 1541.5 509.5 L 1528.5 509.5 Z M 1493.5 501.5 L 1505.5 501.5 L 1505.5 509.5 L 1493.5 509.5 Z M 635.5 501.5 L 648.5 501.5 L 648.5 509.5 L 635.5 509.5 Z M 1457.5 501.5 L 1470.5 501.5 L 1470.5 509.5 L 1457.5 509.5 Z M 671.5 501.5 L 684.5 501.5 L 684.5 509.5 L 671.5 509.5 Z M 1421.5 501.5 L 1434.5 501.5 L 1434.5 509.5 L 1421.5 509.5 Z M 742.5 501.5 L 755.5 501.5 L 755.5 509.5 L 742.5 509.5 Z M 1385.5 501.5 L 1398.5 501.5 L 1398.5 509.5 L 1385.5 509.5 Z M 1350.5 501.5 L 1363.5 501.5 L 1363.5 509.5 L 1350.5 509.5 Z M 992.5 501.5 L 1005.5 501.5 L 1005.5 509.5 L 992.5 509.5 Z M 1028.5 501.5 L 1041.5 501.5 L 1041.5 509.5 L 1028.5 509.5 Z M 1064.5 501.5 L 1077.5 501.5 L 1077.5 509.5 L 1064.5 509.5 Z M 1100.5 501.5 L 1112.5 501.5 L 1112.5 509.5 L 1100.5 509.5 Z M 1314.5 501.5 L 1327.5 501.5 L 1327.5 509.5 L 1314.5 509.5 Z M 1171.5 501.5 L 1184.5 501.5 L 1184.5 509.5 L 1171.5 509.5 Z M 778.5 501.5 L 791.5 501.5 L 791.5 509.5 L 778.5 509.5 Z M 1278.5 501.5 L 1291.5 501.5 L 1291.5 509.5 L 1278.5 509.5 Z M 1242.5 501.5 L 1255.5 501.5 L 1255.5 509.5 L 1242.5 509.5 Z M 957.5 501.5 L 969.5 501.5 L 969.5 509.5 L 957.5 509.5 Z M 814.5 501.5 L 827.5 501.5 L 827.5 509.5 L 814.5 509.5 Z M 1207.5 501.5 L 1220.5 501.5 L 1220.5 509.5 L 1207.5 509.5 Z M 1135.5 501.5 L 1148.5 501.5 L 1148.5 509.5 L 1135.5 509.5 Z M 849.5 501.5 L 862.5 501.5 L 862.5 509.5 L 849.5 509.5 Z M 1707.5 501.5 L 1719.5 501.5 L 1719.5 509.5 L 1707.5 509.5 Z M 1671.5 501.5 L 1684.5 501.5 L 1684.5 509.5 L 1671.5 509.5 Z M 885.5 501.5 L 898.5 501.5 L 898.5 509.5 L 885.5 509.5 Z M 1600.5 501.5 L 1613.5 501.5 L 1613.5 509.5 L 1600.5 509.5 Z M 1636.5 501.5 L 1648.5 501.5 L 1648.5 509.5 L 1636.5 509.5 Z M 921.5 501.5 L 934.5 501.5 L 934.5 509.5 L 921.5 509.5 Z M 338.5 505.5 L 351.5 505.5 L 351.5 512.5 L 338.5 512.5 Z M 196.5 504.5 L 208.5 504.5 L 208.5 512.5 L 196.5 512.5 Z M 267.5 505.5 L 280.5 505.5 L 280.5 512.5 L 267.5 512.5 Z M 410.5 505.5 L 423.5 505.5 L 423.5 512.5 L 410.5 512.5 Z M 481.5 505.5 L 494.5 505.5 L 494.5 512.5 L 481.5 512.5 Z M 374.5 505.5 L 387.5 505.5 L 387.5 513.5 L 374.5 513.5 Z M 303.5 505.5 L 315.5 505.5 L 315.5 513.5 L 303.5 513.5 Z M 445.5 505.5 L 458.5 505.5 L 458.5 513.5 L 445.5 513.5 Z M 517.5 505.5 L 530.5 505.5 L 530.5 513.5 L 517.5 513.5 Z M 231.5 505.5 L 244.5 505.5 L 244.5 513.5 L 231.5 513.5 Z M 553.5 506.5 L 576.5 506.5 L 576.5 514.5 L 553.5 514.5 Z M 338.5 512.5 L 351.5 512.5 L 351.5 520.5 L 338.5 520.5 Z M 267.5 512.5 L 280.5 512.5 L 280.5 520.5 L 267.5 520.5 Z M 410.5 512.5 L 423.5 512.5 L 423.5 520.5 L 410.5 520.5 Z M 481.5 512.5 L 494.5 512.5 L 494.5 520.5 L 481.5 520.5 Z M 196.5 512.5 L 208.5 512.5 L 208.5 521.5 L 196.5 521.5 Z M 1135.5 509.5 L 1148.5 509.5 L 1148.5 521.5 L 1135.5 521.5 Z M 1707.5 509.5 L 1719.5 509.5 L 1719.5 521.5 L 1707.5 521.5 Z M 1064.5 509.5 L 1077.5 509.5 L 1077.5 522.5 L 1064.5 522.5 Z M 992.5 509.5 L 1005.5 509.5 L 1005.5 522.5 L 992.5 522.5 Z M 814.5 509.5 L 827.5 509.5 L 827.5 522.5 L 814.5 522.5 Z M 231.5 513.5 L 244.5 513.5 L 244.5 522.5 L 231.5 522.5 Z M 1350.5 509.5 L 1363.5 509.5 L 1363.5 522.5 L 1350.5 522.5 Z M 1564.5 509.5 L 1577.5 509.5 L 1577.5 522.5 L 1564.5 522.5 Z M 1457.5 509.5 L 1470.5 509.5 L 1470.5 522.5 L 1457.5 522.5 Z M 1171.5 509.5 L 1184.5 509.5 L 1184.5 522.5 L 1171.5 522.5 Z M 1028.5 509.5 L 1041.5 509.5 L 1041.5 522.5 L 1028.5 522.5 Z M 707.5 509.5 L 719.5 509.5 L 719.5 522.5 L 707.5 522.5 Z M 1421.5 509.5 L 1434.5 509.5 L 1434.5 522.5 L 1421.5 522.5 Z M 1278.5 509.5 L 1291.5 509.5 L 1291.5 522.5 L 1278.5 522.5 Z M 1385.5 509.5 L 1398.5 509.5 L 1398.5 522.5 L 1385.5 522.5 Z M 885.5 509.5 L 898.5 509.5 L 898.5 522.5 L 885.5 522.5 Z M 517.5 513.5 L 530.5 513.5 L 530.5 522.5 L 517.5 522.5 Z M 849.5 509.5 L 862.5 509.5 L 862.5 522.5 L 849.5 522.5 Z M 1636.5 509.5 L 1648.5 509.5 L 1648.5 522.5 L 1636.5 522.5 Z M 445.5 513.5 L 458.5 513.5 L 458.5 522.5 L 445.5 522.5 Z M 303.5 513.5 L 315.5 513.5 L 315.5 522.5 L 303.5 522.5 Z M 374.5 513.5 L 387.5 513.5 L 387.5 522.5 L 374.5 522.5 Z M 742.5 509.5 L 755.5 509.5 L 755.5 522.5 L 742.5 522.5 Z M 1493.5 509.5 L 1505.5 509.5 L 1505.5 522.5 L 1493.5 522.5 Z M 921.5 509.5 L 934.5 509.5 L 934.5 522.5 L 921.5 522.5 Z M 1671.5 509.5 L 1684.5 509.5 L 1684.5 522.5 L 1671.5 522.5 Z M 1314.5 509.5 L 1327.5 509.5 L 1327.5 522.5 L 1314.5 522.5 Z M 553.5 514.5 L 576.5 514.5 L 576.5 522.5 L 553.5 522.5 Z M 1207.5 509.5 L 1220.5 509.5 L 1220.5 522.5 L 1207.5 522.5 Z M 1528.5 509.5 L 1541.5 509.5 L 1541.5 522.5 L 1528.5 522.5 Z M 1242.5 509.5 L 1255.5 509.5 L 1255.5 522.5 L 1242.5 522.5 Z M 671.5 509.5 L 684.5 509.5 L 684.5 522.5 L 671.5 522.5 Z M 778.5 509.5 L 791.5 509.5 L 791.5 522.5 L 778.5 522.5 Z M 957.5 509.5 L 969.5 509.5 L 969.5 522.5 L 957.5 522.5 Z M 599.5 509.5 L 612.5 509.5 L 612.5 522.5 L 599.5 522.5 Z M 635.5 509.5 L 648.5 509.5 L 648.5 522.5 L 635.5 522.5 Z M 1600.5 509.5 L 1613.5 509.5 L 1613.5 522.5 L 1600.5 522.5 Z M 1100.5 509.5 L 1112.5 509.5 L 1112.5 522.5 L 1100.5 522.5 Z M 196.5 521.5 L 208.5 521.5 L 208.5 529.5 L 196.5 529.5 Z M 1707.5 521.5 L 1719.5 521.5 L 1719.5 529.5 L 1707.5 529.5 Z M 1135.5 521.5 L 1148.5 521.5 L 1148.5 529.5 L 1135.5 529.5 Z M 1528.5 522.5 L 1541.5 522.5 L 1541.5 530.5 L 1528.5 530.5 Z M 1493.5 522.5 L 1505.5 522.5 L 1505.5 530.5 L 1493.5 530.5 Z M 635.5 522.5 L 648.5 522.5 L 648.5 530.5 L 635.5 530.5 Z M 231.5 522.5 L 244.5 522.5 L 244.5 530.5 L 231.5 530.5 Z M 1457.5 522.5 L 1470.5 522.5 L 1470.5 530.5 L 1457.5 530.5 Z M 445.5 522.5 L 458.5 522.5 L 458.5 530.5 L 445.5 530.5 Z M 303.5 522.5 L 315.5 522.5 L 315.5 530.5 L 303.5 530.5 Z M 1421.5 522.5 L 1434.5 522.5 L 1434.5 530.5 L 1421.5 530.5 Z M 374.5 522.5 L 387.5 522.5 L 387.5 530.5 L 374.5 530.5 Z M 1385.5 522.5 L 1398.5 522.5 L 1398.5 530.5 L 1385.5 530.5 Z M 1350.5 522.5 L 1363.5 522.5 L 1363.5 530.5 L 1350.5 530.5 Z M 814.5 522.5 L 827.5 522.5 L 827.5 530.5 L 814.5 530.5 Z M 517.5 522.5 L 530.5 522.5 L 530.5 530.5 L 517.5 530.5 Z M 885.5 522.5 L 898.5 522.5 L 898.5 530.5 L 885.5 530.5 Z M 957.5 522.5 L 969.5 522.5 L 969.5 530.5 L 957.5 530.5 Z M 992.5 522.5 L 1005.5 522.5 L 1005.5 530.5 L 992.5 530.5 Z M 1028.5 522.5 L 1041.5 522.5 L 1041.5 530.5 L 1028.5 530.5 Z M 1064.5 522.5 L 1077.5 522.5 L 1077.5 530.5 L 1064.5 530.5 Z M 1100.5 522.5 L 1112.5 522.5 L 1112.5 530.5 L 1100.5 530.5 Z M 1314.5 522.5 L 1327.5 522.5 L 1327.5 530.5 L 1314.5 530.5 Z M 553.5 522.5 L 576.5 522.5 L 576.5 530.5 L 553.5 530.5 Z M 1207.5 522.5 L 1220.5 522.5 L 1220.5 530.5 L 1207.5 530.5 Z M 1278.5 522.5 L 1291.5 522.5 L 1291.5 530.5 L 1278.5 530.5 Z M 1242.5 522.5 L 1255.5 522.5 L 1255.5 530.5 L 1242.5 530.5 Z M 599.5 522.5 L 612.5 522.5 L 612.5 530.5 L 599.5 530.5 Z M 1171.5 522.5 L 1184.5 522.5 L 1184.5 530.5 L 1171.5 530.5 Z M 849.5 522.5 L 862.5 522.5 L 862.5 530.5 L 849.5 530.5 Z M 1671.5 522.5 L 1684.5 522.5 L 1684.5 530.5 L 1671.5 530.5 Z M 1564.5 522.5 L 1577.5 522.5 L 1577.5 530.5 L 1564.5 530.5 Z M 921.5 522.5 L 934.5 522.5 L 934.5 530.5 L 921.5 530.5 Z M 671.5 522.5 L 684.5 522.5 L 684.5 530.5 L 671.5 530.5 Z M 1636.5 522.5 L 1648.5 522.5 L 1648.5 530.5 L 1636.5 530.5 Z M 778.5 522.5 L 791.5 522.5 L 791.5 530.5 L 778.5 530.5 Z M 707.5 522.5 L 719.5 522.5 L 719.5 530.5 L 707.5 530.5 Z M 1600.5 522.5 L 1613.5 522.5 L 1613.5 530.5 L 1600.5 530.5 Z M 742.5 522.5 L 755.5 522.5 L 755.5 530.5 L 742.5 530.5 Z M 338.5 520.5 L 351.5 520.5 L 351.5 532.5 L 338.5 532.5 Z M 1707.5 529.5 L 1719.5 529.5 L 1719.5 532.5 L 1707.5 532.5 Z M 196.5 529.5 L 208.5 529.5 L 208.5 532.5 L 196.5 532.5 Z M 1636.5 530.5 L 1648.5 530.5 L 1648.5 532.5 L 1636.5 532.5 Z M 1528.5 530.5 L 1541.5 530.5 L 1541.5 532.5 L 1528.5 532.5 Z M 1350.5 530.5 L 1363.5 530.5 L 1363.5 532.5 L 1350.5 532.5 Z M 1242.5 530.5 L 1255.5 530.5 L 1255.5 532.5 L 1242.5 532.5 Z M 1064.5 530.5 L 1077.5 530.5 L 1077.5 532.5 L 1064.5 532.5 Z M 957.5 530.5 L 969.5 530.5 L 969.5 532.5 L 957.5 532.5 Z M 778.5 530.5 L 791.5 530.5 L 791.5 532.5 L 778.5 532.5 Z M 671.5 530.5 L 684.5 530.5 L 684.5 532.5 L 671.5 532.5 Z M 517.5 530.5 L 530.5 530.5 L 530.5 532.5 L 517.5 532.5 Z M 303.5 530.5 L 315.5 530.5 L 315.5 532.5 L 303.5 532.5 Z M 1028.5 530.5 L 1041.5 530.5 L 1041.5 532.5 L 1028.5 532.5 Z M 992.5 530.5 L 1005.5 530.5 L 1005.5 532.5 L 992.5 532.5 Z M 742.5 530.5 L 755.5 530.5 L 755.5 532.5 L 742.5 532.5 Z M 599.5 530.5 L 612.5 530.5 L 612.5 532.5 L 599.5 532.5 Z M 267.5 520.5 L 280.5 520.5 L 280.5 532.5 L 267.5 532.5 Z M 374.5 530.5 L 387.5 530.5 L 387.5 532.5 L 374.5 532.5 Z M 707.5 530.5 L 719.5 530.5 L 719.5 532.5 L 707.5 532.5 Z M 921.5 530.5 L 934.5 530.5 L 934.5 532.5 L 921.5 532.5 Z M 1314.5 530.5 L 1327.5 530.5 L 1327.5 532.5 L 1314.5 532.5 Z M 1564.5 530.5 L 1577.5 530.5 L 1577.5 532.5 L 1564.5 532.5 Z M 1135.5 529.5 L 1148.5 529.5 L 1148.5 532.5 L 1135.5 532.5 Z M 1671.5 530.5 L 1684.5 530.5 L 1684.5 532.5 L 1671.5 532.5 Z M 1385.5 530.5 L 1398.5 530.5 L 1398.5 532.5 L 1385.5 532.5 Z M 1100.5 530.5 L 1112.5 530.5 L 1112.5 532.5 L 1100.5 532.5 Z M 814.5 530.5 L 827.5 530.5 L 827.5 532.5 L 814.5 532.5 Z M 553.5 530.5 L 576.5 530.5 L 576.5 532.5 L 553.5 532.5 Z M 410.5 520.5 L 423.5 520.5 L 423.5 532.5 L 410.5 532.5 Z M 885.5 530.5 L 898.5 530.5 L 898.5 532.5 L 885.5 532.5 Z M 231.5 530.5 L 244.5 530.5 L 244.5 532.5 L 231.5 532.5 Z M 635.5 530.5 L 648.5 530.5 L 648.5 532.5 L 635.5 532.5 Z M 1278.5 530.5 L 1291.5 530.5 L 1291.5 532.5 L 1278.5 532.5 Z M 481.5 520.5 L 494.5 520.5 L 494.5 532.5 L 481.5 532.5 Z M 1421.5 530.5 L 1434.5 530.5 L 1434.5 532.5 L 1421.5 532.5 Z M 849.5 530.5 L 862.5 530.5 L 862.5 532.5 L 849.5 532.5 Z M 1493.5 530.5 L 1505.5 530.5 L 1505.5 532.5 L 1493.5 532.5 Z M 445.5 530.5 L 458.5 530.5 L 458.5 532.5 L 445.5 532.5 Z M 1207.5 530.5 L 1220.5 530.5 L 1220.5 532.5 L 1207.5 532.5 Z M 1457.5 530.5 L 1470.5 530.5 L 1470.5 532.5 L 1457.5 532.5 Z M 1600.5 530.5 L 1613.5 530.5 L 1613.5 532.5 L 1600.5 532.5 Z M 1171.5 530.5 L 1184.5 530.5 L 1184.5 532.5 L 1171.5 532.5 Z M 189.5 629.5 L 1728.5 629.5 L 1728.5 637.5 L 189.5 637.5 Z M 189.5 629.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1684.5 566.5 L 1707.5 566.5 L 1707.5 601.5 L 1684.5 601.5 Z M 208.5 566.5 L 231.5 566.5 L 231.5 601.5 L 208.5 601.5 Z M 244.5 566.5 L 267.5 566.5 L 267.5 601.5 L 244.5 601.5 Z M 280.5 566.5 L 303.5 566.5 L 303.5 601.5 L 280.5 601.5 Z M 315.5 566.5 L 338.5 566.5 L 338.5 601.5 L 315.5 601.5 Z M 351.5 566.5 L 374.5 566.5 L 374.5 601.5 L 351.5 601.5 Z M 387.5 566.5 L 410.5 566.5 L 410.5 601.5 L 387.5 601.5 Z M 423.5 566.5 L 445.5 566.5 L 445.5 601.5 L 423.5 601.5 Z M 458.5 566.5 L 481.5 566.5 L 481.5 601.5 L 458.5 601.5 Z M 494.5 566.5 L 517.5 566.5 L 517.5 601.5 L 494.5 601.5 Z M 530.5 566.5 L 553.5 566.5 L 553.5 601.5 L 530.5 601.5 Z M 576.5 566.5 L 599.5 566.5 L 599.5 601.5 L 576.5 601.5 Z M 612.5 566.5 L 635.5 566.5 L 635.5 601.5 L 612.5 601.5 Z M 648.5 566.5 L 671.5 566.5 L 671.5 601.5 L 648.5 601.5 Z M 684.5 566.5 L 707.5 566.5 L 707.5 601.5 L 684.5 601.5 Z M 719.5 566.5 L 742.5 566.5 L 742.5 601.5 L 719.5 601.5 Z M 755.5 566.5 L 778.5 566.5 L 778.5 601.5 L 755.5 601.5 Z M 791.5 566.5 L 814.5 566.5 L 814.5 601.5 L 791.5 601.5 Z M 827.5 566.5 L 849.5 566.5 L 849.5 601.5 L 827.5 601.5 Z M 862.5 566.5 L 885.5 566.5 L 885.5 601.5 L 862.5 601.5 Z M 898.5 566.5 L 921.5 566.5 L 921.5 601.5 L 898.5 601.5 Z M 934.5 566.5 L 957.5 566.5 L 957.5 601.5 L 934.5 601.5 Z M 969.5 566.5 L 992.5 566.5 L 992.5 601.5 L 969.5 601.5 Z M 1005.5 566.5 L 1028.5 566.5 L 1028.5 601.5 L 1005.5 601.5 Z M 1041.5 566.5 L 1064.5 566.5 L 1064.5 601.5 L 1041.5 601.5 Z M 1077.5 566.5 L 1100.5 566.5 L 1100.5 601.5 L 1077.5 601.5 Z M 1112.5 566.5 L 1135.5 566.5 L 1135.5 601.5 L 1112.5 601.5 Z M 1148.5 566.5 L 1171.5 566.5 L 1171.5 601.5 L 1148.5 601.5 Z M 1184.5 566.5 L 1207.5 566.5 L 1207.5 601.5 L 1184.5 601.5 Z M 1220.5 566.5 L 1242.5 566.5 L 1242.5 601.5 L 1220.5 601.5 Z M 1255.5 566.5 L 1278.5 566.5 L 1278.5 601.5 L 1255.5 601.5 Z M 1291.5 566.5 L 1314.5 566.5 L 1314.5 601.5 L 1291.5 601.5 Z M 1327.5 566.5 L 1350.5 566.5 L 1350.5 601.5 L 1327.5 601.5 Z M 1363.5 566.5 L 1385.5 566.5 L 1385.5 601.5 L 1363.5 601.5 Z M 1398.5 566.5 L 1421.5 566.5 L 1421.5 601.5 L 1398.5 601.5 Z M 1434.5 566.5 L 1457.5 566.5 L 1457.5 601.5 L 1434.5 601.5 Z M 1470.5 566.5 L 1493.5 566.5 L 1493.5 601.5 L 1470.5 601.5 Z M 1505.5 566.5 L 1528.5 566.5 L 1528.5 601.5 L 1505.5 601.5 Z M 1541.5 566.5 L 1564.5 566.5 L 1564.5 601.5 L 1541.5 601.5 Z M 1577.5 566.5 L 1600.5 566.5 L 1600.5 601.5 L 1577.5 601.5 Z M 1613.5 566.5 L 1636.5 566.5 L 1636.5 601.5 L 1613.5 601.5 Z M 1648.5 566.5 L 1671.5 566.5 L 1671.5 601.5 L 1648.5 601.5 Z M 1648.5 566.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1684.5 463.5 L 1707.5 463.5 L 1707.5 532.5 L 1684.5 532.5 Z M 208.5 463.5 L 231.5 463.5 L 231.5 532.5 L 208.5 532.5 Z M 244.5 463.5 L 267.5 463.5 L 267.5 532.5 L 244.5 532.5 Z M 280.5 463.5 L 303.5 463.5 L 303.5 532.5 L 280.5 532.5 Z M 315.5 463.5 L 338.5 463.5 L 338.5 532.5 L 315.5 532.5 Z M 351.5 463.5 L 374.5 463.5 L 374.5 532.5 L 351.5 532.5 Z M 387.5 463.5 L 410.5 463.5 L 410.5 532.5 L 387.5 532.5 Z M 423.5 463.5 L 445.5 463.5 L 445.5 532.5 L 423.5 532.5 Z M 458.5 463.5 L 481.5 463.5 L 481.5 532.5 L 458.5 532.5 Z M 494.5 463.5 L 517.5 463.5 L 517.5 532.5 L 494.5 532.5 Z M 530.5 463.5 L 553.5 463.5 L 553.5 532.5 L 530.5 532.5 Z M 576.5 463.5 L 599.5 463.5 L 599.5 532.5 L 576.5 532.5 Z M 612.5 463.5 L 635.5 463.5 L 635.5 532.5 L 612.5 532.5 Z M 648.5 463.5 L 671.5 463.5 L 671.5 532.5 L 648.5 532.5 Z M 684.5 463.5 L 707.5 463.5 L 707.5 532.5 L 684.5 532.5 Z M 719.5 463.5 L 742.5 463.5 L 742.5 532.5 L 719.5 532.5 Z M 755.5 463.5 L 778.5 463.5 L 778.5 532.5 L 755.5 532.5 Z M 791.5 463.5 L 814.5 463.5 L 814.5 532.5 L 791.5 532.5 Z M 827.5 463.5 L 849.5 463.5 L 849.5 532.5 L 827.5 532.5 Z M 862.5 463.5 L 885.5 463.5 L 885.5 532.5 L 862.5 532.5 Z M 898.5 463.5 L 921.5 463.5 L 921.5 532.5 L 898.5 532.5 Z M 934.5 463.5 L 957.5 463.5 L 957.5 532.5 L 934.5 532.5 Z M 969.5 463.5 L 992.5 463.5 L 992.5 532.5 L 969.5 532.5 Z M 1005.5 463.5 L 1028.5 463.5 L 1028.5 532.5 L 1005.5 532.5 Z M 1041.5 463.5 L 1064.5 463.5 L 1064.5 532.5 L 1041.5 532.5 Z M 1077.5 463.5 L 1100.5 463.5 L 1100.5 532.5 L 1077.5 532.5 Z M 1112.5 463.5 L 1135.5 463.5 L 1135.5 532.5 L 1112.5 532.5 Z M 1148.5 463.5 L 1171.5 463.5 L 1171.5 532.5 L 1148.5 532.5 Z M 1184.5 463.5 L 1207.5 463.5 L 1207.5 532.5 L 1184.5 532.5 Z M 1220.5 463.5 L 1242.5 463.5 L 1242.5 532.5 L 1220.5 532.5 Z M 1255.5 463.5 L 1278.5 463.5 L 1278.5 532.5 L 1255.5 532.5 Z M 1291.5 463.5 L 1314.5 463.5 L 1314.5 532.5 L 1291.5 532.5 Z M 1327.5 463.5 L 1350.5 463.5 L 1350.5 532.5 L 1327.5 532.5 Z M 1363.5 463.5 L 1385.5 463.5 L 1385.5 532.5 L 1363.5 532.5 Z M 1398.5 463.5 L 1421.5 463.5 L 1421.5 532.5 L 1398.5 532.5 Z M 1434.5 463.5 L 1457.5 463.5 L 1457.5 532.5 L 1434.5 532.5 Z M 1470.5 463.5 L 1493.5 463.5 L 1493.5 532.5 L 1470.5 532.5 Z M 1505.5 463.5 L 1528.5 463.5 L 1528.5 532.5 L 1505.5 532.5 Z M 1541.5 463.5 L 1564.5 463.5 L 1564.5 532.5 L 1541.5 532.5 Z M 1577.5 463.5 L 1600.5 463.5 L 1600.5 532.5 L 1577.5 532.5 Z M 1613.5 463.5 L 1636.5 463.5 L 1636.5 532.5 L 1613.5 532.5 Z M 1648.5 463.5 L 1671.5 463.5 L 1671.5 532.5 L 1648.5 532.5 Z M 1648.5 463.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,25 @@
 <clipPath id="clip14">
   <path d="M 1713.5 443.5 L 1721.5 443.5 L 1721.5 450.5 L 1713.5 450.5 Z M 196.5 443.5 L 204.5 443.5 L 204.5 450.5 L 196.5 450.5 Z M 218.5 443.5 L 226.5 443.5 L 226.5 450.5 L 218.5 450.5 Z M 240.5 443.5 L 248.5 443.5 L 248.5 450.5 L 240.5 450.5 Z M 262.5 443.5 L 270.5 443.5 L 270.5 450.5 L 262.5 450.5 Z M 284.5 443.5 L 292.5 443.5 L 292.5 450.5 L 284.5 450.5 Z M 306.5 443.5 L 314.5 443.5 L 314.5 450.5 L 306.5 450.5 Z M 328.5 443.5 L 336.5 443.5 L 336.5 450.5 L 328.5 450.5 Z M 350.5 443.5 L 358.5 443.5 L 358.5 450.5 L 350.5 450.5 Z M 372.5 443.5 L 380.5 443.5 L 380.5 450.5 L 372.5 450.5 Z M 394.5 443.5 L 402.5 443.5 L 402.5 450.5 L 394.5 450.5 Z M 416.5 443.5 L 424.5 443.5 L 424.5 450.5 L 416.5 450.5 Z M 438.5 443.5 L 446.5 443.5 L 446.5 450.5 L 438.5 450.5 Z M 460.5 443.5 L 468.5 443.5 L 468.5 450.5 L 460.5 450.5 Z M 482.5 443.5 L 490.5 443.5 L 490.5 450.5 L 482.5 450.5 Z M 504.5 443.5 L 512.5 443.5 L 512.5 450.5 L 504.5 450.5 Z M 526.5 443.5 L 534.5 443.5 L 534.5 450.5 L 526.5 450.5 Z M 548.5 443.5 L 556.5 443.5 L 556.5 450.5 L 548.5 450.5 Z M 570.5 443.5 L 578.5 443.5 L 578.5 450.5 L 570.5 450.5 Z M 592.5 443.5 L 600.5 443.5 L 600.5 450.5 L 592.5 450.5 Z M 614.5 443.5 L 622.5 443.5 L 622.5 450.5 L 614.5 450.5 Z M 636.5 443.5 L 644.5 443.5 L 644.5 450.5 L 636.5 450.5 Z M 658.5 443.5 L 666.5 443.5 L 666.5 450.5 L 658.5 450.5 Z M 680.5 443.5 L 688.5 443.5 L 688.5 450.5 L 680.5 450.5 Z M 702.5 443.5 L 710.5 443.5 L 710.5 450.5 L 702.5 450.5 Z M 724.5 443.5 L 732.5 443.5 L 732.5 450.5 L 724.5 450.5 Z M 746.5 443.5 L 754.5 443.5 L 754.5 450.5 L 746.5 450.5 Z M 768.5 443.5 L 776.5 443.5 L 776.5 450.5 L 768.5 450.5 Z M 790.5 443.5 L 798.5 443.5 L 798.5 450.5 L 790.5 450.5 Z M 812.5 443.5 L 820.5 443.5 L 820.5 450.5 L 812.5 450.5 Z M 834.5 443.5 L 842.5 443.5 L 842.5 450.5 L 834.5 450.5 Z M 856.5 443.5 L 864.5 443.5 L 864.5 450.5 L 856.5 450.5 Z M 878.5 443.5 L 886.5 443.5 L 886.5 450.5 L 878.5 450.5 Z M 900.5 443.5 L 908.5 443.5 L 908.5 450.5 L 900.5 450.5 Z M 922.5 443.5 L 930.5 443.5 L 930.5 450.5 L 922.5 450.5 Z M 944.5 443.5 L 952.5 443.5 L 952.5 450.5 L 944.5 450.5 Z M 966.5 443.5 L 974.5 443.5 L 974.5 450.5 L 966.5 450.5 Z M 988.5 443.5 L 996.5 443.5 L 996.5 450.5 L 988.5 450.5 Z M 1010.5 443.5 L 1018.5 443.5 L 1018.5 450.5 L 1010.5 450.5 Z M 1032.5 443.5 L 1040.5 443.5 L 1040.5 450.5 L 1032.5 450.5 Z M 1054.5 443.5 L 1062.5 443.5 L 1062.5 450.5 L 1054.5 450.5 Z M 1076.5 443.5 L 1084.5 443.5 L 1084.5 450.5 L 1076.5 450.5 Z M 1098.5 443.5 L 1106.5 443.5 L 1106.5 450.5 L 1098.5 450.5 Z M 1120.5 443.5 L 1128.5 443.5 L 1128.5 450.5 L 1120.5 450.5 Z M 1142.5 443.5 L 1149.5 443.5 L 1149.5 450.5 L 1142.5 450.5 Z M 1164.5 443.5 L 1171.5 443.5 L 1171.5 450.5 L 1164.5 450.5 Z M 1186.5 443.5 L 1193.5 443.5 L 1193.5 450.5 L 1186.5 450.5 Z M 1208.5 443.5 L 1215.5 443.5 L 1215.5 450.5 L 1208.5 450.5 Z M 1230.5 443.5 L 1237.5 443.5 L 1237.5 450.5 L 1230.5 450.5 Z M 1252.5 443.5 L 1259.5 443.5 L 1259.5 450.5 L 1252.5 450.5 Z M 1274.5 443.5 L 1281.5 443.5 L 1281.5 450.5 L 1274.5 450.5 Z M 1296.5 443.5 L 1303.5 443.5 L 1303.5 450.5 L 1296.5 450.5 Z M 1318.5 443.5 L 1325.5 443.5 L 1325.5 450.5 L 1318.5 450.5 Z M 1340.5 443.5 L 1347.5 443.5 L 1347.5 450.5 L 1340.5 450.5 Z M 1362.5 443.5 L 1369.5 443.5 L 1369.5 450.5 L 1362.5 450.5 Z M 1384.5 443.5 L 1391.5 443.5 L 1391.5 450.5 L 1384.5 450.5 Z M 1406.5 443.5 L 1413.5 443.5 L 1413.5 450.5 L 1406.5 450.5 Z M 1428.5 443.5 L 1435.5 443.5 L 1435.5 450.5 L 1428.5 450.5 Z M 1450.5 443.5 L 1457.5 443.5 L 1457.5 450.5 L 1450.5 450.5 Z M 1472.5 443.5 L 1479.5 443.5 L 1479.5 450.5 L 1472.5 450.5 Z M 1494.5 443.5 L 1501.5 443.5 L 1501.5 450.5 L 1494.5 450.5 Z M 1515.5 443.5 L 1523.5 443.5 L 1523.5 450.5 L 1515.5 450.5 Z M 1537.5 443.5 L 1545.5 443.5 L 1545.5 450.5 L 1537.5 450.5 Z M 1559.5 443.5 L 1567.5 443.5 L 1567.5 450.5 L 1559.5 450.5 Z M 1581.5 443.5 L 1589.5 443.5 L 1589.5 450.5 L 1581.5 450.5 Z M 1603.5 443.5 L 1611.5 443.5 L 1611.5 450.5 L 1603.5 450.5 Z M 1625.5 443.5 L 1633.5 443.5 L 1633.5 450.5 L 1625.5 450.5 Z M 1647.5 443.5 L 1655.5 443.5 L 1655.5 450.5 L 1647.5 450.5 Z M 1669.5 443.5 L 1677.5 443.5 L 1677.5 450.5 L 1669.5 450.5 Z M 1691.5 443.5 L 1699.5 443.5 L 1699.5 450.5 L 1691.5 450.5 Z M 1638.5 466.5 L 1646.5 466.5 L 1646.5 472.5 L 1638.5 472.5 Z M 1567.5 466.5 L 1574.5 466.5 L 1574.5 472.5 L 1567.5 472.5 Z M 1352.5 466.5 L 1360.5 466.5 L 1360.5 472.5 L 1352.5 472.5 Z M 995.5 466.5 L 1003.5 466.5 L 1003.5 472.5 L 995.5 472.5 Z M 923.5 466.5 L 931.5 466.5 L 931.5 472.5 L 923.5 472.5 Z M 852.5 466.5 L 860.5 466.5 L 860.5 472.5 L 852.5 472.5 Z M 1495.5 466.5 L 1503.5 466.5 L 1503.5 472.5 L 1495.5 472.5 Z M 1281.5 466.5 L 1289.5 466.5 L 1289.5 472.5 L 1281.5 472.5 Z M 781.5 466.5 L 788.5 466.5 L 788.5 472.5 L 781.5 472.5 Z M 1209.5 466.5 L 1217.5 466.5 L 1217.5 472.5 L 1209.5 472.5 Z M 709.5 466.5 L 717.5 466.5 L 717.5 472.5 L 709.5 472.5 Z M 638.5 466.5 L 645.5 466.5 L 645.5 472.5 L 638.5 472.5 Z M 1424.5 466.5 L 1431.5 466.5 L 1431.5 472.5 L 1424.5 472.5 Z M 1066.5 466.5 L 1074.5 466.5 L 1074.5 472.5 L 1066.5 472.5 Z M 267.5 466.5 L 275.5 466.5 L 275.5 473.5 L 267.5 473.5 Z M 196.5 466.5 L 204.5 466.5 L 204.5 473.5 L 196.5 473.5 Z M 1713.5 466.5 L 1721.5 466.5 L 1721.5 473.5 L 1713.5 473.5 Z M 553.5 466.5 L 561.5 466.5 L 561.5 473.5 L 553.5 473.5 Z M 1141.5 466.5 L 1149.5 466.5 L 1149.5 473.5 L 1141.5 473.5 Z M 480.5 466.5 L 488.5 466.5 L 488.5 473.5 L 480.5 473.5 Z M 410.5 466.5 L 418.5 466.5 L 418.5 473.5 L 410.5 473.5 Z M 338.5 466.5 L 345.5 466.5 L 345.5 473.5 L 338.5 473.5 Z M 321.5 466.5 L 329.5 466.5 L 329.5 474.5 L 321.5 474.5 Z M 1407.5 466.5 L 1415.5 466.5 L 1415.5 474.5 L 1407.5 474.5 Z M 1011.5 466.5 L 1019.5 466.5 L 1019.5 474.5 L 1011.5 474.5 Z M 354.5 466.5 L 362.5 466.5 L 362.5 474.5 L 354.5 474.5 Z M 393.5 466.5 L 401.5 466.5 L 401.5 474.5 L 393.5 474.5 Z M 1697.5 466.5 L 1704.5 466.5 L 1704.5 474.5 L 1697.5 474.5 Z M 1583.5 466.5 L 1591.5 466.5 L 1591.5 474.5 L 1583.5 474.5 Z M 426.5 466.5 L 434.5 466.5 L 434.5 474.5 L 426.5 474.5 Z M 464.5 466.5 L 472.5 466.5 L 472.5 474.5 L 464.5 474.5 Z M 1141.5 473.5 L 1149.5 473.5 L 1149.5 474.5 L 1141.5 474.5 Z M 1125.5 466.5 L 1133.5 466.5 L 1133.5 474.5 L 1125.5 474.5 Z M 497.5 466.5 L 505.5 466.5 L 505.5 474.5 L 497.5 474.5 Z M 536.5 466.5 L 544.5 466.5 L 544.5 474.5 L 536.5 474.5 Z M 1622.5 466.5 L 1629.5 466.5 L 1629.5 474.5 L 1622.5 474.5 Z M 1479.5 466.5 L 1486.5 466.5 L 1486.5 474.5 L 1479.5 474.5 Z M 569.5 466.5 L 577.5 466.5 L 577.5 474.5 L 569.5 474.5 Z M 621.5 466.5 L 629.5 466.5 L 629.5 474.5 L 621.5 474.5 Z M 1209.5 472.5 L 1217.5 472.5 L 1217.5 474.5 L 1209.5 474.5 Z M 654.5 466.5 L 662.5 466.5 L 662.5 474.5 L 654.5 474.5 Z M 693.5 466.5 L 700.5 466.5 L 700.5 474.5 L 693.5 474.5 Z M 1226.5 466.5 L 1234.5 466.5 L 1234.5 474.5 L 1226.5 474.5 Z M 726.5 466.5 L 733.5 466.5 L 733.5 474.5 L 726.5 474.5 Z M 764.5 466.5 L 772.5 466.5 L 772.5 474.5 L 764.5 474.5 Z M 1512.5 466.5 L 1519.5 466.5 L 1519.5 474.5 L 1512.5 474.5 Z M 797.5 466.5 L 805.5 466.5 L 805.5 474.5 L 797.5 474.5 Z M 835.5 466.5 L 843.5 466.5 L 843.5 474.5 L 835.5 474.5 Z M 1297.5 466.5 L 1305.5 466.5 L 1305.5 474.5 L 1297.5 474.5 Z M 868.5 466.5 L 876.5 466.5 L 876.5 474.5 L 868.5 474.5 Z M 907.5 466.5 L 915.5 466.5 L 915.5 474.5 L 907.5 474.5 Z M 1638.5 472.5 L 1646.5 472.5 L 1646.5 474.5 L 1638.5 474.5 Z M 940.5 466.5 L 948.5 466.5 L 948.5 474.5 L 940.5 474.5 Z M 852.5 472.5 L 860.5 472.5 L 860.5 474.5 L 852.5 474.5 Z M 1369.5 466.5 L 1376.5 466.5 L 1376.5 474.5 L 1369.5 474.5 Z M 251.5 466.5 L 258.5 466.5 L 258.5 474.5 L 251.5 474.5 Z M 1050.5 466.5 L 1058.5 466.5 L 1058.5 474.5 L 1050.5 474.5 Z M 1495.5 472.5 L 1503.5 472.5 L 1503.5 474.5 L 1495.5 474.5 Z M 1083.5 466.5 L 1091.5 466.5 L 1091.5 474.5 L 1083.5 474.5 Z M 1713.5 473.5 L 1721.5 473.5 L 1721.5 474.5 L 1713.5 474.5 Z M 1440.5 466.5 L 1448.5 466.5 L 1448.5 474.5 L 1440.5 474.5 Z M 1567.5 472.5 L 1574.5 472.5 L 1574.5 474.5 L 1567.5 474.5 Z M 1193.5 466.5 L 1201.5 466.5 L 1201.5 474.5 L 1193.5 474.5 Z M 1281.5 472.5 L 1289.5 472.5 L 1289.5 474.5 L 1281.5 474.5 Z M 1066.5 472.5 L 1074.5 472.5 L 1074.5 474.5 L 1066.5 474.5 Z M 1264.5 466.5 L 1272.5 466.5 L 1272.5 474.5 L 1264.5 474.5 Z M 923.5 472.5 L 931.5 472.5 L 931.5 474.5 L 923.5 474.5 Z M 1550.5 466.5 L 1558.5 466.5 L 1558.5 474.5 L 1550.5 474.5 Z M 1336.5 466.5 L 1343.5 466.5 L 1343.5 474.5 L 1336.5 474.5 Z M 196.5 473.5 L 204.5 473.5 L 204.5 474.5 L 196.5 474.5 Z M 1424.5 472.5 L 1431.5 472.5 L 1431.5 474.5 L 1424.5 474.5 Z M 709.5 472.5 L 717.5 472.5 L 717.5 474.5 L 709.5 474.5 Z M 213.5 466.5 L 220.5 466.5 L 220.5 474.5 L 213.5 474.5 Z M 638.5 472.5 L 645.5 472.5 L 645.5 474.5 L 638.5 474.5 Z M 553.5 473.5 L 561.5 473.5 L 561.5 474.5 L 553.5 474.5 Z M 1352.5 472.5 L 1360.5 472.5 L 1360.5 474.5 L 1352.5 474.5 Z M 995.5 472.5 L 1003.5 472.5 L 1003.5 474.5 L 995.5 474.5 Z M 781.5 472.5 L 788.5 472.5 L 788.5 474.5 L 781.5 474.5 Z M 267.5 473.5 L 275.5 473.5 L 275.5 474.5 L 267.5 474.5 Z M 978.5 466.5 L 986.5 466.5 L 986.5 474.5 L 978.5 474.5 Z M 1655.5 466.5 L 1662.5 466.5 L 1662.5 474.5 L 1655.5 474.5 Z M 410.5 473.5 L 418.5 473.5 L 418.5 474.5 L 410.5 474.5 Z M 338.5 473.5 L 345.5 473.5 L 345.5 474.5 L 338.5 474.5 Z M 284.5 466.5 L 291.5 466.5 L 291.5 474.5 L 284.5 474.5 Z M 480.5 473.5 L 488.5 473.5 L 488.5 474.5 L 480.5 474.5 Z M 1674.5 519.5 L 1682.5 519.5 L 1682.5 522.5 L 1674.5 522.5 Z M 1602.5 519.5 L 1610.5 519.5 L 1610.5 522.5 L 1602.5 522.5 Z M 1459.5 519.5 L 1467.5 519.5 L 1467.5 522.5 L 1459.5 522.5 Z M 1174.5 519.5 L 1181.5 519.5 L 1181.5 522.5 L 1174.5 522.5 Z M 602.5 519.5 L 610.5 519.5 L 610.5 522.5 L 602.5 522.5 Z M 1102.5 519.5 L 1110.5 519.5 L 1110.5 522.5 L 1102.5 522.5 Z M 1388.5 519.5 L 1396.5 519.5 L 1396.5 522.5 L 1388.5 522.5 Z M 1031.5 519.5 L 1038.5 519.5 L 1038.5 522.5 L 1031.5 522.5 Z M 959.5 519.5 L 967.5 519.5 L 967.5 522.5 L 959.5 522.5 Z M 1531.5 519.5 L 1539.5 519.5 L 1539.5 522.5 L 1531.5 522.5 Z M 1316.5 519.5 L 1324.5 519.5 L 1324.5 522.5 L 1316.5 522.5 Z M 888.5 519.5 L 895.5 519.5 L 895.5 522.5 L 888.5 522.5 Z M 816.5 519.5 L 824.5 519.5 L 824.5 522.5 L 816.5 522.5 Z M 1245.5 519.5 L 1253.5 519.5 L 1253.5 522.5 L 1245.5 522.5 Z M 745.5 519.5 L 753.5 519.5 L 753.5 522.5 L 745.5 522.5 Z M 673.5 519.5 L 681.5 519.5 L 681.5 522.5 L 673.5 522.5 Z M 1674.5 522.5 L 1682.5 522.5 L 1682.5 527.5 L 1674.5 527.5 Z M 602.5 522.5 L 610.5 522.5 L 610.5 527.5 L 602.5 527.5 Z M 1459.5 522.5 L 1467.5 522.5 L 1467.5 527.5 L 1459.5 527.5 Z M 1388.5 522.5 L 1396.5 522.5 L 1396.5 527.5 L 1388.5 527.5 Z M 1245.5 522.5 L 1253.5 522.5 L 1253.5 527.5 L 1245.5 527.5 Z M 1174.5 522.5 L 1181.5 522.5 L 1181.5 527.5 L 1174.5 527.5 Z M 959.5 522.5 L 967.5 522.5 L 967.5 527.5 L 959.5 527.5 Z M 888.5 522.5 L 895.5 522.5 L 895.5 527.5 L 888.5 527.5 Z M 745.5 522.5 L 753.5 522.5 L 753.5 527.5 L 745.5 527.5 Z M 673.5 522.5 L 681.5 522.5 L 681.5 527.5 L 673.5 527.5 Z M 1531.5 522.5 L 1539.5 522.5 L 1539.5 527.5 L 1531.5 527.5 Z M 1316.5 522.5 L 1324.5 522.5 L 1324.5 527.5 L 1316.5 527.5 Z M 1031.5 522.5 L 1038.5 522.5 L 1038.5 527.5 L 1031.5 527.5 Z M 816.5 522.5 L 824.5 522.5 L 824.5 527.5 L 816.5 527.5 Z M 1602.5 522.5 L 1610.5 522.5 L 1610.5 527.5 L 1602.5 527.5 Z M 1102.5 522.5 L 1110.5 522.5 L 1110.5 527.5 L 1102.5 527.5 Z M 1645.5 553.5 L 1653.5 553.5 L 1653.5 558.5 L 1645.5 558.5 Z M 1629.5 553.5 L 1637.5 553.5 L 1637.5 558.5 L 1629.5 558.5 Z M 1574.5 553.5 L 1582.5 553.5 L 1582.5 558.5 L 1574.5 558.5 Z M 1486.5 553.5 L 1494.5 553.5 L 1494.5 558.5 L 1486.5 558.5 Z M 1288.5 553.5 L 1296.5 553.5 L 1296.5 558.5 L 1288.5 558.5 Z M 914.5 553.5 L 922.5 553.5 L 922.5 558.5 L 914.5 558.5 Z M 859.5 553.5 L 867.5 553.5 L 867.5 558.5 L 859.5 558.5 Z M 1272.5 553.5 L 1279.5 553.5 L 1279.5 558.5 L 1272.5 558.5 Z M 843.5 553.5 L 851.5 553.5 L 851.5 558.5 L 843.5 558.5 Z M 1217.5 553.5 L 1224.5 553.5 L 1224.5 558.5 L 1217.5 558.5 Z M 788.5 553.5 L 796.5 553.5 L 796.5 558.5 L 788.5 558.5 Z M 771.5 553.5 L 779.5 553.5 L 779.5 558.5 L 771.5 558.5 Z M 716.5 553.5 L 724.5 553.5 L 724.5 558.5 L 716.5 558.5 Z M 1431.5 553.5 L 1439.5 553.5 L 1439.5 558.5 L 1431.5 558.5 Z M 1200.5 553.5 L 1208.5 553.5 L 1208.5 558.5 L 1200.5 558.5 Z M 700.5 553.5 L 708.5 553.5 L 708.5 558.5 L 700.5 558.5 Z M 1145.5 553.5 L 1152.5 553.5 L 1152.5 558.5 L 1145.5 558.5 Z M 645.5 553.5 L 653.5 553.5 L 653.5 558.5 L 645.5 558.5 Z M 628.5 553.5 L 636.5 553.5 L 636.5 558.5 L 628.5 558.5 Z M 1128.5 553.5 L 1136.5 553.5 L 1136.5 558.5 L 1128.5 558.5 Z M 1557.5 553.5 L 1565.5 553.5 L 1565.5 558.5 L 1557.5 558.5 Z M 1414.5 553.5 L 1422.5 553.5 L 1422.5 558.5 L 1414.5 558.5 Z M 1074.5 553.5 L 1081.5 553.5 L 1081.5 558.5 L 1074.5 558.5 Z M 1360.5 553.5 L 1367.5 553.5 L 1367.5 558.5 L 1360.5 558.5 Z M 1057.5 553.5 L 1065.5 553.5 L 1065.5 558.5 L 1057.5 558.5 Z M 1002.5 553.5 L 1010.5 553.5 L 1010.5 558.5 L 1002.5 558.5 Z M 1502.5 553.5 L 1510.5 553.5 L 1510.5 558.5 L 1502.5 558.5 Z M 1343.5 553.5 L 1351.5 553.5 L 1351.5 558.5 L 1343.5 558.5 Z M 986.5 553.5 L 994.5 553.5 L 994.5 558.5 L 986.5 558.5 Z M 931.5 553.5 L 939.5 553.5 L 939.5 558.5 L 931.5 558.5 Z M 986.5 558.5 L 994.5 558.5 L 994.5 561.5 L 986.5 561.5 Z M 914.5 558.5 L 922.5 558.5 L 922.5 561.5 L 914.5 561.5 Z M 859.5 558.5 L 867.5 558.5 L 867.5 561.5 L 859.5 561.5 Z M 771.5 558.5 L 779.5 558.5 L 779.5 561.5 L 771.5 561.5 Z M 716.5 558.5 L 724.5 558.5 L 724.5 561.5 L 716.5 561.5 Z M 645.5 558.5 L 653.5 558.5 L 653.5 561.5 L 645.5 561.5 Z M 628.5 558.5 L 636.5 558.5 L 636.5 561.5 L 628.5 561.5 Z M 1272.5 558.5 L 1279.5 558.5 L 1279.5 561.5 L 1272.5 561.5 Z M 1288.5 558.5 L 1296.5 558.5 L 1296.5 561.5 L 1288.5 561.5 Z M 518.5 553.5 L 526.5 553.5 L 526.5 561.5 L 518.5 561.5 Z M 502.5 553.5 L 509.5 553.5 L 509.5 561.5 L 502.5 561.5 Z M 452.5 553.5 L 460.5 553.5 L 460.5 561.5 L 452.5 561.5 Z M 436.5 553.5 L 443.5 553.5 L 443.5 561.5 L 436.5 561.5 Z M 1645.5 558.5 L 1653.5 558.5 L 1653.5 561.5 L 1645.5 561.5 Z M 1629.5 558.5 L 1637.5 558.5 L 1637.5 561.5 L 1629.5 561.5 Z M 1486.5 558.5 L 1494.5 558.5 L 1494.5 561.5 L 1486.5 561.5 Z M 1431.5 558.5 L 1439.5 558.5 L 1439.5 561.5 L 1431.5 561.5 Z M 1343.5 558.5 L 1351.5 558.5 L 1351.5 561.5 L 1343.5 561.5 Z M 1217.5 558.5 L 1224.5 558.5 L 1224.5 561.5 L 1217.5 561.5 Z M 1057.5 558.5 L 1065.5 558.5 L 1065.5 561.5 L 1057.5 561.5 Z M 931.5 558.5 L 939.5 558.5 L 939.5 561.5 L 931.5 561.5 Z M 788.5 558.5 L 796.5 558.5 L 796.5 561.5 L 788.5 561.5 Z M 700.5 558.5 L 708.5 558.5 L 708.5 561.5 L 700.5 561.5 Z M 1200.5 558.5 L 1208.5 558.5 L 1208.5 561.5 L 1200.5 561.5 Z M 1414.5 558.5 L 1422.5 558.5 L 1422.5 561.5 L 1414.5 561.5 Z M 469.5 553.5 L 476.5 553.5 L 476.5 561.5 L 469.5 561.5 Z M 419.5 553.5 L 427.5 553.5 L 427.5 561.5 L 419.5 561.5 Z M 1502.5 558.5 L 1510.5 558.5 L 1510.5 561.5 L 1502.5 561.5 Z M 1360.5 558.5 L 1367.5 558.5 L 1367.5 561.5 L 1360.5 561.5 Z M 1074.5 558.5 L 1081.5 558.5 L 1081.5 561.5 L 1074.5 561.5 Z M 843.5 558.5 L 851.5 558.5 L 851.5 561.5 L 843.5 561.5 Z M 1145.5 558.5 L 1152.5 558.5 L 1152.5 561.5 L 1145.5 561.5 Z M 485.5 553.5 L 493.5 553.5 L 493.5 561.5 L 485.5 561.5 Z M 1557.5 558.5 L 1565.5 558.5 L 1565.5 561.5 L 1557.5 561.5 Z M 1128.5 558.5 L 1136.5 558.5 L 1136.5 561.5 L 1128.5 561.5 Z M 1002.5 558.5 L 1010.5 558.5 L 1010.5 561.5 L 1002.5 561.5 Z M 1574.5 558.5 L 1582.5 558.5 L 1582.5 561.5 L 1574.5 561.5 Z M 1713.5 606.5 L 1721.5 606.5 L 1721.5 614.5 L 1713.5 614.5 Z M 194.5 606.5 L 202.5 606.5 L 202.5 614.5 L 194.5 614.5 Z M 211.5 606.5 L 219.5 606.5 L 219.5 614.5 L 211.5 614.5 Z M 251.5 606.5 L 258.5 606.5 L 258.5 614.5 L 251.5 614.5 Z M 267.5 606.5 L 275.5 606.5 L 275.5 614.5 L 267.5 614.5 Z M 284.5 606.5 L 291.5 606.5 L 291.5 614.5 L 284.5 614.5 Z M 325.5 606.5 L 333.5 606.5 L 333.5 614.5 L 325.5 614.5 Z M 341.5 606.5 L 349.5 606.5 L 349.5 614.5 L 341.5 614.5 Z M 358.5 606.5 L 366.5 606.5 L 366.5 614.5 L 358.5 614.5 Z M 393.5 606.5 L 400.5 606.5 L 400.5 614.5 L 393.5 614.5 Z M 409.5 606.5 L 417.5 606.5 L 417.5 614.5 L 409.5 614.5 Z M 426.5 606.5 L 433.5 606.5 L 433.5 614.5 L 426.5 614.5 Z M 468.5 606.5 L 475.5 606.5 L 475.5 614.5 L 468.5 614.5 Z M 484.5 606.5 L 492.5 606.5 L 492.5 614.5 L 484.5 614.5 Z M 501.5 606.5 L 508.5 606.5 L 508.5 614.5 L 501.5 614.5 Z M 535.5 606.5 L 543.5 606.5 L 543.5 614.5 L 535.5 614.5 Z M 552.5 606.5 L 560.5 606.5 L 560.5 614.5 L 552.5 614.5 Z M 568.5 606.5 L 576.5 606.5 L 576.5 614.5 L 568.5 614.5 Z M 621.5 606.5 L 629.5 606.5 L 629.5 614.5 L 621.5 614.5 Z M 638.5 606.5 L 645.5 606.5 L 645.5 614.5 L 638.5 614.5 Z M 654.5 606.5 L 662.5 606.5 L 662.5 614.5 L 654.5 614.5 Z M 693.5 606.5 L 700.5 606.5 L 700.5 614.5 L 693.5 614.5 Z M 709.5 606.5 L 717.5 606.5 L 717.5 614.5 L 709.5 614.5 Z M 726.5 606.5 L 733.5 606.5 L 733.5 614.5 L 726.5 614.5 Z M 764.5 606.5 L 772.5 606.5 L 772.5 614.5 L 764.5 614.5 Z M 781.5 606.5 L 788.5 606.5 L 788.5 614.5 L 781.5 614.5 Z M 797.5 606.5 L 805.5 606.5 L 805.5 614.5 L 797.5 614.5 Z M 835.5 606.5 L 843.5 606.5 L 843.5 614.5 L 835.5 614.5 Z M 852.5 606.5 L 860.5 606.5 L 860.5 614.5 L 852.5 614.5 Z M 868.5 606.5 L 876.5 606.5 L 876.5 614.5 L 868.5 614.5 Z M 907.5 606.5 L 915.5 606.5 L 915.5 614.5 L 907.5 614.5 Z M 923.5 606.5 L 931.5 606.5 L 931.5 614.5 L 923.5 614.5 Z M 940.5 606.5 L 948.5 606.5 L 948.5 614.5 L 940.5 614.5 Z M 978.5 606.5 L 986.5 606.5 L 986.5 614.5 L 978.5 614.5 Z M 995.5 606.5 L 1003.5 606.5 L 1003.5 614.5 L 995.5 614.5 Z M 1011.5 606.5 L 1019.5 606.5 L 1019.5 614.5 L 1011.5 614.5 Z M 1050.5 606.5 L 1058.5 606.5 L 1058.5 614.5 L 1050.5 614.5 Z M 1066.5 606.5 L 1074.5 606.5 L 1074.5 614.5 L 1066.5 614.5 Z M 1083.5 606.5 L 1091.5 606.5 L 1091.5 614.5 L 1083.5 614.5 Z M 1125.5 606.5 L 1133.5 606.5 L 1133.5 614.5 L 1125.5 614.5 Z M 1141.5 606.5 L 1149.5 606.5 L 1149.5 614.5 L 1141.5 614.5 Z M 1193.5 606.5 L 1201.5 606.5 L 1201.5 614.5 L 1193.5 614.5 Z M 1209.5 606.5 L 1217.5 606.5 L 1217.5 614.5 L 1209.5 614.5 Z M 1226.5 606.5 L 1234.5 606.5 L 1234.5 614.5 L 1226.5 614.5 Z M 1264.5 606.5 L 1272.5 606.5 L 1272.5 614.5 L 1264.5 614.5 Z M 1281.5 606.5 L 1289.5 606.5 L 1289.5 614.5 L 1281.5 614.5 Z M 1297.5 606.5 L 1305.5 606.5 L 1305.5 614.5 L 1297.5 614.5 Z M 1336.5 606.5 L 1343.5 606.5 L 1343.5 614.5 L 1336.5 614.5 Z M 1352.5 606.5 L 1360.5 606.5 L 1360.5 614.5 L 1352.5 614.5 Z M 1369.5 606.5 L 1376.5 606.5 L 1376.5 614.5 L 1369.5 614.5 Z M 1407.5 606.5 L 1415.5 606.5 L 1415.5 614.5 L 1407.5 614.5 Z M 1424.5 606.5 L 1431.5 606.5 L 1431.5 614.5 L 1424.5 614.5 Z M 1440.5 606.5 L 1448.5 606.5 L 1448.5 614.5 L 1440.5 614.5 Z M 1479.5 606.5 L 1486.5 606.5 L 1486.5 614.5 L 1479.5 614.5 Z M 1495.5 606.5 L 1503.5 606.5 L 1503.5 614.5 L 1495.5 614.5 Z M 1512.5 606.5 L 1519.5 606.5 L 1519.5 614.5 L 1512.5 614.5 Z M 1550.5 606.5 L 1558.5 606.5 L 1558.5 614.5 L 1550.5 614.5 Z M 1567.5 606.5 L 1574.5 606.5 L 1574.5 614.5 L 1567.5 614.5 Z M 1583.5 606.5 L 1591.5 606.5 L 1591.5 614.5 L 1583.5 614.5 Z M 1622.5 606.5 L 1629.5 606.5 L 1629.5 614.5 L 1622.5 614.5 Z M 1638.5 606.5 L 1646.5 606.5 L 1646.5 614.5 L 1638.5 614.5 Z M 1655.5 606.5 L 1662.5 606.5 L 1662.5 614.5 L 1655.5 614.5 Z M 1697.5 606.5 L 1704.5 606.5 L 1704.5 614.5 L 1697.5 614.5 Z M 1713.5 629.5 L 1721.5 629.5 L 1721.5 637.5 L 1713.5 637.5 Z M 196.5 629.5 L 204.5 629.5 L 204.5 637.5 L 196.5 637.5 Z M 218.5 629.5 L 226.5 629.5 L 226.5 637.5 L 218.5 637.5 Z M 240.5 629.5 L 248.5 629.5 L 248.5 637.5 L 240.5 637.5 Z M 262.5 629.5 L 270.5 629.5 L 270.5 637.5 L 262.5 637.5 Z M 284.5 629.5 L 292.5 629.5 L 292.5 637.5 L 284.5 637.5 Z M 306.5 629.5 L 314.5 629.5 L 314.5 637.5 L 306.5 637.5 Z M 328.5 629.5 L 336.5 629.5 L 336.5 637.5 L 328.5 637.5 Z M 350.5 629.5 L 358.5 629.5 L 358.5 637.5 L 350.5 637.5 Z M 372.5 629.5 L 380.5 629.5 L 380.5 637.5 L 372.5 637.5 Z M 394.5 629.5 L 402.5 629.5 L 402.5 637.5 L 394.5 637.5 Z M 416.5 629.5 L 424.5 629.5 L 424.5 637.5 L 416.5 637.5 Z M 438.5 629.5 L 446.5 629.5 L 446.5 637.5 L 438.5 637.5 Z M 460.5 629.5 L 468.5 629.5 L 468.5 637.5 L 460.5 637.5 Z M 482.5 629.5 L 490.5 629.5 L 490.5 637.5 L 482.5 637.5 Z M 504.5 629.5 L 512.5 629.5 L 512.5 637.5 L 504.5 637.5 Z M 526.5 629.5 L 534.5 629.5 L 534.5 637.5 L 526.5 637.5 Z M 548.5 629.5 L 556.5 629.5 L 556.5 637.5 L 548.5 637.5 Z M 570.5 629.5 L 578.5 629.5 L 578.5 637.5 L 570.5 637.5 Z M 592.5 629.5 L 600.5 629.5 L 600.5 637.5 L 592.5 637.5 Z M 614.5 629.5 L 622.5 629.5 L 622.5 637.5 L 614.5 637.5 Z M 636.5 629.5 L 644.5 629.5 L 644.5 637.5 L 636.5 637.5 Z M 658.5 629.5 L 666.5 629.5 L 666.5 637.5 L 658.5 637.5 Z M 680.5 629.5 L 688.5 629.5 L 688.5 637.5 L 680.5 637.5 Z M 702.5 629.5 L 710.5 629.5 L 710.5 637.5 L 702.5 637.5 Z M 724.5 629.5 L 732.5 629.5 L 732.5 637.5 L 724.5 637.5 Z M 746.5 629.5 L 754.5 629.5 L 754.5 637.5 L 746.5 637.5 Z M 768.5 629.5 L 776.5 629.5 L 776.5 637.5 L 768.5 637.5 Z M 790.5 629.5 L 798.5 629.5 L 798.5 637.5 L 790.5 637.5 Z M 812.5 629.5 L 820.5 629.5 L 820.5 637.5 L 812.5 637.5 Z M 834.5 629.5 L 842.5 629.5 L 842.5 637.5 L 834.5 637.5 Z M 856.5 629.5 L 864.5 629.5 L 864.5 637.5 L 856.5 637.5 Z M 878.5 629.5 L 886.5 629.5 L 886.5 637.5 L 878.5 637.5 Z M 900.5 629.5 L 908.5 629.5 L 908.5 637.5 L 900.5 637.5 Z M 922.5 629.5 L 930.5 629.5 L 930.5 637.5 L 922.5 637.5 Z M 944.5 629.5 L 952.5 629.5 L 952.5 637.5 L 944.5 637.5 Z M 966.5 629.5 L 974.5 629.5 L 974.5 637.5 L 966.5 637.5 Z M 988.5 629.5 L 996.5 629.5 L 996.5 637.5 L 988.5 637.5 Z M 1010.5 629.5 L 1018.5 629.5 L 1018.5 637.5 L 1010.5 637.5 Z M 1032.5 629.5 L 1040.5 629.5 L 1040.5 637.5 L 1032.5 637.5 Z M 1054.5 629.5 L 1062.5 629.5 L 1062.5 637.5 L 1054.5 637.5 Z M 1076.5 629.5 L 1084.5 629.5 L 1084.5 637.5 L 1076.5 637.5 Z M 1098.5 629.5 L 1106.5 629.5 L 1106.5 637.5 L 1098.5 637.5 Z M 1120.5 629.5 L 1128.5 629.5 L 1128.5 637.5 L 1120.5 637.5 Z M 1142.5 629.5 L 1149.5 629.5 L 1149.5 637.5 L 1142.5 637.5 Z M 1164.5 629.5 L 1171.5 629.5 L 1171.5 637.5 L 1164.5 637.5 Z M 1186.5 629.5 L 1193.5 629.5 L 1193.5 637.5 L 1186.5 637.5 Z M 1208.5 629.5 L 1215.5 629.5 L 1215.5 637.5 L 1208.5 637.5 Z M 1230.5 629.5 L 1237.5 629.5 L 1237.5 637.5 L 1230.5 637.5 Z M 1252.5 629.5 L 1259.5 629.5 L 1259.5 637.5 L 1252.5 637.5 Z M 1274.5 629.5 L 1281.5 629.5 L 1281.5 637.5 L 1274.5 637.5 Z M 1296.5 629.5 L 1303.5 629.5 L 1303.5 637.5 L 1296.5 637.5 Z M 1318.5 629.5 L 1325.5 629.5 L 1325.5 637.5 L 1318.5 637.5 Z M 1340.5 629.5 L 1347.5 629.5 L 1347.5 637.5 L 1340.5 637.5 Z M 1362.5 629.5 L 1369.5 629.5 L 1369.5 637.5 L 1362.5 637.5 Z M 1384.5 629.5 L 1391.5 629.5 L 1391.5 637.5 L 1384.5 637.5 Z M 1406.5 629.5 L 1413.5 629.5 L 1413.5 637.5 L 1406.5 637.5 Z M 1428.5 629.5 L 1435.5 629.5 L 1435.5 637.5 L 1428.5 637.5 Z M 1450.5 629.5 L 1457.5 629.5 L 1457.5 637.5 L 1450.5 637.5 Z M 1472.5 629.5 L 1479.5 629.5 L 1479.5 637.5 L 1472.5 637.5 Z M 1494.5 629.5 L 1501.5 629.5 L 1501.5 637.5 L 1494.5 637.5 Z M 1515.5 629.5 L 1523.5 629.5 L 1523.5 637.5 L 1515.5 637.5 Z M 1537.5 629.5 L 1545.5 629.5 L 1545.5 637.5 L 1537.5 637.5 Z M 1559.5 629.5 L 1567.5 629.5 L 1567.5 637.5 L 1559.5 637.5 Z M 1581.5 629.5 L 1589.5 629.5 L 1589.5 637.5 L 1581.5 637.5 Z M 1603.5 629.5 L 1611.5 629.5 L 1611.5 637.5 L 1603.5 637.5 Z M 1625.5 629.5 L 1633.5 629.5 L 1633.5 637.5 L 1625.5 637.5 Z M 1647.5 629.5 L 1655.5 629.5 L 1655.5 637.5 L 1647.5 637.5 Z M 1669.5 629.5 L 1677.5 629.5 L 1677.5 637.5 L 1669.5 637.5 Z M 1691.5 629.5 L 1699.5 629.5 L 1699.5 637.5 L 1691.5 637.5 Z M 1691.5 629.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
+<clipPath id="clip15">
+  <path d="M 18.5 880.5 L 1301.5 880.5 L 1301.5 882.5 L 18.5 882.5 Z M 1299.5 882.5 L 1301.5 882.5 L 1301.5 1059 L 1299.5 1059 Z M 1299.5 882.5 "/>
+</clipPath>
+<image id="image7341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAbSURBVDiNY/jPgB8yEJAnDEdNGDVh1IQhagIAIcT+EDL4XQEAAAAASUVORK5CYII="/>
+<pattern id="pattern8" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image7341"/>
+</pattern>
+<mask id="mask8">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern8);stroke:none;"/>
+</mask>
 </defs>
-<g id="surface332">
+<g id="surface366">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -205,6 +215,8 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 356.484375 559.734375 L 352.9375 559.734375 L 351.964844 562.5 L 350.714844 562.5 L 353.996094 553.296875 L 355.511719 553.296875 L 358.742188 562.5 L 357.429688 562.5 Z M 356.15625 558.75 L 354.742188 554.558594 L 353.226562 558.75 Z M 356.15625 558.75 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 350 526 L 358 526 M 350 518 L 358 518 M 350 518 L 350 526 M 358 518 L 358 526 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 350 526 L 358 526 M 350 518 L 358 518 M 358 526 L 358 518 M 350 526 L 350 518 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 189 441 L 189 450 M 184 446 L 193 446 M 188 447 L 190 447 M 188 445 L 190 445 M 188 445 L 188 447 M 190 445 L 190 447 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<g clip-path="url(#clip15)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(100%,100%,100%);fill-opacity:0.724409;stroke:none;" mask="url(#mask8)"/>
+</g>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_4.svg b/cells/buf/sky130_fd_sc_hvl__buf_4.svg
index f2ba624..572bb88 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_4.svg
+++ b/cells/buf/sky130_fd_sc_hvl__buf_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 442.5 98.5 L 1481.5 98.5 L 1481.5 593.5 L 442.5 593.5 Z M 442.5 98.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 505.5 161.5 L 1418.5 161.5 L 1418.5 193.5 L 505.5 193.5 Z M 505.5 161.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 505.5 161.5 L 1418.5 161.5 L 1418.5 193.5 L 505.5 193.5 Z M 593.5 707.5 L 1390.5 707.5 L 1390.5 715.5 L 593.5 715.5 Z M 593.5 715.5 L 1390.5 715.5 L 1390.5 747.5 L 593.5 747.5 Z M 593.5 747.5 L 1390.5 747.5 L 1390.5 810.5 L 593.5 810.5 Z M 593.5 810.5 L 1390.5 810.5 L 1390.5 842.5 L 593.5 842.5 Z M 593.5 842.5 L 1390.5 842.5 L 1390.5 850.5 L 593.5 850.5 Z M 593.5 842.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 505.5 935.5 L 1418.5 935.5 L 1418.5 968.5 L 505.5 968.5 Z M 505.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 593.5 245.5 L 647.5 245.5 L 647.5 252.5 L 593.5 252.5 Z M 1039.5 245.5 L 1092.5 245.5 L 1092.5 252.5 L 1039.5 252.5 Z M 1336.5 245.5 L 1390.5 245.5 L 1390.5 252.5 L 1336.5 252.5 Z M 742.5 245.5 L 795.5 245.5 L 795.5 252.5 L 742.5 252.5 Z M 890.5 245.5 L 944.5 245.5 L 944.5 252.5 L 890.5 252.5 Z M 1187.5 245.5 L 1241.5 245.5 L 1241.5 252.5 L 1187.5 252.5 Z M 742.5 252.5 L 795.5 252.5 L 795.5 285.5 L 742.5 285.5 Z M 890.5 252.5 L 944.5 252.5 L 944.5 285.5 L 890.5 285.5 Z M 593.5 252.5 L 647.5 252.5 L 647.5 285.5 L 593.5 285.5 Z M 1336.5 252.5 L 1390.5 252.5 L 1390.5 285.5 L 1336.5 285.5 Z M 1039.5 252.5 L 1092.5 252.5 L 1092.5 285.5 L 1039.5 285.5 Z M 1187.5 252.5 L 1241.5 252.5 L 1241.5 285.5 L 1187.5 285.5 Z M 1187.5 285.5 L 1241.5 285.5 L 1241.5 328.5 L 1187.5 328.5 Z M 593.5 285.5 L 647.5 285.5 L 647.5 331.5 L 593.5 331.5 Z M 1336.5 285.5 L 1390.5 285.5 L 1390.5 331.5 L 1336.5 331.5 Z M 1039.5 285.5 L 1092.5 285.5 L 1092.5 331.5 L 1039.5 331.5 Z M 890.5 285.5 L 944.5 285.5 L 944.5 331.5 L 890.5 331.5 Z M 742.5 285.5 L 795.5 285.5 L 795.5 331.5 L 742.5 331.5 Z M 1187.5 328.5 L 1241.5 328.5 L 1241.5 361.5 L 1187.5 361.5 Z M 1039.5 331.5 L 1092.5 331.5 L 1092.5 364.5 L 1039.5 364.5 Z M 1336.5 331.5 L 1390.5 331.5 L 1390.5 364.5 L 1336.5 364.5 Z M 890.5 331.5 L 944.5 331.5 L 944.5 364.5 L 890.5 364.5 Z M 593.5 331.5 L 647.5 331.5 L 647.5 364.5 L 593.5 364.5 Z M 742.5 331.5 L 795.5 331.5 L 795.5 364.5 L 742.5 364.5 Z M 1187.5 361.5 L 1241.5 361.5 L 1241.5 405.5 L 1187.5 405.5 Z M 890.5 364.5 L 944.5 364.5 L 944.5 411.5 L 890.5 411.5 Z M 593.5 364.5 L 647.5 364.5 L 647.5 411.5 L 593.5 411.5 Z M 742.5 364.5 L 795.5 364.5 L 795.5 411.5 L 742.5 411.5 Z M 1336.5 364.5 L 1390.5 364.5 L 1390.5 411.5 L 1336.5 411.5 Z M 1039.5 364.5 L 1092.5 364.5 L 1092.5 411.5 L 1039.5 411.5 Z M 1187.5 405.5 L 1241.5 405.5 L 1241.5 438.5 L 1187.5 438.5 Z M 593.5 411.5 L 647.5 411.5 L 647.5 444.5 L 593.5 444.5 Z M 1336.5 411.5 L 1390.5 411.5 L 1390.5 444.5 L 1336.5 444.5 Z M 1039.5 411.5 L 1092.5 411.5 L 1092.5 444.5 L 1039.5 444.5 Z M 890.5 411.5 L 944.5 411.5 L 944.5 444.5 L 890.5 444.5 Z M 742.5 411.5 L 795.5 411.5 L 795.5 444.5 L 742.5 444.5 Z M 1187.5 438.5 L 1241.5 438.5 L 1241.5 482.5 L 1187.5 482.5 Z M 1336.5 444.5 L 1390.5 444.5 L 1390.5 490.5 L 1336.5 490.5 Z M 890.5 444.5 L 944.5 444.5 L 944.5 490.5 L 890.5 490.5 Z M 593.5 444.5 L 647.5 444.5 L 647.5 490.5 L 593.5 490.5 Z M 742.5 444.5 L 795.5 444.5 L 795.5 490.5 L 742.5 490.5 Z M 1039.5 444.5 L 1092.5 444.5 L 1092.5 490.5 L 1039.5 490.5 Z M 1187.5 482.5 L 1241.5 482.5 L 1241.5 514.5 L 1187.5 514.5 Z M 890.5 490.5 L 944.5 490.5 L 944.5 522.5 L 890.5 522.5 Z M 742.5 490.5 L 795.5 490.5 L 795.5 522.5 L 742.5 522.5 Z M 1039.5 490.5 L 1092.5 490.5 L 1092.5 522.5 L 1039.5 522.5 Z M 1336.5 490.5 L 1390.5 490.5 L 1390.5 522.5 L 1336.5 522.5 Z M 593.5 490.5 L 647.5 490.5 L 647.5 522.5 L 593.5 522.5 Z M 890.5 522.5 L 944.5 522.5 L 944.5 530.5 L 890.5 530.5 Z M 593.5 522.5 L 647.5 522.5 L 647.5 530.5 L 593.5 530.5 Z M 1187.5 514.5 L 1241.5 514.5 L 1241.5 530.5 L 1187.5 530.5 Z M 1039.5 522.5 L 1092.5 522.5 L 1092.5 530.5 L 1039.5 530.5 Z M 1336.5 522.5 L 1390.5 522.5 L 1390.5 530.5 L 1336.5 530.5 Z M 742.5 522.5 L 795.5 522.5 L 795.5 530.5 L 742.5 530.5 Z M 505.5 935.5 L 1418.5 935.5 L 1418.5 968.5 L 505.5 968.5 Z M 505.5 935.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1241.5 707.5 L 1336.5 707.5 L 1336.5 850.5 L 1241.5 850.5 Z M 647.5 707.5 L 742.5 707.5 L 742.5 850.5 L 647.5 850.5 Z M 795.5 707.5 L 890.5 707.5 L 890.5 850.5 L 795.5 850.5 Z M 944.5 707.5 L 1039.5 707.5 L 1039.5 850.5 L 944.5 850.5 Z M 1092.5 707.5 L 1187.5 707.5 L 1187.5 850.5 L 1092.5 850.5 Z M 1092.5 707.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1241.5 245.5 L 1336.5 245.5 L 1336.5 530.5 L 1241.5 530.5 Z M 647.5 245.5 L 742.5 245.5 L 742.5 530.5 L 647.5 530.5 Z M 795.5 245.5 L 890.5 245.5 L 890.5 530.5 L 795.5 530.5 Z M 944.5 245.5 L 1039.5 245.5 L 1039.5 530.5 L 944.5 530.5 Z M 1092.5 245.5 L 1187.5 245.5 L 1187.5 530.5 L 1092.5 530.5 Z M 1092.5 245.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 535.5 161.5 L 567.5 161.5 L 567.5 193.5 L 535.5 193.5 Z M 1357.5 161.5 L 1389.5 161.5 L 1389.5 193.5 L 1357.5 193.5 Z M 1265.5 161.5 L 1298.5 161.5 L 1298.5 193.5 L 1265.5 193.5 Z M 1174.5 161.5 L 1206.5 161.5 L 1206.5 193.5 L 1174.5 193.5 Z M 1083.5 161.5 L 1115.5 161.5 L 1115.5 193.5 L 1083.5 193.5 Z M 991.5 161.5 L 1024.5 161.5 L 1024.5 193.5 L 991.5 193.5 Z M 900.5 161.5 L 932.5 161.5 L 932.5 193.5 L 900.5 193.5 Z M 809.5 161.5 L 841.5 161.5 L 841.5 193.5 L 809.5 193.5 Z M 717.5 161.5 L 750.5 161.5 L 750.5 193.5 L 717.5 193.5 Z M 626.5 161.5 L 658.5 161.5 L 658.5 193.5 L 626.5 193.5 Z M 528.5 252.5 L 560.5 252.5 L 560.5 285.5 L 528.5 285.5 Z M 1274.5 252.5 L 1306.5 252.5 L 1306.5 285.5 L 1274.5 285.5 Z M 1205.5 252.5 L 1238.5 252.5 L 1238.5 285.5 L 1205.5 285.5 Z M 1137.5 252.5 L 1169.5 252.5 L 1169.5 285.5 L 1137.5 285.5 Z M 962.5 252.5 L 994.5 252.5 L 994.5 285.5 L 962.5 285.5 Z M 893.5 252.5 L 926.5 252.5 L 926.5 285.5 L 893.5 285.5 Z M 825.5 252.5 L 857.5 252.5 L 857.5 285.5 L 825.5 285.5 Z M 665.5 252.5 L 697.5 252.5 L 697.5 285.5 L 665.5 285.5 Z M 596.5 252.5 L 629.5 252.5 L 629.5 285.5 L 596.5 285.5 Z M 528.5 844.5 L 560.5 844.5 L 560.5 876.5 L 528.5 876.5 Z M 1259.5 844.5 L 1291.5 844.5 L 1291.5 876.5 L 1259.5 876.5 Z M 1190.5 844.5 L 1222.5 844.5 L 1222.5 876.5 L 1190.5 876.5 Z M 1122.5 844.5 L 1154.5 844.5 L 1154.5 876.5 L 1122.5 876.5 Z M 962.5 844.5 L 994.5 844.5 L 994.5 876.5 L 962.5 876.5 Z M 893.5 844.5 L 926.5 844.5 L 926.5 876.5 L 893.5 876.5 Z M 825.5 844.5 L 857.5 844.5 L 857.5 876.5 L 825.5 876.5 Z M 665.5 844.5 L 697.5 844.5 L 697.5 876.5 L 665.5 876.5 Z M 596.5 844.5 L 629.5 844.5 L 629.5 876.5 L 596.5 876.5 Z M 535.5 935.5 L 567.5 935.5 L 567.5 968.5 L 535.5 968.5 Z M 1357.5 935.5 L 1389.5 935.5 L 1389.5 968.5 L 1357.5 968.5 Z M 1265.5 935.5 L 1298.5 935.5 L 1298.5 968.5 L 1265.5 968.5 Z M 1174.5 935.5 L 1206.5 935.5 L 1206.5 968.5 L 1174.5 968.5 Z M 1083.5 935.5 L 1115.5 935.5 L 1115.5 968.5 L 1083.5 968.5 Z M 991.5 935.5 L 1024.5 935.5 L 1024.5 968.5 L 991.5 968.5 Z M 900.5 935.5 L 932.5 935.5 L 932.5 968.5 L 900.5 968.5 Z M 809.5 935.5 L 841.5 935.5 L 841.5 968.5 L 809.5 968.5 Z M 717.5 935.5 L 750.5 935.5 L 750.5 968.5 L 717.5 968.5 Z M 626.5 935.5 L 658.5 935.5 L 658.5 968.5 L 626.5 968.5 Z M 626.5 935.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface329">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1290.09375 573.214844 L 1274.328125 573.214844 L 1270.007812 585.5 L 1264.453125 585.5 L 1279.039062 544.601562 L 1285.773438 544.601562 L 1300.132812 585.5 L 1294.300781 585.5 Z M 1288.632812 568.839844 L 1282.351562 550.210938 L 1275.617188 568.839844 Z M 1288.632812 568.839844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1265 531 L 1298 531 M 1265 498 L 1298 498 M 1265 498 L 1265 531 M 1298 498 L 1298 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1265 531 L 1298 531 M 1265 498 L 1298 498 M 1298 531 L 1298 498 M 1265 531 L 1265 498 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 505 122 L 505 131 M 500 127 L 509 127 M 504 128 L 506 128 M 504 126 L 506 126 M 504 126 L 504 128 M 506 126 L 506 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hvl__buf_8.svg b/cells/buf/sky130_fd_sc_hvl__buf_8.svg
index 7d8b266..0da8873 100644
--- a/cells/buf/sky130_fd_sc_hvl__buf_8.svg
+++ b/cells/buf/sky130_fd_sc_hvl__buf_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 183.5 L 1744.5 183.5 L 1744.5 581.5 L 174.5 581.5 Z M 174.5 183.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 225.5 234.5 L 1693.5 234.5 L 1693.5 260.5 L 225.5 260.5 Z M 225.5 234.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 225.5 234.5 L 1693.5 234.5 L 1693.5 260.5 L 225.5 260.5 Z M 262.5 647.5 L 1659.5 647.5 L 1659.5 656.5 L 262.5 656.5 Z M 262.5 656.5 L 1659.5 656.5 L 1659.5 682.5 L 262.5 682.5 Z M 262.5 682.5 L 1659.5 682.5 L 1659.5 708.5 L 262.5 708.5 Z M 262.5 708.5 L 1659.5 708.5 L 1659.5 734.5 L 262.5 734.5 Z M 262.5 734.5 L 1659.5 734.5 L 1659.5 761.5 L 262.5 761.5 Z M 262.5 734.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 225.5 856.5 L 1693.5 856.5 L 1693.5 882.5 L 225.5 882.5 Z M 225.5 856.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 899.5 301.5 L 942.5 301.5 L 942.5 310.5 L 899.5 310.5 Z M 1138.5 301.5 L 1181.5 301.5 L 1181.5 310.5 L 1138.5 310.5 Z M 379.5 301.5 L 465.5 301.5 L 465.5 310.5 L 379.5 310.5 Z M 1376.5 301.5 L 1419.5 301.5 L 1419.5 310.5 L 1376.5 310.5 Z M 661.5 301.5 L 703.5 301.5 L 703.5 310.5 L 661.5 310.5 Z M 1615.5 301.5 L 1656.5 301.5 L 1656.5 310.5 L 1615.5 310.5 Z M 1376.5 310.5 L 1419.5 310.5 L 1419.5 336.5 L 1376.5 336.5 Z M 379.5 310.5 L 465.5 310.5 L 465.5 336.5 L 379.5 336.5 Z M 899.5 310.5 L 942.5 310.5 L 942.5 336.5 L 899.5 336.5 Z M 661.5 310.5 L 703.5 310.5 L 703.5 336.5 L 661.5 336.5 Z M 1615.5 310.5 L 1656.5 310.5 L 1656.5 336.5 L 1615.5 336.5 Z M 1138.5 310.5 L 1181.5 310.5 L 1181.5 336.5 L 1138.5 336.5 Z M 259.5 301.5 L 303.5 301.5 L 303.5 339.5 L 259.5 339.5 Z M 1257.5 301.5 L 1300.5 301.5 L 1300.5 342.5 L 1257.5 342.5 Z M 1496.5 301.5 L 1539.5 301.5 L 1539.5 342.5 L 1496.5 342.5 Z M 1019.5 301.5 L 1061.5 301.5 L 1061.5 342.5 L 1019.5 342.5 Z M 780.5 301.5 L 823.5 301.5 L 823.5 342.5 L 780.5 342.5 Z M 541.5 301.5 L 584.5 301.5 L 584.5 342.5 L 541.5 342.5 Z M 1376.5 336.5 L 1419.5 336.5 L 1419.5 362.5 L 1376.5 362.5 Z M 661.5 336.5 L 703.5 336.5 L 703.5 362.5 L 661.5 362.5 Z M 1615.5 336.5 L 1656.5 336.5 L 1656.5 362.5 L 1615.5 362.5 Z M 899.5 336.5 L 942.5 336.5 L 942.5 362.5 L 899.5 362.5 Z M 379.5 336.5 L 465.5 336.5 L 465.5 362.5 L 379.5 362.5 Z M 1138.5 336.5 L 1181.5 336.5 L 1181.5 362.5 L 1138.5 362.5 Z M 259.5 339.5 L 303.5 339.5 L 303.5 365.5 L 259.5 365.5 Z M 541.5 342.5 L 584.5 342.5 L 584.5 368.5 L 541.5 368.5 Z M 780.5 342.5 L 823.5 342.5 L 823.5 368.5 L 780.5 368.5 Z M 1019.5 342.5 L 1061.5 342.5 L 1061.5 368.5 L 1019.5 368.5 Z M 1257.5 342.5 L 1300.5 342.5 L 1300.5 368.5 L 1257.5 368.5 Z M 1496.5 342.5 L 1539.5 342.5 L 1539.5 368.5 L 1496.5 368.5 Z M 1376.5 362.5 L 1419.5 362.5 L 1419.5 388.5 L 1376.5 388.5 Z M 899.5 362.5 L 942.5 362.5 L 942.5 388.5 L 899.5 388.5 Z M 1615.5 362.5 L 1656.5 362.5 L 1656.5 388.5 L 1615.5 388.5 Z M 379.5 362.5 L 465.5 362.5 L 465.5 388.5 L 379.5 388.5 Z M 1138.5 362.5 L 1181.5 362.5 L 1181.5 388.5 L 1138.5 388.5 Z M 661.5 362.5 L 703.5 362.5 L 703.5 388.5 L 661.5 388.5 Z M 259.5 365.5 L 303.5 365.5 L 303.5 391.5 L 259.5 391.5 Z M 1019.5 368.5 L 1061.5 368.5 L 1061.5 394.5 L 1019.5 394.5 Z M 541.5 368.5 L 584.5 368.5 L 584.5 394.5 L 541.5 394.5 Z M 780.5 368.5 L 823.5 368.5 L 823.5 394.5 L 780.5 394.5 Z M 1496.5 368.5 L 1539.5 368.5 L 1539.5 394.5 L 1496.5 394.5 Z M 1257.5 368.5 L 1300.5 368.5 L 1300.5 394.5 L 1257.5 394.5 Z M 899.5 388.5 L 942.5 388.5 L 942.5 414.5 L 899.5 414.5 Z M 379.5 388.5 L 465.5 388.5 L 465.5 414.5 L 379.5 414.5 Z M 661.5 388.5 L 703.5 388.5 L 703.5 414.5 L 661.5 414.5 Z M 1615.5 388.5 L 1656.5 388.5 L 1656.5 414.5 L 1615.5 414.5 Z M 1376.5 388.5 L 1419.5 388.5 L 1419.5 414.5 L 1376.5 414.5 Z M 1138.5 388.5 L 1181.5 388.5 L 1181.5 414.5 L 1138.5 414.5 Z M 259.5 391.5 L 303.5 391.5 L 303.5 417.5 L 259.5 417.5 Z M 1496.5 394.5 L 1539.5 394.5 L 1539.5 420.5 L 1496.5 420.5 Z M 1257.5 394.5 L 1300.5 394.5 L 1300.5 420.5 L 1257.5 420.5 Z M 780.5 394.5 L 823.5 394.5 L 823.5 420.5 L 780.5 420.5 Z M 541.5 394.5 L 584.5 394.5 L 584.5 420.5 L 541.5 420.5 Z M 1019.5 394.5 L 1061.5 394.5 L 1061.5 420.5 L 1019.5 420.5 Z M 1138.5 414.5 L 1181.5 414.5 L 1181.5 440.5 L 1138.5 440.5 Z M 1376.5 414.5 L 1419.5 414.5 L 1419.5 440.5 L 1376.5 440.5 Z M 379.5 414.5 L 465.5 414.5 L 465.5 440.5 L 379.5 440.5 Z M 661.5 414.5 L 703.5 414.5 L 703.5 440.5 L 661.5 440.5 Z M 899.5 414.5 L 942.5 414.5 L 942.5 440.5 L 899.5 440.5 Z M 1615.5 414.5 L 1656.5 414.5 L 1656.5 440.5 L 1615.5 440.5 Z M 259.5 417.5 L 303.5 417.5 L 303.5 443.5 L 259.5 443.5 Z M 1496.5 420.5 L 1539.5 420.5 L 1539.5 446.5 L 1496.5 446.5 Z M 780.5 420.5 L 823.5 420.5 L 823.5 446.5 L 780.5 446.5 Z M 541.5 420.5 L 584.5 420.5 L 584.5 446.5 L 541.5 446.5 Z M 1019.5 420.5 L 1061.5 420.5 L 1061.5 446.5 L 1019.5 446.5 Z M 1257.5 420.5 L 1300.5 420.5 L 1300.5 446.5 L 1257.5 446.5 Z M 661.5 440.5 L 703.5 440.5 L 703.5 466.5 L 661.5 466.5 Z M 379.5 440.5 L 465.5 440.5 L 465.5 466.5 L 379.5 466.5 Z M 1138.5 440.5 L 1181.5 440.5 L 1181.5 466.5 L 1138.5 466.5 Z M 1376.5 440.5 L 1419.5 440.5 L 1419.5 466.5 L 1376.5 466.5 Z M 899.5 440.5 L 942.5 440.5 L 942.5 466.5 L 899.5 466.5 Z M 1615.5 440.5 L 1656.5 440.5 L 1656.5 466.5 L 1615.5 466.5 Z M 259.5 443.5 L 303.5 443.5 L 303.5 469.5 L 259.5 469.5 Z M 1257.5 446.5 L 1300.5 446.5 L 1300.5 472.5 L 1257.5 472.5 Z M 1496.5 446.5 L 1539.5 446.5 L 1539.5 472.5 L 1496.5 472.5 Z M 541.5 446.5 L 584.5 446.5 L 584.5 472.5 L 541.5 472.5 Z M 780.5 446.5 L 823.5 446.5 L 823.5 472.5 L 780.5 472.5 Z M 1019.5 446.5 L 1061.5 446.5 L 1061.5 472.5 L 1019.5 472.5 Z M 1376.5 466.5 L 1419.5 466.5 L 1419.5 492.5 L 1376.5 492.5 Z M 899.5 466.5 L 942.5 466.5 L 942.5 492.5 L 899.5 492.5 Z M 1138.5 466.5 L 1181.5 466.5 L 1181.5 492.5 L 1138.5 492.5 Z M 1615.5 466.5 L 1656.5 466.5 L 1656.5 492.5 L 1615.5 492.5 Z M 661.5 466.5 L 703.5 466.5 L 703.5 492.5 L 661.5 492.5 Z M 379.5 466.5 L 465.5 466.5 L 465.5 492.5 L 379.5 492.5 Z M 259.5 469.5 L 303.5 469.5 L 303.5 495.5 L 259.5 495.5 Z M 1257.5 472.5 L 1300.5 472.5 L 1300.5 498.5 L 1257.5 498.5 Z M 1496.5 472.5 L 1539.5 472.5 L 1539.5 498.5 L 1496.5 498.5 Z M 541.5 472.5 L 584.5 472.5 L 584.5 498.5 L 541.5 498.5 Z M 1019.5 472.5 L 1061.5 472.5 L 1061.5 498.5 L 1019.5 498.5 Z M 780.5 472.5 L 823.5 472.5 L 823.5 498.5 L 780.5 498.5 Z M 259.5 495.5 L 303.5 495.5 L 303.5 521.5 L 259.5 521.5 Z M 541.5 498.5 L 584.5 498.5 L 584.5 524.5 L 541.5 524.5 Z M 780.5 498.5 L 823.5 498.5 L 823.5 524.5 L 780.5 524.5 Z M 1257.5 498.5 L 1300.5 498.5 L 1300.5 524.5 L 1257.5 524.5 Z M 1019.5 498.5 L 1061.5 498.5 L 1061.5 524.5 L 1019.5 524.5 Z M 1496.5 498.5 L 1539.5 498.5 L 1539.5 524.5 L 1496.5 524.5 Z M 379.5 492.5 L 465.5 492.5 L 465.5 530.5 L 379.5 530.5 Z M 899.5 492.5 L 942.5 492.5 L 942.5 530.5 L 899.5 530.5 Z M 661.5 492.5 L 703.5 492.5 L 703.5 530.5 L 661.5 530.5 Z M 780.5 524.5 L 823.5 524.5 L 823.5 530.5 L 780.5 530.5 Z M 1257.5 524.5 L 1300.5 524.5 L 1300.5 530.5 L 1257.5 530.5 Z M 541.5 524.5 L 584.5 524.5 L 584.5 530.5 L 541.5 530.5 Z M 1615.5 492.5 L 1656.5 492.5 L 1656.5 530.5 L 1615.5 530.5 Z M 1376.5 492.5 L 1419.5 492.5 L 1419.5 530.5 L 1376.5 530.5 Z M 1138.5 492.5 L 1181.5 492.5 L 1181.5 530.5 L 1138.5 530.5 Z M 1496.5 524.5 L 1539.5 524.5 L 1539.5 530.5 L 1496.5 530.5 Z M 259.5 521.5 L 303.5 521.5 L 303.5 530.5 L 259.5 530.5 Z M 1019.5 524.5 L 1061.5 524.5 L 1061.5 530.5 L 1019.5 530.5 Z M 225.5 856.5 L 1693.5 856.5 L 1693.5 882.5 L 225.5 882.5 Z M 225.5 856.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1539.5 647.5 L 1615.5 647.5 L 1615.5 761.5 L 1539.5 761.5 Z M 306.5 647.5 L 382.5 647.5 L 382.5 761.5 L 306.5 761.5 Z M 465.5 647.5 L 541.5 647.5 L 541.5 761.5 L 465.5 761.5 Z M 584.5 647.5 L 661.5 647.5 L 661.5 761.5 L 584.5 761.5 Z M 703.5 647.5 L 780.5 647.5 L 780.5 761.5 L 703.5 761.5 Z M 823.5 647.5 L 899.5 647.5 L 899.5 761.5 L 823.5 761.5 Z M 942.5 647.5 L 1019.5 647.5 L 1019.5 761.5 L 942.5 761.5 Z M 1061.5 647.5 L 1138.5 647.5 L 1138.5 761.5 L 1061.5 761.5 Z M 1181.5 647.5 L 1257.5 647.5 L 1257.5 761.5 L 1181.5 761.5 Z M 1300.5 647.5 L 1376.5 647.5 L 1376.5 761.5 L 1300.5 761.5 Z M 1419.5 647.5 L 1496.5 647.5 L 1496.5 761.5 L 1419.5 761.5 Z M 1419.5 647.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1539.5 301.5 L 1615.5 301.5 L 1615.5 530.5 L 1539.5 530.5 Z M 303.5 301.5 L 379.5 301.5 L 379.5 530.5 L 303.5 530.5 Z M 465.5 301.5 L 541.5 301.5 L 541.5 530.5 L 465.5 530.5 Z M 584.5 301.5 L 661.5 301.5 L 661.5 530.5 L 584.5 530.5 Z M 703.5 301.5 L 780.5 301.5 L 780.5 530.5 L 703.5 530.5 Z M 823.5 301.5 L 899.5 301.5 L 899.5 530.5 L 823.5 530.5 Z M 942.5 301.5 L 1019.5 301.5 L 1019.5 530.5 L 942.5 530.5 Z M 1061.5 301.5 L 1138.5 301.5 L 1138.5 530.5 L 1061.5 530.5 Z M 1181.5 301.5 L 1257.5 301.5 L 1257.5 530.5 L 1181.5 530.5 Z M 1300.5 301.5 L 1376.5 301.5 L 1376.5 530.5 L 1300.5 530.5 Z M 1419.5 301.5 L 1496.5 301.5 L 1496.5 530.5 L 1419.5 530.5 Z M 1419.5 301.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 248.5 234.5 L 274.5 234.5 L 274.5 260.5 L 248.5 260.5 Z M 1643.5 234.5 L 1669.5 234.5 L 1669.5 260.5 L 1643.5 260.5 Z M 1570.5 234.5 L 1596.5 234.5 L 1596.5 260.5 L 1570.5 260.5 Z M 1496.5 234.5 L 1522.5 234.5 L 1522.5 260.5 L 1496.5 260.5 Z M 1423.5 234.5 L 1449.5 234.5 L 1449.5 260.5 L 1423.5 260.5 Z M 1350.5 234.5 L 1376.5 234.5 L 1376.5 260.5 L 1350.5 260.5 Z M 1276.5 234.5 L 1302.5 234.5 L 1302.5 260.5 L 1276.5 260.5 Z M 1203.5 234.5 L 1229.5 234.5 L 1229.5 260.5 L 1203.5 260.5 Z M 1129.5 234.5 L 1155.5 234.5 L 1155.5 260.5 L 1129.5 260.5 Z M 1056.5 234.5 L 1082.5 234.5 L 1082.5 260.5 L 1056.5 260.5 Z M 983.5 234.5 L 1009.5 234.5 L 1009.5 260.5 L 983.5 260.5 Z M 909.5 234.5 L 935.5 234.5 L 935.5 260.5 L 909.5 260.5 Z M 836.5 234.5 L 862.5 234.5 L 862.5 260.5 L 836.5 260.5 Z M 762.5 234.5 L 788.5 234.5 L 788.5 260.5 L 762.5 260.5 Z M 689.5 234.5 L 715.5 234.5 L 715.5 260.5 L 689.5 260.5 Z M 615.5 234.5 L 641.5 234.5 L 641.5 260.5 L 615.5 260.5 Z M 542.5 234.5 L 568.5 234.5 L 568.5 260.5 L 542.5 260.5 Z M 469.5 234.5 L 495.5 234.5 L 495.5 260.5 L 469.5 260.5 Z M 395.5 234.5 L 421.5 234.5 L 421.5 260.5 L 395.5 260.5 Z M 322.5 234.5 L 348.5 234.5 L 348.5 260.5 L 322.5 260.5 Z M 374.5 312.5 L 400.5 312.5 L 400.5 336.5 L 374.5 336.5 Z M 1146.5 312.5 L 1172.5 312.5 L 1172.5 336.5 L 1146.5 336.5 Z M 1642.5 312.5 L 1668.5 312.5 L 1668.5 336.5 L 1642.5 336.5 Z M 908.5 312.5 L 934.5 312.5 L 934.5 336.5 L 908.5 336.5 Z M 648.5 312.5 L 674.5 312.5 L 674.5 336.5 L 648.5 336.5 Z M 319.5 312.5 L 345.5 312.5 L 345.5 338.5 L 319.5 338.5 Z M 1331.5 312.5 L 1357.5 312.5 L 1357.5 338.5 L 1331.5 338.5 Z M 1091.5 312.5 L 1117.5 312.5 L 1117.5 338.5 L 1091.5 338.5 Z M 963.5 312.5 L 989.5 312.5 L 989.5 338.5 L 963.5 338.5 Z M 1587.5 312.5 L 1613.5 312.5 L 1613.5 338.5 L 1587.5 338.5 Z M 484.5 312.5 L 510.5 312.5 L 510.5 338.5 L 484.5 338.5 Z M 853.5 312.5 L 879.5 312.5 L 879.5 338.5 L 853.5 338.5 Z M 703.5 312.5 L 729.5 312.5 L 729.5 338.5 L 703.5 338.5 Z M 1146.5 336.5 L 1172.5 336.5 L 1172.5 338.5 L 1146.5 338.5 Z M 1642.5 336.5 L 1668.5 336.5 L 1668.5 338.5 L 1642.5 338.5 Z M 1440.5 312.5 L 1466.5 312.5 L 1466.5 338.5 L 1440.5 338.5 Z M 648.5 336.5 L 674.5 336.5 L 674.5 338.5 L 648.5 338.5 Z M 429.5 312.5 L 455.5 312.5 L 455.5 338.5 L 429.5 338.5 Z M 374.5 336.5 L 400.5 336.5 L 400.5 338.5 L 374.5 338.5 Z M 1201.5 312.5 L 1227.5 312.5 L 1227.5 338.5 L 1201.5 338.5 Z M 908.5 336.5 L 934.5 336.5 L 934.5 338.5 L 908.5 338.5 Z M 328.5 785.5 L 354.5 785.5 L 354.5 811.5 L 328.5 811.5 Z M 1653.5 785.5 L 1679.5 785.5 L 1679.5 811.5 L 1653.5 811.5 Z M 1597.5 785.5 L 1623.5 785.5 L 1623.5 811.5 L 1597.5 811.5 Z M 1441.5 785.5 L 1467.5 785.5 L 1467.5 811.5 L 1441.5 811.5 Z M 1386.5 785.5 L 1412.5 785.5 L 1412.5 811.5 L 1386.5 811.5 Z M 1331.5 785.5 L 1357.5 785.5 L 1357.5 811.5 L 1331.5 811.5 Z M 1202.5 785.5 L 1228.5 785.5 L 1228.5 811.5 L 1202.5 811.5 Z M 1147.5 785.5 L 1173.5 785.5 L 1173.5 811.5 L 1147.5 811.5 Z M 1092.5 785.5 L 1118.5 785.5 L 1118.5 811.5 L 1092.5 811.5 Z M 957.5 785.5 L 983.5 785.5 L 983.5 811.5 L 957.5 811.5 Z M 902.5 785.5 L 928.5 785.5 L 928.5 811.5 L 902.5 811.5 Z M 847.5 785.5 L 873.5 785.5 L 873.5 811.5 L 847.5 811.5 Z M 733.5 785.5 L 759.5 785.5 L 759.5 811.5 L 733.5 811.5 Z M 678.5 785.5 L 704.5 785.5 L 704.5 811.5 L 678.5 811.5 Z M 623.5 785.5 L 649.5 785.5 L 649.5 811.5 L 623.5 811.5 Z M 493.5 785.5 L 519.5 785.5 L 519.5 811.5 L 493.5 811.5 Z M 438.5 785.5 L 464.5 785.5 L 464.5 811.5 L 438.5 811.5 Z M 383.5 785.5 L 409.5 785.5 L 409.5 811.5 L 383.5 811.5 Z M 248.5 856.5 L 274.5 856.5 L 274.5 882.5 L 248.5 882.5 Z M 1643.5 856.5 L 1669.5 856.5 L 1669.5 882.5 L 1643.5 882.5 Z M 1570.5 856.5 L 1596.5 856.5 L 1596.5 882.5 L 1570.5 882.5 Z M 1496.5 856.5 L 1522.5 856.5 L 1522.5 882.5 L 1496.5 882.5 Z M 1423.5 856.5 L 1449.5 856.5 L 1449.5 882.5 L 1423.5 882.5 Z M 1350.5 856.5 L 1376.5 856.5 L 1376.5 882.5 L 1350.5 882.5 Z M 1276.5 856.5 L 1302.5 856.5 L 1302.5 882.5 L 1276.5 882.5 Z M 1203.5 856.5 L 1229.5 856.5 L 1229.5 882.5 L 1203.5 882.5 Z M 1129.5 856.5 L 1155.5 856.5 L 1155.5 882.5 L 1129.5 882.5 Z M 1056.5 856.5 L 1082.5 856.5 L 1082.5 882.5 L 1056.5 882.5 Z M 983.5 856.5 L 1009.5 856.5 L 1009.5 882.5 L 983.5 882.5 Z M 909.5 856.5 L 935.5 856.5 L 935.5 882.5 L 909.5 882.5 Z M 836.5 856.5 L 862.5 856.5 L 862.5 882.5 L 836.5 882.5 Z M 762.5 856.5 L 788.5 856.5 L 788.5 882.5 L 762.5 882.5 Z M 689.5 856.5 L 715.5 856.5 L 715.5 882.5 L 689.5 882.5 Z M 615.5 856.5 L 641.5 856.5 L 641.5 882.5 L 615.5 882.5 Z M 542.5 856.5 L 568.5 856.5 L 568.5 882.5 L 542.5 882.5 Z M 469.5 856.5 L 495.5 856.5 L 495.5 882.5 L 469.5 882.5 Z M 395.5 856.5 L 421.5 856.5 L 421.5 882.5 L 395.5 882.5 Z M 322.5 856.5 L 348.5 856.5 L 348.5 882.5 L 322.5 882.5 Z M 322.5 856.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image350"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface341">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -214,6 +214,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 562.773438 621.671875 L 550.160156 621.671875 L 546.707031 631.5 L 542.261719 631.5 L 553.933594 598.78125 L 559.316406 598.78125 L 570.808594 631.5 L 566.140625 631.5 Z M 561.605469 618.171875 L 556.578125 603.269531 L 551.195312 618.171875 Z M 561.605469 618.171875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 542 477 L 568 477 M 542 451 L 568 451 M 542 451 L 542 477 M 568 451 L 568 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 542 477 L 568 477 M 542 451 L 568 451 M 568 477 L 568 451 M 542 477 L 542 451 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 225 205 L 225 214 M 220 210 L 229 210 M 224 211 L 226 211 M 224 209 L 226 209 M 224 209 L 224 211 M 226 209 L 226 211 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/conb/sky130_fd_sc_hvl__conb_1.svg b/cells/conb/sky130_fd_sc_hvl__conb_1.svg
index 9794c0f..ebf8983 100644
--- a/cells/conb/sky130_fd_sc_hvl__conb_1.svg
+++ b/cells/conb/sky130_fd_sc_hvl__conb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 672.5 98.5 L 1255.5 98.5 L 1255.5 593.5 L 672.5 593.5 Z M 672.5 98.5 "/>
 </clipPath>
-<image id="image521" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image549" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image521"/>
+  <use xlink:href="#image549"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -20,16 +20,16 @@
 <clipPath id="clip4">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 735.5 161.5 "/>
 </clipPath>
-<image id="image522" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image550" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image522"/>
+  <use xlink:href="#image550"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
 </mask>
-<image id="image523" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image551" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image523"/>
+  <use xlink:href="#image551"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -38,14 +38,14 @@
   <path d="M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image522"/>
+  <use xlink:href="#image550"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
-<image id="image524" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image552" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image524"/>
+  <use xlink:href="#image552"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -53,9 +53,9 @@
 <clipPath id="clip6">
   <path d="M 984.5 597.5 L 1081.5 597.5 L 1081.5 605.5 L 984.5 605.5 Z M 847.5 597.5 L 944.5 597.5 L 944.5 605.5 L 847.5 605.5 Z M 847.5 597.5 "/>
 </clipPath>
-<image id="image525" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
+<image id="image553" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image525"/>
+  <use xlink:href="#image553"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -69,15 +69,15 @@
 <clipPath id="clip9">
   <path d="M 765.5 161.5 L 797.5 161.5 L 797.5 193.5 L 765.5 193.5 Z M 1130.5 161.5 L 1163.5 161.5 L 1163.5 193.5 L 1130.5 193.5 Z M 1039.5 161.5 L 1071.5 161.5 L 1071.5 193.5 L 1039.5 193.5 Z M 947.5 161.5 L 980.5 161.5 L 980.5 193.5 L 947.5 193.5 Z M 856.5 161.5 L 888.5 161.5 L 888.5 193.5 L 856.5 193.5 Z M 788.5 252.5 L 820.5 252.5 L 820.5 267.5 L 788.5 267.5 Z M 856.5 252.5 L 888.5 252.5 L 888.5 285.5 L 856.5 285.5 Z M 788.5 267.5 L 820.5 267.5 L 820.5 285.5 L 788.5 285.5 Z M 1107.5 844.5 L 1140.5 844.5 L 1140.5 860.5 L 1107.5 860.5 Z M 1107.5 860.5 L 1140.5 860.5 L 1140.5 876.5 L 1107.5 876.5 Z M 1039.5 844.5 L 1071.5 844.5 L 1071.5 876.5 L 1039.5 876.5 Z M 765.5 935.5 L 797.5 935.5 L 797.5 968.5 L 765.5 968.5 Z M 1130.5 935.5 L 1163.5 935.5 L 1163.5 968.5 L 1130.5 968.5 Z M 1039.5 935.5 L 1071.5 935.5 L 1071.5 968.5 L 1039.5 968.5 Z M 947.5 935.5 L 980.5 935.5 L 980.5 968.5 L 947.5 968.5 Z M 856.5 935.5 L 888.5 935.5 L 888.5 968.5 L 856.5 968.5 Z M 856.5 935.5 "/>
 </clipPath>
-<image id="image526" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image554" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image526"/>
+  <use xlink:href="#image554"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface518">
+<g id="surface546">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -232,6 +232,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1001.261719 635.40625 L 1001.09375 637.988281 L 1000.757812 640.457031 L 1000.195312 642.753906 L 999.410156 644.941406 L 998.402344 647.019531 L 997.167969 648.925781 L 995.707031 650.722656 L 994.082031 652.234375 L 992.34375 653.527344 L 990.433594 654.59375 L 988.359375 655.378906 L 986.171875 655.996094 L 985.386719 656.105469 L 984.601562 656.277344 L 983.871094 656.332031 L 983.085938 656.445312 L 982.300781 656.445312 L 981.515625 656.5 L 978.933594 656.332031 L 976.523438 655.9375 L 974.277344 655.265625 L 972.148438 654.367188 L 970.125 653.191406 L 968.332031 651.675781 L 966.703125 650.046875 L 965.300781 648.195312 L 964.179688 646.175781 L 963.226562 643.988281 L 962.496094 641.632812 L 962.046875 639.050781 L 961.9375 638.433594 L 961.878906 637.761719 L 961.824219 637.144531 L 961.769531 636.472656 L 961.769531 635.070312 L 961.878906 632.265625 L 962.273438 629.570312 L 962.890625 627.101562 L 963.789062 624.746094 L 964.910156 622.558594 L 966.367188 620.539062 L 967.828125 618.914062 L 969.511719 617.453125 L 971.359375 616.21875 L 973.324219 615.265625 L 975.457031 614.480469 L 977.757812 613.917969 L 978.316406 613.863281 L 978.933594 613.808594 L 979.550781 613.75 L 980.167969 613.695312 L 980.785156 613.695312 L 981.460938 613.640625 L 984.097656 613.808594 L 986.621094 614.199219 L 988.976562 614.929688 L 991.164062 615.882812 L 993.183594 617.171875 L 995.035156 618.6875 L 996.605469 620.484375 L 998.007812 622.445312 L 999.132812 624.632812 L 1000.027344 626.992188 L 1000.703125 629.570312 L 1001.152344 632.320312 L 1001.152344 633.386719 L 1001.207031 633.890625 L 1001.207031 634.902344 Z M 981.460938 618.238281 L 979.441406 618.40625 L 977.589844 618.742188 L 975.792969 619.304688 L 974.167969 620.148438 L 972.652344 621.210938 L 971.304688 622.445312 L 970.015625 624.015625 L 969.003906 625.699219 L 968.164062 627.550781 L 967.546875 629.570312 L 967.152344 631.757812 L 966.984375 634.058594 L 966.984375 635.070312 L 967.042969 637.539062 L 967.378906 639.78125 L 967.9375 641.859375 L 968.667969 643.765625 L 969.679688 645.558594 L 970.914062 647.132812 L 972.203125 648.535156 L 973.605469 649.65625 L 975.175781 650.554688 L 976.859375 651.226562 L 978.710938 651.675781 L 980.675781 651.84375 L 980.785156 651.898438 L 981.515625 651.898438 L 983.480469 651.789062 L 985.332031 651.449219 L 987.070312 650.890625 L 988.640625 650.046875 L 990.15625 649.039062 L 991.558594 647.75 L 992.792969 646.347656 L 993.800781 644.71875 L 994.644531 642.921875 L 995.261719 641.015625 L 995.707031 638.941406 L 995.988281 636.695312 L 995.988281 635.574219 L 996.046875 635.292969 L 995.933594 632.824219 L 995.597656 630.46875 L 995.035156 628.28125 L 994.25 626.261719 L 993.242188 624.464844 L 992.007812 622.785156 L 990.546875 621.4375 L 988.976562 620.316406 L 987.292969 619.417969 L 985.441406 618.800781 L 983.480469 618.40625 Z M 981.460938 618.238281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 947 460 L 980 460 M 947 428 L 980 428 M 947 428 L 947 460 M 980 428 L 980 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 947 460 L 980 460 M 947 428 L 980 428 M 980 460 L 980 428 M 947 460 L 947 428 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 735 122 L 735 131 M 730 127 L 739 127 M 734 128 L 736 128 M 734 126 L 736 126 M 734 126 L 734 128 M 736 126 L 736 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_4.svg b/cells/decap/sky130_fd_sc_hvl__decap_4.svg
index 01e6154..35ccb92 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_4.svg
+++ b/cells/decap/sky130_fd_sc_hvl__decap_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 719.5 98.5 L 1210.5 98.5 L 1210.5 593.5 L 719.5 593.5 Z M 719.5 98.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 782.5 161.5 L 1147.5 161.5 L 1147.5 193.5 L 782.5 193.5 Z M 782.5 161.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 782.5 161.5 L 1147.5 161.5 L 1147.5 193.5 L 782.5 193.5 Z M 822.5 696.5 L 1117.5 696.5 L 1117.5 791.5 L 822.5 791.5 Z M 822.5 791.5 L 1117.5 791.5 L 1117.5 823.5 L 822.5 823.5 Z M 822.5 823.5 L 1117.5 823.5 L 1117.5 838.5 L 822.5 838.5 Z M 822.5 823.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 782.5 935.5 L 1147.5 935.5 L 1147.5 968.5 L 782.5 968.5 Z M 782.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 822.5 247.5 L 872.5 247.5 L 872.5 258.5 L 822.5 258.5 Z M 1063.5 247.5 L 1117.5 247.5 L 1117.5 258.5 L 1063.5 258.5 Z M 1063.5 258.5 L 1117.5 258.5 L 1117.5 290.5 L 1063.5 290.5 Z M 822.5 258.5 L 872.5 258.5 L 872.5 290.5 L 822.5 290.5 Z M 822.5 290.5 L 872.5 290.5 L 872.5 326.5 L 822.5 326.5 Z M 1063.5 290.5 L 1117.5 290.5 L 1117.5 326.5 L 1063.5 326.5 Z M 822.5 326.5 L 872.5 326.5 L 872.5 358.5 L 822.5 358.5 Z M 1063.5 326.5 L 1117.5 326.5 L 1117.5 358.5 L 1063.5 358.5 Z M 822.5 358.5 L 872.5 358.5 L 872.5 393.5 L 822.5 393.5 Z M 1063.5 358.5 L 1117.5 358.5 L 1117.5 393.5 L 1063.5 393.5 Z M 1063.5 393.5 L 1117.5 393.5 L 1117.5 425.5 L 1063.5 425.5 Z M 822.5 393.5 L 872.5 393.5 L 872.5 425.5 L 822.5 425.5 Z M 1063.5 425.5 L 1117.5 425.5 L 1117.5 437.5 L 1063.5 437.5 Z M 822.5 425.5 L 872.5 425.5 L 872.5 437.5 L 822.5 437.5 Z M 782.5 935.5 L 1147.5 935.5 L 1147.5 968.5 L 782.5 968.5 Z M 782.5 935.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 872.5 696.5 L 1063.5 696.5 L 1063.5 838.5 L 872.5 838.5 Z M 872.5 696.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 872.5 247.5 L 1063.5 247.5 L 1063.5 437.5 L 872.5 437.5 Z M 872.5 247.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 811.5 161.5 L 844.5 161.5 L 844.5 193.5 L 811.5 193.5 Z M 1085.5 161.5 L 1118.5 161.5 L 1118.5 193.5 L 1085.5 193.5 Z M 994.5 161.5 L 1026.5 161.5 L 1026.5 193.5 L 994.5 193.5 Z M 903.5 161.5 L 935.5 161.5 L 935.5 193.5 L 903.5 193.5 Z M 876.5 242.5 L 908.5 242.5 L 908.5 274.5 L 876.5 274.5 Z M 1029.5 242.5 L 1062.5 242.5 L 1062.5 274.5 L 1029.5 274.5 Z M 946.5 242.5 L 978.5 242.5 L 978.5 274.5 L 946.5 274.5 Z M 823.5 844.5 L 855.5 844.5 L 855.5 876.5 L 823.5 876.5 Z M 1069.5 844.5 L 1102.5 844.5 L 1102.5 876.5 L 1069.5 876.5 Z M 990.5 844.5 L 1023.5 844.5 L 1023.5 876.5 L 990.5 876.5 Z M 907.5 844.5 L 939.5 844.5 L 939.5 876.5 L 907.5 876.5 Z M 811.5 935.5 L 844.5 935.5 L 844.5 968.5 L 811.5 968.5 Z M 1085.5 935.5 L 1118.5 935.5 L 1118.5 968.5 L 1085.5 968.5 Z M 994.5 935.5 L 1026.5 935.5 L 1026.5 968.5 L 994.5 968.5 Z M 903.5 935.5 L 935.5 935.5 L 935.5 968.5 L 903.5 968.5 Z M 903.5 935.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface338">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -181,6 +181,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1020.175781 197.832031 L 1020.066406 199.625 L 1019.785156 201.253906 L 1019.28125 202.769531 L 1018.605469 204.113281 L 1017.707031 205.40625 L 1016.644531 206.527344 L 1015.464844 207.480469 L 1014.230469 208.210938 L 1012.828125 208.769531 L 1011.371094 209.21875 L 1009.796875 209.445312 L 1008.117188 209.5 L 989.660156 209.5 L 989.660156 168.601562 L 1006.265625 168.601562 L 1008.675781 168.769531 L 1010.808594 169.164062 L 1012.714844 169.835938 L 1014.34375 170.789062 L 1015.746094 172.023438 L 1016.867188 173.539062 L 1017.316406 174.378906 L 1017.707031 175.277344 L 1017.988281 176.121094 L 1018.214844 177.074219 L 1018.324219 178.027344 L 1018.382812 178.980469 L 1018.214844 181 L 1017.707031 182.738281 L 1016.921875 184.367188 L 1015.800781 185.714844 L 1014.398438 186.949219 L 1012.714844 187.902344 L 1014.34375 188.628906 L 1015.746094 189.414062 L 1016.980469 190.3125 L 1017.988281 191.324219 L 1018.773438 192.390625 L 1019.390625 193.511719 L 1019.617188 194.183594 L 1019.785156 194.859375 L 1019.953125 195.53125 L 1020.066406 196.316406 L 1020.121094 197.046875 Z M 1013.164062 179.710938 L 1012.996094 178.027344 L 1012.492188 176.625 L 1011.707031 175.390625 L 1010.585938 174.492188 L 1009.179688 173.820312 L 1007.441406 173.371094 L 1007.050781 173.371094 L 1006.65625 173.316406 L 1006.265625 173.257812 L 1005.367188 173.257812 L 1004.972656 173.203125 L 994.875 173.203125 L 994.875 186.21875 L 1004.972656 186.21875 L 1007.050781 186.105469 L 1008.84375 185.769531 L 1010.359375 185.152344 L 1011.480469 184.3125 L 1012.378906 183.1875 L 1012.941406 181.84375 L 1012.996094 181.5625 L 1013.050781 181.226562 L 1013.109375 180.886719 L 1013.109375 180.101562 Z M 1007.609375 204.898438 L 1009.179688 204.84375 L 1010.585938 204.507812 L 1011.820312 203.945312 L 1012.828125 203.214844 L 1013.667969 202.261719 L 1014.34375 201.085938 L 1014.511719 200.636719 L 1014.625 200.132812 L 1014.792969 199.570312 L 1014.847656 199.066406 L 1014.902344 198.503906 L 1014.960938 197.886719 L 1014.847656 196.652344 L 1014.625 195.476562 L 1014.230469 194.464844 L 1013.667969 193.511719 L 1012.941406 192.726562 L 1012.097656 191.996094 L 1011.480469 191.660156 L 1010.808594 191.378906 L 1010.078125 191.15625 L 1009.292969 190.988281 L 1008.453125 190.875 L 1007.609375 190.820312 L 994.875 190.820312 L 994.875 204.898438 Z M 1007.609375 204.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 965 886 L 965 893 M 961 890 L 968 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 965 890 L 965 890 M 965 890 L 965 890 M 965 890 L 965 890 M 965 890 L 965 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 782 122 L 782 131 M 777 127 L 786 127 M 781 128 L 783 128 M 781 126 L 783 126 M 781 126 L 781 128 M 783 126 L 783 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hvl__decap_8.svg b/cells/decap/sky130_fd_sc_hvl__decap_8.svg
index 5dfbb02..b20de9e 100644
--- a/cells/decap/sky130_fd_sc_hvl__decap_8.svg
+++ b/cells/decap/sky130_fd_sc_hvl__decap_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 535.5 98.5 L 1391.5 98.5 L 1391.5 593.5 L 535.5 593.5 Z M 535.5 98.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 597.5 161.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 699.5 697.5 L 1238.5 697.5 L 1238.5 708.5 L 699.5 708.5 Z M 699.5 708.5 L 1238.5 708.5 L 1238.5 740.5 L 699.5 740.5 Z M 699.5 740.5 L 1238.5 740.5 L 1238.5 782.5 L 699.5 782.5 Z M 699.5 782.5 L 1238.5 782.5 L 1238.5 815.5 L 699.5 815.5 Z M 699.5 815.5 L 1238.5 815.5 L 1238.5 839.5 L 699.5 839.5 Z M 699.5 815.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 685.5 247.5 L 737.5 247.5 L 737.5 259.5 L 685.5 259.5 Z M 1171.5 247.5 L 1225.5 247.5 L 1225.5 259.5 L 1171.5 259.5 Z M 927.5 247.5 L 981.5 247.5 L 981.5 259.5 L 927.5 259.5 Z M 685.5 259.5 L 737.5 259.5 L 737.5 291.5 L 685.5 291.5 Z M 1171.5 259.5 L 1225.5 259.5 L 1225.5 291.5 L 1171.5 291.5 Z M 927.5 259.5 L 981.5 259.5 L 981.5 291.5 L 927.5 291.5 Z M 1171.5 291.5 L 1225.5 291.5 L 1225.5 326.5 L 1171.5 326.5 Z M 927.5 291.5 L 981.5 291.5 L 981.5 326.5 L 927.5 326.5 Z M 685.5 291.5 L 737.5 291.5 L 737.5 326.5 L 685.5 326.5 Z M 685.5 326.5 L 737.5 326.5 L 737.5 359.5 L 685.5 359.5 Z M 1171.5 326.5 L 1225.5 326.5 L 1225.5 359.5 L 1171.5 359.5 Z M 927.5 326.5 L 981.5 326.5 L 981.5 359.5 L 927.5 359.5 Z M 927.5 359.5 L 981.5 359.5 L 981.5 394.5 L 927.5 394.5 Z M 685.5 359.5 L 737.5 359.5 L 737.5 394.5 L 685.5 394.5 Z M 1171.5 359.5 L 1225.5 359.5 L 1225.5 394.5 L 1171.5 394.5 Z M 927.5 394.5 L 981.5 394.5 L 981.5 426.5 L 927.5 426.5 Z M 1171.5 394.5 L 1225.5 394.5 L 1225.5 426.5 L 1171.5 426.5 Z M 685.5 394.5 L 737.5 394.5 L 737.5 426.5 L 685.5 426.5 Z M 927.5 426.5 L 981.5 426.5 L 981.5 438.5 L 927.5 438.5 Z M 685.5 426.5 L 737.5 426.5 L 737.5 438.5 L 685.5 438.5 Z M 1171.5 426.5 L 1225.5 426.5 L 1225.5 438.5 L 1171.5 438.5 Z M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 993.5 697.5 L 1183.5 697.5 L 1183.5 839.5 L 993.5 839.5 Z M 750.5 697.5 L 940.5 697.5 L 940.5 839.5 L 750.5 839.5 Z M 750.5 697.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 981.5 247.5 L 1171.5 247.5 L 1171.5 438.5 L 981.5 438.5 Z M 737.5 247.5 L 927.5 247.5 L 927.5 438.5 L 737.5 438.5 Z M 737.5 247.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 627.5 161.5 L 659.5 161.5 L 659.5 193.5 L 627.5 193.5 Z M 1266.5 161.5 L 1299.5 161.5 L 1299.5 193.5 L 1266.5 193.5 Z M 1175.5 161.5 L 1207.5 161.5 L 1207.5 193.5 L 1175.5 193.5 Z M 1084.5 161.5 L 1116.5 161.5 L 1116.5 193.5 L 1084.5 193.5 Z M 992.5 161.5 L 1025.5 161.5 L 1025.5 193.5 L 992.5 193.5 Z M 901.5 161.5 L 933.5 161.5 L 933.5 193.5 L 901.5 193.5 Z M 809.5 161.5 L 842.5 161.5 L 842.5 193.5 L 809.5 193.5 Z M 718.5 161.5 L 751.5 161.5 L 751.5 193.5 L 718.5 193.5 Z M 731.5 243.5 L 764.5 243.5 L 764.5 275.5 L 731.5 275.5 Z M 1138.5 243.5 L 1170.5 243.5 L 1170.5 275.5 L 1138.5 275.5 Z M 1059.5 243.5 L 1091.5 243.5 L 1091.5 275.5 L 1059.5 275.5 Z M 975.5 243.5 L 1007.5 243.5 L 1007.5 275.5 L 975.5 275.5 Z M 894.5 243.5 L 927.5 243.5 L 927.5 275.5 L 894.5 275.5 Z M 815.5 243.5 L 848.5 243.5 L 848.5 275.5 L 815.5 275.5 Z M 739.5 845.5 L 771.5 845.5 L 771.5 877.5 L 739.5 877.5 Z M 1145.5 845.5 L 1178.5 845.5 L 1178.5 877.5 L 1145.5 877.5 Z M 1066.5 845.5 L 1099.5 845.5 L 1099.5 877.5 L 1066.5 877.5 Z M 983.5 845.5 L 1015.5 845.5 L 1015.5 877.5 L 983.5 877.5 Z M 902.5 845.5 L 934.5 845.5 L 934.5 877.5 L 902.5 877.5 Z M 823.5 845.5 L 855.5 845.5 L 855.5 877.5 L 823.5 877.5 Z M 627.5 935.5 L 659.5 935.5 L 659.5 968.5 L 627.5 968.5 Z M 1266.5 935.5 L 1299.5 935.5 L 1299.5 968.5 L 1266.5 968.5 Z M 1175.5 935.5 L 1207.5 935.5 L 1207.5 968.5 L 1175.5 968.5 Z M 1084.5 935.5 L 1116.5 935.5 L 1116.5 968.5 L 1084.5 968.5 Z M 992.5 935.5 L 1025.5 935.5 L 1025.5 968.5 L 992.5 968.5 Z M 901.5 935.5 L 933.5 935.5 L 933.5 968.5 L 901.5 968.5 Z M 809.5 935.5 L 842.5 935.5 L 842.5 968.5 L 809.5 968.5 Z M 718.5 935.5 L 751.5 935.5 L 751.5 968.5 L 718.5 968.5 Z M 718.5 935.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface338">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -181,6 +181,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1019.175781 197.832031 L 1019.066406 199.625 L 1018.785156 201.253906 L 1018.28125 202.769531 L 1017.605469 204.113281 L 1016.707031 205.40625 L 1015.644531 206.527344 L 1014.464844 207.480469 L 1013.230469 208.210938 L 1011.828125 208.769531 L 1010.371094 209.21875 L 1008.796875 209.445312 L 1007.117188 209.5 L 988.660156 209.5 L 988.660156 168.601562 L 1005.265625 168.601562 L 1007.675781 168.769531 L 1009.808594 169.164062 L 1011.714844 169.835938 L 1013.34375 170.789062 L 1014.746094 172.023438 L 1015.867188 173.539062 L 1016.316406 174.378906 L 1016.707031 175.277344 L 1016.988281 176.121094 L 1017.214844 177.074219 L 1017.324219 178.027344 L 1017.382812 178.980469 L 1017.214844 181 L 1016.707031 182.738281 L 1015.921875 184.367188 L 1014.800781 185.714844 L 1013.398438 186.949219 L 1011.714844 187.902344 L 1013.34375 188.628906 L 1014.746094 189.414062 L 1015.980469 190.3125 L 1016.988281 191.324219 L 1017.773438 192.390625 L 1018.390625 193.511719 L 1018.617188 194.183594 L 1018.785156 194.859375 L 1018.953125 195.53125 L 1019.066406 196.316406 L 1019.121094 197.046875 Z M 1012.164062 179.710938 L 1011.996094 178.027344 L 1011.492188 176.625 L 1010.707031 175.390625 L 1009.585938 174.492188 L 1008.179688 173.820312 L 1006.441406 173.371094 L 1006.050781 173.371094 L 1005.65625 173.316406 L 1005.265625 173.257812 L 1004.367188 173.257812 L 1003.972656 173.203125 L 993.875 173.203125 L 993.875 186.21875 L 1003.972656 186.21875 L 1006.050781 186.105469 L 1007.84375 185.769531 L 1009.359375 185.152344 L 1010.480469 184.3125 L 1011.378906 183.1875 L 1011.941406 181.84375 L 1011.996094 181.5625 L 1012.050781 181.226562 L 1012.109375 180.886719 L 1012.109375 180.101562 Z M 1006.609375 204.898438 L 1008.179688 204.84375 L 1009.585938 204.507812 L 1010.820312 203.945312 L 1011.828125 203.214844 L 1012.667969 202.261719 L 1013.34375 201.085938 L 1013.511719 200.636719 L 1013.625 200.132812 L 1013.792969 199.570312 L 1013.847656 199.066406 L 1013.902344 198.503906 L 1013.960938 197.886719 L 1013.847656 196.652344 L 1013.625 195.476562 L 1013.230469 194.464844 L 1012.667969 193.511719 L 1011.941406 192.726562 L 1011.097656 191.996094 L 1010.480469 191.660156 L 1009.808594 191.378906 L 1009.078125 191.15625 L 1008.292969 190.988281 L 1007.453125 190.875 L 1006.609375 190.820312 L 993.875 190.820312 L 993.875 204.898438 Z M 1006.609375 204.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 963 886 L 963 893 M 959 890 L 966 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 963 890 L 963 890 M 963 890 L 963 890 M 963 890 L 963 890 M 963 890 L 963 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 597 122 L 597 131 M 592 127 L 601 127 M 596 128 L 598 128 M 596 126 L 598 126 M 596 126 L 596 128 M 598 126 L 598 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.svg b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.svg
index 1b0f484..de91534 100644
--- a/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.svg
+++ b/cells/dfrbp/sky130_fd_sc_hvl__dfrbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 327.5 L 1743.5 327.5 L 1743.5 561.5 L 174.5 561.5 Z M 174.5 327.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 204.5 357.5 L 1714.5 357.5 L 1714.5 372.5 L 204.5 372.5 Z M 204.5 357.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 204.5 357.5 L 1714.5 357.5 L 1714.5 372.5 L 204.5 372.5 Z M 1402.5 599.5 L 1499.5 599.5 L 1499.5 603.5 L 1402.5 603.5 Z M 1402.5 603.5 L 1499.5 603.5 L 1499.5 618.5 L 1402.5 618.5 Z M 461.5 615.5 L 1080.5 615.5 L 1080.5 626.5 L 461.5 626.5 Z M 1525.5 615.5 L 1700.5 615.5 L 1700.5 626.5 L 1525.5 626.5 Z M 1525.5 626.5 L 1700.5 626.5 L 1700.5 641.5 L 1525.5 641.5 Z M 461.5 626.5 L 1080.5 626.5 L 1080.5 641.5 L 461.5 641.5 Z M 461.5 641.5 L 1080.5 641.5 L 1080.5 644.5 L 461.5 644.5 Z M 1402.5 618.5 L 1499.5 618.5 L 1499.5 648.5 L 1402.5 648.5 Z M 461.5 644.5 L 1375.5 644.5 L 1375.5 652.5 L 461.5 652.5 Z M 1525.5 641.5 L 1700.5 641.5 L 1700.5 652.5 L 1525.5 652.5 Z M 910.5 652.5 L 1375.5 652.5 L 1375.5 654.5 L 910.5 654.5 Z M 221.5 644.5 L 387.5 644.5 L 387.5 656.5 L 221.5 656.5 Z M 1606.5 652.5 L 1700.5 652.5 L 1700.5 663.5 L 1606.5 663.5 Z M 1402.5 648.5 L 1499.5 648.5 L 1499.5 663.5 L 1402.5 663.5 Z M 1402.5 663.5 L 1499.5 663.5 L 1499.5 667.5 L 1402.5 667.5 Z M 910.5 654.5 L 1375.5 654.5 L 1375.5 670.5 L 910.5 670.5 Z M 221.5 656.5 L 387.5 656.5 L 387.5 671.5 L 221.5 671.5 Z M 1606.5 663.5 L 1700.5 663.5 L 1700.5 678.5 L 1606.5 678.5 Z M 221.5 671.5 L 387.5 671.5 L 387.5 682.5 L 221.5 682.5 Z M 910.5 670.5 L 1375.5 670.5 L 1375.5 682.5 L 910.5 682.5 Z M 1606.5 678.5 L 1700.5 678.5 L 1700.5 682.5 L 1606.5 682.5 Z M 1606.5 678.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 204.5 723.5 L 1714.5 723.5 L 1714.5 738.5 L 204.5 738.5 Z M 204.5 723.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1398.5 396.5 L 1424.5 396.5 L 1424.5 400.5 L 1398.5 400.5 Z M 1469.5 396.5 L 1494.5 396.5 L 1494.5 400.5 L 1469.5 400.5 Z M 1604.5 396.5 L 1630.5 396.5 L 1630.5 400.5 L 1604.5 400.5 Z M 1675.5 396.5 L 1700.5 396.5 L 1700.5 400.5 L 1675.5 400.5 Z M 1469.5 400.5 L 1494.5 400.5 L 1494.5 415.5 L 1469.5 415.5 Z M 1604.5 400.5 L 1630.5 400.5 L 1630.5 415.5 L 1604.5 415.5 Z M 1675.5 400.5 L 1700.5 400.5 L 1700.5 415.5 L 1675.5 415.5 Z M 1398.5 400.5 L 1424.5 400.5 L 1424.5 415.5 L 1398.5 415.5 Z M 777.5 419.5 L 802.5 419.5 L 802.5 424.5 L 777.5 424.5 Z M 221.5 423.5 L 246.5 423.5 L 246.5 427.5 L 221.5 427.5 Z M 291.5 423.5 L 335.5 423.5 L 335.5 427.5 L 291.5 427.5 Z M 380.5 423.5 L 406.5 423.5 L 406.5 427.5 L 380.5 427.5 Z M 503.5 419.5 L 528.5 419.5 L 528.5 430.5 L 503.5 430.5 Z M 433.5 419.5 L 458.5 419.5 L 458.5 430.5 L 433.5 430.5 Z M 573.5 419.5 L 598.5 419.5 L 598.5 430.5 L 573.5 430.5 Z M 643.5 419.5 L 669.5 419.5 L 669.5 430.5 L 643.5 430.5 Z M 847.5 419.5 L 873.5 419.5 L 873.5 433.5 L 847.5 433.5 Z M 1058.5 433.5 L 1083.5 433.5 L 1083.5 436.5 L 1058.5 436.5 Z M 1675.5 415.5 L 1700.5 415.5 L 1700.5 437.5 L 1675.5 437.5 Z M 1469.5 415.5 L 1494.5 415.5 L 1494.5 437.5 L 1469.5 437.5 Z M 1604.5 415.5 L 1630.5 415.5 L 1630.5 437.5 L 1604.5 437.5 Z M 1398.5 415.5 L 1424.5 415.5 L 1424.5 437.5 L 1398.5 437.5 Z M 917.5 433.5 L 943.5 433.5 L 943.5 439.5 L 917.5 439.5 Z M 777.5 424.5 L 802.5 424.5 L 802.5 439.5 L 777.5 439.5 Z M 380.5 427.5 L 406.5 427.5 L 406.5 442.5 L 380.5 442.5 Z M 291.5 427.5 L 335.5 427.5 L 335.5 442.5 L 291.5 442.5 Z M 221.5 427.5 L 246.5 427.5 L 246.5 442.5 L 221.5 442.5 Z M 643.5 430.5 L 669.5 430.5 L 669.5 446.5 L 643.5 446.5 Z M 503.5 430.5 L 528.5 430.5 L 528.5 446.5 L 503.5 446.5 Z M 433.5 430.5 L 458.5 430.5 L 458.5 446.5 L 433.5 446.5 Z M 573.5 430.5 L 598.5 430.5 L 598.5 446.5 L 573.5 446.5 Z M 847.5 433.5 L 873.5 433.5 L 873.5 448.5 L 847.5 448.5 Z M 1058.5 436.5 L 1083.5 436.5 L 1083.5 452.5 L 1058.5 452.5 Z M 1398.5 437.5 L 1424.5 437.5 L 1424.5 452.5 L 1398.5 452.5 Z M 1675.5 437.5 L 1700.5 437.5 L 1700.5 452.5 L 1675.5 452.5 Z M 1604.5 437.5 L 1630.5 437.5 L 1630.5 452.5 L 1604.5 452.5 Z M 1469.5 437.5 L 1494.5 437.5 L 1494.5 452.5 L 1469.5 452.5 Z M 917.5 439.5 L 943.5 439.5 L 943.5 454.5 L 917.5 454.5 Z M 847.5 448.5 L 873.5 448.5 L 873.5 457.5 L 847.5 457.5 Z M 643.5 446.5 L 669.5 446.5 L 669.5 457.5 L 643.5 457.5 Z M 714.5 419.5 L 732.5 419.5 L 732.5 457.5 L 714.5 457.5 Z M 573.5 446.5 L 598.5 446.5 L 598.5 457.5 L 573.5 457.5 Z M 433.5 446.5 L 458.5 446.5 L 458.5 457.5 L 433.5 457.5 Z M 777.5 439.5 L 802.5 439.5 L 802.5 457.5 L 777.5 457.5 Z M 503.5 446.5 L 528.5 446.5 L 528.5 457.5 L 503.5 457.5 Z M 1604.5 452.5 L 1630.5 452.5 L 1630.5 464.5 L 1604.5 464.5 Z M 1524.5 464.5 L 1549.5 464.5 L 1549.5 467.5 L 1524.5 467.5 Z M 1058.5 452.5 L 1083.5 452.5 L 1083.5 470.5 L 1058.5 470.5 Z M 291.5 442.5 L 335.5 442.5 L 335.5 472.5 L 291.5 472.5 Z M 221.5 442.5 L 246.5 442.5 L 246.5 472.5 L 221.5 472.5 Z M 380.5 442.5 L 406.5 442.5 L 406.5 472.5 L 380.5 472.5 Z M 1675.5 452.5 L 1700.5 452.5 L 1700.5 475.5 L 1675.5 475.5 Z M 1469.5 452.5 L 1494.5 452.5 L 1494.5 475.5 L 1469.5 475.5 Z M 1594.5 464.5 L 1630.5 464.5 L 1630.5 475.5 L 1594.5 475.5 Z M 1398.5 452.5 L 1424.5 452.5 L 1424.5 475.5 L 1398.5 475.5 Z M 1524.5 467.5 L 1549.5 467.5 L 1549.5 483.5 L 1524.5 483.5 Z M 1398.5 475.5 L 1424.5 475.5 L 1424.5 485.5 L 1398.5 485.5 Z M 1058.5 470.5 L 1083.5 470.5 L 1083.5 485.5 L 1058.5 485.5 Z M 380.5 472.5 L 406.5 472.5 L 406.5 487.5 L 380.5 487.5 Z M 291.5 472.5 L 335.5 472.5 L 335.5 487.5 L 291.5 487.5 Z M 221.5 472.5 L 246.5 472.5 L 246.5 487.5 L 221.5 487.5 Z M 1594.5 475.5 L 1630.5 475.5 L 1630.5 490.5 L 1594.5 490.5 Z M 1469.5 475.5 L 1494.5 475.5 L 1494.5 490.5 L 1469.5 490.5 Z M 1675.5 475.5 L 1700.5 475.5 L 1700.5 490.5 L 1675.5 490.5 Z M 1352.5 485.5 L 1424.5 485.5 L 1424.5 490.5 L 1352.5 490.5 Z M 221.5 487.5 L 246.5 487.5 L 246.5 491.5 L 221.5 491.5 Z M 380.5 487.5 L 406.5 487.5 L 406.5 491.5 L 380.5 491.5 Z M 291.5 487.5 L 335.5 487.5 L 335.5 491.5 L 291.5 491.5 Z M 1202.5 485.5 L 1237.5 485.5 L 1237.5 496.5 L 1202.5 496.5 Z M 1281.5 485.5 L 1307.5 485.5 L 1307.5 496.5 L 1281.5 496.5 Z M 988.5 433.5 L 1013.5 433.5 L 1013.5 504.5 L 988.5 504.5 Z M 1058.5 485.5 L 1093.5 485.5 L 1093.5 504.5 L 1058.5 504.5 Z M 1202.5 496.5 L 1237.5 496.5 L 1237.5 511.5 L 1202.5 511.5 Z M 1281.5 496.5 L 1307.5 496.5 L 1307.5 511.5 L 1281.5 511.5 Z M 1524.5 483.5 L 1549.5 483.5 L 1549.5 512.5 L 1524.5 512.5 Z M 1675.5 490.5 L 1700.5 490.5 L 1700.5 512.5 L 1675.5 512.5 Z M 1352.5 490.5 L 1424.5 490.5 L 1424.5 512.5 L 1352.5 512.5 Z M 1594.5 490.5 L 1630.5 490.5 L 1630.5 512.5 L 1594.5 512.5 Z M 1469.5 490.5 L 1494.5 490.5 L 1494.5 512.5 L 1469.5 512.5 Z M 988.5 504.5 L 1013.5 504.5 L 1013.5 519.5 L 988.5 519.5 Z M 1058.5 504.5 L 1093.5 504.5 L 1093.5 519.5 L 1058.5 519.5 Z M 1058.5 519.5 L 1093.5 519.5 L 1093.5 523.5 L 1058.5 523.5 Z M 988.5 519.5 L 1013.5 519.5 L 1013.5 523.5 L 988.5 523.5 Z M 1202.5 511.5 L 1237.5 511.5 L 1237.5 523.5 L 1202.5 523.5 Z M 1281.5 511.5 L 1307.5 511.5 L 1307.5 523.5 L 1281.5 523.5 Z M 1352.5 512.5 L 1424.5 512.5 L 1424.5 523.5 L 1352.5 523.5 Z M 917.5 454.5 L 943.5 454.5 L 943.5 523.5 L 917.5 523.5 Z M 1138.5 485.5 L 1157.5 485.5 L 1157.5 523.5 L 1138.5 523.5 Z M 1398.5 523.5 L 1424.5 523.5 L 1424.5 528.5 L 1398.5 528.5 Z M 1675.5 512.5 L 1700.5 512.5 L 1700.5 528.5 L 1675.5 528.5 Z M 1469.5 512.5 L 1494.5 512.5 L 1494.5 528.5 L 1469.5 528.5 Z M 1524.5 512.5 L 1549.5 512.5 L 1549.5 528.5 L 1524.5 528.5 Z M 1594.5 512.5 L 1630.5 512.5 L 1630.5 528.5 L 1594.5 528.5 Z M 1594.5 528.5 L 1630.5 528.5 L 1630.5 531.5 L 1594.5 531.5 Z M 1398.5 528.5 L 1424.5 528.5 L 1424.5 531.5 L 1398.5 531.5 Z M 1524.5 528.5 L 1549.5 528.5 L 1549.5 531.5 L 1524.5 531.5 Z M 1675.5 528.5 L 1700.5 528.5 L 1700.5 531.5 L 1675.5 531.5 Z M 1469.5 528.5 L 1494.5 528.5 L 1494.5 531.5 L 1469.5 531.5 Z M 204.5 723.5 L 1714.5 723.5 L 1714.5 738.5 L 204.5 738.5 Z M 204.5 723.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 486.5 615.5 L 531.5 615.5 L 531.5 652.5 L 486.5 652.5 Z M 550.5 615.5 L 595.5 615.5 L 595.5 652.5 L 550.5 652.5 Z M 834.5 615.5 L 879.5 615.5 L 879.5 652.5 L 834.5 652.5 Z M 620.5 615.5 L 665.5 615.5 L 665.5 652.5 L 620.5 652.5 Z M 1551.5 615.5 L 1596.5 615.5 L 1596.5 652.5 L 1551.5 652.5 Z M 705.5 615.5 L 750.5 615.5 L 750.5 652.5 L 705.5 652.5 Z M 769.5 615.5 L 814.5 615.5 L 814.5 652.5 L 769.5 652.5 Z M 1428.5 599.5 L 1473.5 599.5 L 1473.5 667.5 L 1428.5 667.5 Z M 1013.5 615.5 L 1058.5 615.5 L 1058.5 682.5 L 1013.5 682.5 Z M 1632.5 615.5 L 1676.5 615.5 L 1676.5 682.5 L 1632.5 682.5 Z M 943.5 615.5 L 988.5 615.5 L 988.5 682.5 L 943.5 682.5 Z M 1243.5 644.5 L 1288.5 644.5 L 1288.5 682.5 L 1243.5 682.5 Z M 1109.5 644.5 L 1154.5 644.5 L 1154.5 682.5 L 1109.5 682.5 Z M 316.5 644.5 L 361.5 644.5 L 361.5 682.5 L 316.5 682.5 Z M 246.5 644.5 L 291.5 644.5 L 291.5 682.5 L 246.5 682.5 Z M 1173.5 644.5 L 1218.5 644.5 L 1218.5 682.5 L 1173.5 682.5 Z M 1307.5 644.5 L 1352.5 644.5 L 1352.5 682.5 L 1307.5 682.5 Z M 1307.5 644.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 458.5 419.5 L 503.5 419.5 L 503.5 457.5 L 458.5 457.5 Z M 732.5 419.5 L 777.5 419.5 L 777.5 457.5 L 732.5 457.5 Z M 802.5 419.5 L 847.5 419.5 L 847.5 457.5 L 802.5 457.5 Z M 598.5 419.5 L 643.5 419.5 L 643.5 457.5 L 598.5 457.5 Z M 669.5 419.5 L 714.5 419.5 L 714.5 457.5 L 669.5 457.5 Z M 528.5 419.5 L 573.5 419.5 L 573.5 457.5 L 528.5 457.5 Z M 246.5 423.5 L 291.5 423.5 L 291.5 491.5 L 246.5 491.5 Z M 335.5 423.5 L 380.5 423.5 L 380.5 491.5 L 335.5 491.5 Z M 1093.5 485.5 L 1138.5 485.5 L 1138.5 523.5 L 1093.5 523.5 Z M 1237.5 485.5 L 1281.5 485.5 L 1281.5 523.5 L 1237.5 523.5 Z M 1013.5 433.5 L 1058.5 433.5 L 1058.5 523.5 L 1013.5 523.5 Z M 1307.5 485.5 L 1352.5 485.5 L 1352.5 523.5 L 1307.5 523.5 Z M 1157.5 485.5 L 1202.5 485.5 L 1202.5 523.5 L 1157.5 523.5 Z M 943.5 433.5 L 988.5 433.5 L 988.5 523.5 L 943.5 523.5 Z M 1630.5 396.5 L 1675.5 396.5 L 1675.5 531.5 L 1630.5 531.5 Z M 1549.5 464.5 L 1594.5 464.5 L 1594.5 531.5 L 1549.5 531.5 Z M 1424.5 396.5 L 1469.5 396.5 L 1469.5 531.5 L 1424.5 531.5 Z M 1424.5 396.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 218.5 357.5 L 233.5 357.5 L 233.5 372.5 L 218.5 372.5 Z M 1685.5 357.5 L 1700.5 357.5 L 1700.5 372.5 L 1685.5 372.5 Z M 1641.5 357.5 L 1657.5 357.5 L 1657.5 372.5 L 1641.5 372.5 Z M 1598.5 357.5 L 1614.5 357.5 L 1614.5 372.5 L 1598.5 372.5 Z M 1555.5 357.5 L 1570.5 357.5 L 1570.5 372.5 L 1555.5 372.5 Z M 1512.5 357.5 L 1527.5 357.5 L 1527.5 372.5 L 1512.5 372.5 Z M 1469.5 357.5 L 1484.5 357.5 L 1484.5 372.5 L 1469.5 372.5 Z M 1426.5 357.5 L 1441.5 357.5 L 1441.5 372.5 L 1426.5 372.5 Z M 1383.5 357.5 L 1398.5 357.5 L 1398.5 372.5 L 1383.5 372.5 Z M 1339.5 357.5 L 1355.5 357.5 L 1355.5 372.5 L 1339.5 372.5 Z M 1296.5 357.5 L 1312.5 357.5 L 1312.5 372.5 L 1296.5 372.5 Z M 1253.5 357.5 L 1268.5 357.5 L 1268.5 372.5 L 1253.5 372.5 Z M 1210.5 357.5 L 1225.5 357.5 L 1225.5 372.5 L 1210.5 372.5 Z M 1167.5 357.5 L 1182.5 357.5 L 1182.5 372.5 L 1167.5 372.5 Z M 1124.5 357.5 L 1139.5 357.5 L 1139.5 372.5 L 1124.5 372.5 Z M 1081.5 357.5 L 1096.5 357.5 L 1096.5 372.5 L 1081.5 372.5 Z M 1037.5 357.5 L 1053.5 357.5 L 1053.5 372.5 L 1037.5 372.5 Z M 994.5 357.5 L 1010.5 357.5 L 1010.5 372.5 L 994.5 372.5 Z M 951.5 357.5 L 967.5 357.5 L 967.5 372.5 L 951.5 372.5 Z M 908.5 357.5 L 923.5 357.5 L 923.5 372.5 L 908.5 372.5 Z M 865.5 357.5 L 880.5 357.5 L 880.5 372.5 L 865.5 372.5 Z M 822.5 357.5 L 837.5 357.5 L 837.5 372.5 L 822.5 372.5 Z M 779.5 357.5 L 794.5 357.5 L 794.5 372.5 L 779.5 372.5 Z M 736.5 357.5 L 751.5 357.5 L 751.5 372.5 L 736.5 372.5 Z M 692.5 357.5 L 708.5 357.5 L 708.5 372.5 L 692.5 372.5 Z M 649.5 357.5 L 665.5 357.5 L 665.5 372.5 L 649.5 372.5 Z M 606.5 357.5 L 621.5 357.5 L 621.5 372.5 L 606.5 372.5 Z M 563.5 357.5 L 578.5 357.5 L 578.5 372.5 L 563.5 372.5 Z M 520.5 357.5 L 535.5 357.5 L 535.5 372.5 L 520.5 372.5 Z M 477.5 357.5 L 492.5 357.5 L 492.5 372.5 L 477.5 372.5 Z M 434.5 357.5 L 449.5 357.5 L 449.5 372.5 L 434.5 372.5 Z M 390.5 357.5 L 406.5 357.5 L 406.5 372.5 L 390.5 372.5 Z M 347.5 357.5 L 363.5 357.5 L 363.5 372.5 L 347.5 372.5 Z M 304.5 357.5 L 319.5 357.5 L 319.5 372.5 L 304.5 372.5 Z M 261.5 357.5 L 276.5 357.5 L 276.5 372.5 L 261.5 372.5 Z M 257.5 400.5 L 273.5 400.5 L 273.5 415.5 L 257.5 415.5 Z M 1410.5 400.5 L 1425.5 400.5 L 1425.5 415.5 L 1410.5 415.5 Z M 1223.5 400.5 L 1238.5 400.5 L 1238.5 415.5 L 1223.5 415.5 Z M 1378.5 400.5 L 1393.5 400.5 L 1393.5 415.5 L 1378.5 415.5 Z M 1158.5 400.5 L 1174.5 400.5 L 1174.5 415.5 L 1158.5 415.5 Z M 983.5 400.5 L 998.5 400.5 L 998.5 415.5 L 983.5 415.5 Z M 950.5 400.5 L 966.5 400.5 L 966.5 415.5 L 950.5 415.5 Z M 918.5 400.5 L 933.5 400.5 L 933.5 415.5 L 918.5 415.5 Z M 787.5 400.5 L 802.5 400.5 L 802.5 415.5 L 787.5 415.5 Z M 755.5 400.5 L 770.5 400.5 L 770.5 415.5 L 755.5 415.5 Z M 722.5 400.5 L 738.5 400.5 L 738.5 415.5 L 722.5 415.5 Z M 1635.5 400.5 L 1650.5 400.5 L 1650.5 415.5 L 1635.5 415.5 Z M 1603.5 400.5 L 1618.5 400.5 L 1618.5 415.5 L 1603.5 415.5 Z M 1570.5 400.5 L 1586.5 400.5 L 1586.5 415.5 L 1570.5 415.5 Z M 1191.5 400.5 L 1206.5 400.5 L 1206.5 415.5 L 1191.5 415.5 Z M 1442.5 400.5 L 1458.5 400.5 L 1458.5 415.5 L 1442.5 415.5 Z M 508.5 400.5 L 523.5 400.5 L 523.5 415.5 L 508.5 415.5 Z M 322.5 400.5 L 337.5 400.5 L 337.5 415.5 L 322.5 415.5 Z M 290.5 400.5 L 305.5 400.5 L 305.5 415.5 L 290.5 415.5 Z M 649.5 573.5 L 665.5 573.5 L 665.5 588.5 L 649.5 588.5 Z M 1081.5 573.5 L 1096.5 573.5 L 1096.5 588.5 L 1081.5 588.5 Z M 390.5 573.5 L 406.5 573.5 L 406.5 588.5 L 390.5 588.5 Z M 920.5 679.5 L 935.5 679.5 L 935.5 695.5 L 920.5 695.5 Z M 1637.5 679.5 L 1652.5 679.5 L 1652.5 695.5 L 1637.5 695.5 Z M 1605.5 679.5 L 1620.5 679.5 L 1620.5 695.5 L 1605.5 695.5 Z M 1572.5 679.5 L 1588.5 679.5 L 1588.5 695.5 L 1572.5 695.5 Z M 1430.5 679.5 L 1446.5 679.5 L 1446.5 695.5 L 1430.5 695.5 Z M 1398.5 679.5 L 1413.5 679.5 L 1413.5 695.5 L 1398.5 695.5 Z M 1283.5 679.5 L 1298.5 679.5 L 1298.5 695.5 L 1283.5 695.5 Z M 1250.5 679.5 L 1266.5 679.5 L 1266.5 695.5 L 1250.5 695.5 Z M 1218.5 679.5 L 1233.5 679.5 L 1233.5 695.5 L 1218.5 695.5 Z M 484.5 679.5 L 499.5 679.5 L 499.5 695.5 L 484.5 695.5 Z M 452.5 679.5 L 467.5 679.5 L 467.5 695.5 L 452.5 695.5 Z M 419.5 679.5 L 434.5 679.5 L 434.5 695.5 L 419.5 695.5 Z M 332.5 679.5 L 347.5 679.5 L 347.5 695.5 L 332.5 695.5 Z M 300.5 679.5 L 315.5 679.5 L 315.5 695.5 L 300.5 695.5 Z M 267.5 679.5 L 283.5 679.5 L 283.5 695.5 L 267.5 695.5 Z M 887.5 679.5 L 903.5 679.5 L 903.5 695.5 L 887.5 695.5 Z M 855.5 679.5 L 870.5 679.5 L 870.5 695.5 L 855.5 695.5 Z M 218.5 723.5 L 233.5 723.5 L 233.5 738.5 L 218.5 738.5 Z M 1685.5 723.5 L 1700.5 723.5 L 1700.5 738.5 L 1685.5 738.5 Z M 1641.5 723.5 L 1657.5 723.5 L 1657.5 738.5 L 1641.5 738.5 Z M 1598.5 723.5 L 1614.5 723.5 L 1614.5 738.5 L 1598.5 738.5 Z M 1555.5 723.5 L 1570.5 723.5 L 1570.5 738.5 L 1555.5 738.5 Z M 1512.5 723.5 L 1527.5 723.5 L 1527.5 738.5 L 1512.5 738.5 Z M 1469.5 723.5 L 1484.5 723.5 L 1484.5 738.5 L 1469.5 738.5 Z M 1426.5 723.5 L 1441.5 723.5 L 1441.5 738.5 L 1426.5 738.5 Z M 1383.5 723.5 L 1398.5 723.5 L 1398.5 738.5 L 1383.5 738.5 Z M 1339.5 723.5 L 1355.5 723.5 L 1355.5 738.5 L 1339.5 738.5 Z M 1296.5 723.5 L 1312.5 723.5 L 1312.5 738.5 L 1296.5 738.5 Z M 1253.5 723.5 L 1268.5 723.5 L 1268.5 738.5 L 1253.5 738.5 Z M 1210.5 723.5 L 1225.5 723.5 L 1225.5 738.5 L 1210.5 738.5 Z M 1167.5 723.5 L 1182.5 723.5 L 1182.5 738.5 L 1167.5 738.5 Z M 1124.5 723.5 L 1139.5 723.5 L 1139.5 738.5 L 1124.5 738.5 Z M 1081.5 723.5 L 1096.5 723.5 L 1096.5 738.5 L 1081.5 738.5 Z M 1037.5 723.5 L 1053.5 723.5 L 1053.5 738.5 L 1037.5 738.5 Z M 994.5 723.5 L 1010.5 723.5 L 1010.5 738.5 L 994.5 738.5 Z M 951.5 723.5 L 967.5 723.5 L 967.5 738.5 L 951.5 738.5 Z M 908.5 723.5 L 923.5 723.5 L 923.5 738.5 L 908.5 738.5 Z M 865.5 723.5 L 880.5 723.5 L 880.5 738.5 L 865.5 738.5 Z M 822.5 723.5 L 837.5 723.5 L 837.5 738.5 L 822.5 738.5 Z M 779.5 723.5 L 794.5 723.5 L 794.5 738.5 L 779.5 738.5 Z M 736.5 723.5 L 751.5 723.5 L 751.5 738.5 L 736.5 738.5 Z M 692.5 723.5 L 708.5 723.5 L 708.5 738.5 L 692.5 738.5 Z M 649.5 723.5 L 665.5 723.5 L 665.5 738.5 L 649.5 738.5 Z M 606.5 723.5 L 621.5 723.5 L 621.5 738.5 L 606.5 738.5 Z M 563.5 723.5 L 578.5 723.5 L 578.5 738.5 L 563.5 738.5 Z M 520.5 723.5 L 535.5 723.5 L 535.5 738.5 L 520.5 738.5 Z M 477.5 723.5 L 492.5 723.5 L 492.5 738.5 L 477.5 738.5 Z M 434.5 723.5 L 449.5 723.5 L 449.5 738.5 L 434.5 738.5 Z M 390.5 723.5 L 406.5 723.5 L 406.5 738.5 L 390.5 738.5 Z M 347.5 723.5 L 363.5 723.5 L 363.5 738.5 L 347.5 738.5 Z M 304.5 723.5 L 319.5 723.5 L 319.5 738.5 L 304.5 738.5 Z M 261.5 723.5 L 276.5 723.5 L 276.5 738.5 L 261.5 738.5 Z M 261.5 723.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface374">
+<g id="surface403">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -227,6 +227,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 546.601562 551.265625 L 546.550781 552.121094 L 546.414062 552.894531 L 546.175781 553.613281 L 545.855469 554.25 L 545.429688 554.863281 L 544.921875 555.398438 L 544.363281 555.851562 L 543.777344 556.195312 L 543.113281 556.464844 L 542.417969 556.675781 L 541.671875 556.785156 L 540.875 556.808594 L 532.105469 556.808594 L 532.105469 537.382812 L 539.992188 537.382812 L 541.140625 537.464844 L 542.152344 537.648438 L 543.058594 537.96875 L 543.832031 538.421875 L 544.496094 539.007812 L 545.03125 539.730469 L 545.242188 540.128906 L 545.429688 540.554688 L 545.5625 540.953125 L 545.667969 541.40625 L 545.722656 541.859375 L 545.75 542.3125 L 545.667969 543.273438 L 545.429688 544.097656 L 545.058594 544.871094 L 544.523438 545.511719 L 543.859375 546.097656 L 543.058594 546.550781 L 543.832031 546.898438 L 544.496094 547.269531 L 545.082031 547.695312 L 545.5625 548.175781 L 545.9375 548.683594 L 546.230469 549.214844 L 546.335938 549.535156 L 546.414062 549.855469 L 546.496094 550.175781 L 546.550781 550.546875 L 546.574219 550.894531 Z M 543.269531 542.660156 L 543.191406 541.859375 L 542.953125 541.195312 L 542.578125 540.609375 L 542.046875 540.179688 L 541.378906 539.863281 L 540.554688 539.648438 L 540.367188 539.648438 L 539.992188 539.59375 L 539.566406 539.59375 L 539.378906 539.570312 L 534.585938 539.570312 L 534.585938 545.75 L 539.378906 545.75 L 540.367188 545.699219 L 541.21875 545.539062 L 541.9375 545.246094 L 542.472656 544.84375 L 542.898438 544.3125 L 543.164062 543.671875 L 543.191406 543.539062 L 543.246094 543.21875 L 543.246094 542.847656 Z M 540.632812 554.625 L 541.378906 554.597656 L 542.046875 554.4375 L 542.632812 554.171875 L 543.113281 553.824219 L 543.511719 553.371094 L 543.832031 552.8125 L 543.910156 552.597656 L 543.964844 552.359375 L 544.042969 552.09375 L 544.070312 551.851562 L 544.097656 551.585938 L 544.125 551.292969 L 544.070312 550.707031 L 543.964844 550.148438 L 543.777344 549.667969 L 543.511719 549.214844 L 543.164062 548.84375 L 542.765625 548.496094 L 542.472656 548.335938 L 542.152344 548.203125 L 541.804688 548.097656 L 541.433594 548.015625 L 541.03125 547.960938 L 540.632812 547.9375 L 534.585938 547.9375 L 534.585938 554.625 Z M 540.632812 554.625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 477 539 L 492 539 M 477 524 L 492 524 M 477 524 L 477 539 M 492 524 L 492 539 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 477 539 L 492 539 M 477 524 L 492 524 M 492 539 L 492 524 M 477 539 L 477 524 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 344 L 204 353 M 199 349 L 208 349 M 203 350 L 205 350 M 203 348 L 205 348 M 203 348 L 203 350 M 205 348 L 205 350 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.svg b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.svg
index 3ced4d9..c0dfaec 100644
--- a/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.svg
+++ b/cells/dfrtp/sky130_fd_sc_hvl__dfrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 309.5 L 1743.5 309.5 L 1743.5 563.5 L 174.5 563.5 Z M 174.5 309.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 206.5 341.5 L 1711.5 341.5 L 1711.5 358.5 L 206.5 358.5 Z M 206.5 341.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 206.5 341.5 L 1711.5 341.5 L 1711.5 358.5 L 206.5 358.5 Z M 1504.5 605.5 L 1696.5 605.5 L 1696.5 618.5 L 1504.5 618.5 Z M 1504.5 618.5 L 1696.5 618.5 L 1696.5 634.5 L 1504.5 634.5 Z M 441.5 622.5 L 1160.5 622.5 L 1160.5 634.5 L 441.5 634.5 Z M 1504.5 634.5 L 1696.5 634.5 L 1696.5 647.5 L 1504.5 647.5 Z M 441.5 634.5 L 1160.5 634.5 L 1160.5 651.5 L 441.5 651.5 Z M 441.5 651.5 L 1160.5 651.5 L 1160.5 654.5 L 441.5 654.5 Z M 1591.5 647.5 L 1696.5 647.5 L 1696.5 658.5 L 1591.5 658.5 Z M 441.5 654.5 L 1473.5 654.5 L 1473.5 663.5 L 441.5 663.5 Z M 970.5 663.5 L 1473.5 663.5 L 1473.5 665.5 L 970.5 665.5 Z M 221.5 654.5 L 402.5 654.5 L 402.5 667.5 L 221.5 667.5 Z M 1591.5 658.5 L 1696.5 658.5 L 1696.5 675.5 L 1591.5 675.5 Z M 1591.5 675.5 L 1696.5 675.5 L 1696.5 679.5 L 1591.5 679.5 Z M 970.5 665.5 L 1473.5 665.5 L 1473.5 682.5 L 970.5 682.5 Z M 221.5 667.5 L 402.5 667.5 L 402.5 683.5 L 221.5 683.5 Z M 221.5 683.5 L 402.5 683.5 L 402.5 696.5 L 221.5 696.5 Z M 970.5 682.5 L 1473.5 682.5 L 1473.5 696.5 L 970.5 696.5 Z M 970.5 682.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 206.5 740.5 L 1711.5 740.5 L 1711.5 756.5 L 206.5 756.5 Z M 206.5 740.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1125.5 384.5 L 1153.5 384.5 L 1153.5 388.5 L 1125.5 388.5 Z M 971.5 384.5 L 999.5 384.5 L 999.5 390.5 L 971.5 390.5 Z M 1670.5 384.5 L 1696.5 384.5 L 1696.5 390.5 L 1670.5 390.5 Z M 1595.5 384.5 L 1621.5 384.5 L 1621.5 390.5 L 1595.5 390.5 Z M 505.5 397.5 L 532.5 397.5 L 532.5 401.5 L 505.5 401.5 Z M 1125.5 388.5 L 1153.5 388.5 L 1153.5 405.5 L 1125.5 405.5 Z M 971.5 390.5 L 999.5 390.5 L 999.5 407.5 L 971.5 407.5 Z M 1670.5 390.5 L 1696.5 390.5 L 1696.5 407.5 L 1670.5 407.5 Z M 1595.5 390.5 L 1621.5 390.5 L 1621.5 407.5 L 1595.5 407.5 Z M 803.5 397.5 L 839.5 397.5 L 839.5 409.5 L 803.5 409.5 Z M 888.5 397.5 L 916.5 397.5 L 916.5 414.5 L 888.5 414.5 Z M 657.5 397.5 L 685.5 397.5 L 685.5 414.5 L 657.5 414.5 Z M 296.5 412.5 L 323.5 412.5 L 323.5 415.5 L 296.5 415.5 Z M 221.5 412.5 L 247.5 412.5 L 247.5 417.5 L 221.5 417.5 Z M 372.5 412.5 L 398.5 412.5 L 398.5 417.5 L 372.5 417.5 Z M 581.5 397.5 L 608.5 397.5 L 608.5 418.5 L 581.5 418.5 Z M 428.5 397.5 L 456.5 397.5 L 456.5 418.5 L 428.5 418.5 Z M 505.5 401.5 L 532.5 401.5 L 532.5 418.5 L 505.5 418.5 Z M 803.5 409.5 L 839.5 409.5 L 839.5 425.5 L 803.5 425.5 Z M 1125.5 405.5 L 1153.5 405.5 L 1153.5 425.5 L 1125.5 425.5 Z M 1595.5 407.5 L 1621.5 407.5 L 1621.5 429.5 L 1595.5 429.5 Z M 1670.5 407.5 L 1696.5 407.5 L 1696.5 429.5 L 1670.5 429.5 Z M 888.5 414.5 L 916.5 414.5 L 916.5 431.5 L 888.5 431.5 Z M 657.5 414.5 L 685.5 414.5 L 685.5 431.5 L 657.5 431.5 Z M 296.5 415.5 L 323.5 415.5 L 323.5 432.5 L 296.5 432.5 Z M 372.5 417.5 L 398.5 417.5 L 398.5 434.5 L 372.5 434.5 Z M 221.5 417.5 L 247.5 417.5 L 247.5 434.5 L 221.5 434.5 Z M 428.5 418.5 L 456.5 418.5 L 456.5 435.5 L 428.5 435.5 Z M 581.5 418.5 L 608.5 418.5 L 608.5 435.5 L 581.5 435.5 Z M 581.5 435.5 L 608.5 435.5 L 608.5 438.5 L 581.5 438.5 Z M 803.5 425.5 L 839.5 425.5 L 839.5 438.5 L 803.5 438.5 Z M 734.5 397.5 L 754.5 397.5 L 754.5 438.5 L 734.5 438.5 Z M 505.5 418.5 L 532.5 418.5 L 532.5 438.5 L 505.5 438.5 Z M 657.5 431.5 L 685.5 431.5 L 685.5 438.5 L 657.5 438.5 Z M 888.5 431.5 L 916.5 431.5 L 916.5 438.5 L 888.5 438.5 Z M 428.5 435.5 L 456.5 435.5 L 456.5 438.5 L 428.5 438.5 Z M 1125.5 425.5 L 1153.5 425.5 L 1153.5 441.5 L 1125.5 441.5 Z M 1595.5 429.5 L 1621.5 429.5 L 1621.5 446.5 L 1595.5 446.5 Z M 1670.5 429.5 L 1696.5 429.5 L 1696.5 446.5 L 1670.5 446.5 Z M 1445.5 441.5 L 1473.5 441.5 L 1473.5 447.5 L 1445.5 447.5 Z M 1282.5 441.5 L 1320.5 441.5 L 1320.5 453.5 L 1282.5 453.5 Z M 1369.5 441.5 L 1396.5 441.5 L 1396.5 453.5 L 1369.5 453.5 Z M 1595.5 446.5 L 1621.5 446.5 L 1621.5 458.5 L 1595.5 458.5 Z M 1125.5 441.5 L 1163.5 441.5 L 1163.5 461.5 L 1125.5 461.5 Z M 1508.5 458.5 L 1536.5 458.5 L 1536.5 461.5 L 1508.5 461.5 Z M 1048.5 384.5 L 1076.5 384.5 L 1076.5 461.5 L 1048.5 461.5 Z M 221.5 434.5 L 247.5 434.5 L 247.5 462.5 L 221.5 462.5 Z M 372.5 434.5 L 398.5 434.5 L 398.5 462.5 L 372.5 462.5 Z M 1445.5 447.5 L 1473.5 447.5 L 1473.5 463.5 L 1445.5 463.5 Z M 296.5 432.5 L 323.5 432.5 L 323.5 464.5 L 296.5 464.5 Z M 1670.5 446.5 L 1696.5 446.5 L 1696.5 469.5 L 1670.5 469.5 Z M 1585.5 458.5 L 1621.5 458.5 L 1621.5 469.5 L 1585.5 469.5 Z M 1369.5 453.5 L 1396.5 453.5 L 1396.5 470.5 L 1369.5 470.5 Z M 1282.5 453.5 L 1320.5 453.5 L 1320.5 470.5 L 1282.5 470.5 Z M 1125.5 461.5 L 1163.5 461.5 L 1163.5 478.5 L 1125.5 478.5 Z M 1508.5 461.5 L 1536.5 461.5 L 1536.5 478.5 L 1508.5 478.5 Z M 1048.5 461.5 L 1076.5 461.5 L 1076.5 478.5 L 1048.5 478.5 Z M 221.5 462.5 L 247.5 462.5 L 247.5 479.5 L 221.5 479.5 Z M 372.5 462.5 L 398.5 462.5 L 398.5 479.5 L 372.5 479.5 Z M 296.5 464.5 L 323.5 464.5 L 323.5 481.5 L 296.5 481.5 Z M 1282.5 470.5 L 1320.5 470.5 L 1320.5 482.5 L 1282.5 482.5 Z M 1125.5 478.5 L 1163.5 478.5 L 1163.5 482.5 L 1125.5 482.5 Z M 971.5 407.5 L 999.5 407.5 L 999.5 482.5 L 971.5 482.5 Z M 1445.5 463.5 L 1473.5 463.5 L 1473.5 482.5 L 1445.5 482.5 Z M 1048.5 478.5 L 1076.5 478.5 L 1076.5 482.5 L 1048.5 482.5 Z M 1369.5 470.5 L 1396.5 470.5 L 1396.5 482.5 L 1369.5 482.5 Z M 1212.5 441.5 L 1233.5 441.5 L 1233.5 482.5 L 1212.5 482.5 Z M 296.5 481.5 L 323.5 481.5 L 323.5 485.5 L 296.5 485.5 Z M 221.5 479.5 L 247.5 479.5 L 247.5 485.5 L 221.5 485.5 Z M 372.5 479.5 L 398.5 479.5 L 398.5 485.5 L 372.5 485.5 Z M 1585.5 469.5 L 1621.5 469.5 L 1621.5 486.5 L 1585.5 486.5 Z M 1670.5 469.5 L 1696.5 469.5 L 1696.5 486.5 L 1670.5 486.5 Z M 1585.5 486.5 L 1621.5 486.5 L 1621.5 508.5 L 1585.5 508.5 Z M 1670.5 486.5 L 1696.5 486.5 L 1696.5 508.5 L 1670.5 508.5 Z M 1508.5 478.5 L 1536.5 478.5 L 1536.5 510.5 L 1508.5 510.5 Z M 1585.5 508.5 L 1621.5 508.5 L 1621.5 525.5 L 1585.5 525.5 Z M 1670.5 508.5 L 1696.5 508.5 L 1696.5 525.5 L 1670.5 525.5 Z M 1508.5 510.5 L 1536.5 510.5 L 1536.5 527.5 L 1508.5 527.5 Z M 1670.5 525.5 L 1696.5 525.5 L 1696.5 531.5 L 1670.5 531.5 Z M 1585.5 525.5 L 1621.5 525.5 L 1621.5 531.5 L 1585.5 531.5 Z M 1508.5 527.5 L 1536.5 527.5 L 1536.5 531.5 L 1508.5 531.5 Z M 206.5 740.5 L 1711.5 740.5 L 1711.5 756.5 L 206.5 756.5 Z M 206.5 740.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1532.5 605.5 L 1581.5 605.5 L 1581.5 647.5 L 1532.5 647.5 Z M 615.5 622.5 L 664.5 622.5 L 664.5 663.5 L 615.5 663.5 Z M 833.5 622.5 L 882.5 622.5 L 882.5 663.5 L 833.5 663.5 Z M 469.5 622.5 L 518.5 622.5 L 518.5 663.5 L 469.5 663.5 Z M 539.5 622.5 L 588.5 622.5 L 588.5 663.5 L 539.5 663.5 Z M 692.5 622.5 L 741.5 622.5 L 741.5 663.5 L 692.5 663.5 Z M 761.5 622.5 L 810.5 622.5 L 810.5 663.5 L 761.5 663.5 Z M 1619.5 605.5 L 1668.5 605.5 L 1668.5 679.5 L 1619.5 679.5 Z M 325.5 654.5 L 374.5 654.5 L 374.5 696.5 L 325.5 696.5 Z M 1006.5 622.5 L 1055.5 622.5 L 1055.5 696.5 L 1006.5 696.5 Z M 1250.5 654.5 L 1299.5 654.5 L 1299.5 696.5 L 1250.5 696.5 Z M 1083.5 622.5 L 1132.5 622.5 L 1132.5 696.5 L 1083.5 696.5 Z M 1396.5 654.5 L 1445.5 654.5 L 1445.5 696.5 L 1396.5 696.5 Z M 1327.5 654.5 L 1375.5 654.5 L 1375.5 696.5 L 1327.5 696.5 Z M 1181.5 654.5 L 1230.5 654.5 L 1230.5 696.5 L 1181.5 696.5 Z M 249.5 654.5 L 298.5 654.5 L 298.5 696.5 L 249.5 696.5 Z M 249.5 654.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 456.5 397.5 L 505.5 397.5 L 505.5 438.5 L 456.5 438.5 Z M 608.5 397.5 L 657.5 397.5 L 657.5 438.5 L 608.5 438.5 Z M 839.5 397.5 L 888.5 397.5 L 888.5 438.5 L 839.5 438.5 Z M 532.5 397.5 L 581.5 397.5 L 581.5 438.5 L 532.5 438.5 Z M 685.5 397.5 L 734.5 397.5 L 734.5 438.5 L 685.5 438.5 Z M 754.5 397.5 L 803.5 397.5 L 803.5 438.5 L 754.5 438.5 Z M 1076.5 384.5 L 1125.5 384.5 L 1125.5 482.5 L 1076.5 482.5 Z M 999.5 384.5 L 1048.5 384.5 L 1048.5 482.5 L 999.5 482.5 Z M 1396.5 441.5 L 1445.5 441.5 L 1445.5 482.5 L 1396.5 482.5 Z M 1233.5 441.5 L 1282.5 441.5 L 1282.5 482.5 L 1233.5 482.5 Z M 1320.5 441.5 L 1369.5 441.5 L 1369.5 482.5 L 1320.5 482.5 Z M 1163.5 441.5 L 1212.5 441.5 L 1212.5 482.5 L 1163.5 482.5 Z M 323.5 412.5 L 372.5 412.5 L 372.5 485.5 L 323.5 485.5 Z M 247.5 412.5 L 296.5 412.5 L 296.5 485.5 L 247.5 485.5 Z M 1536.5 458.5 L 1585.5 458.5 L 1585.5 531.5 L 1536.5 531.5 Z M 1621.5 384.5 L 1670.5 384.5 L 1670.5 531.5 L 1621.5 531.5 Z M 1621.5 384.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 222.5 341.5 L 238.5 341.5 L 238.5 358.5 L 222.5 358.5 Z M 1679.5 341.5 L 1696.5 341.5 L 1696.5 358.5 L 1679.5 358.5 Z M 1632.5 341.5 L 1649.5 341.5 L 1649.5 358.5 L 1632.5 358.5 Z M 1585.5 341.5 L 1602.5 341.5 L 1602.5 358.5 L 1585.5 358.5 Z M 1538.5 341.5 L 1555.5 341.5 L 1555.5 358.5 L 1538.5 358.5 Z M 1491.5 341.5 L 1508.5 341.5 L 1508.5 358.5 L 1491.5 358.5 Z M 1444.5 341.5 L 1461.5 341.5 L 1461.5 358.5 L 1444.5 358.5 Z M 1397.5 341.5 L 1414.5 341.5 L 1414.5 358.5 L 1397.5 358.5 Z M 1350.5 341.5 L 1367.5 341.5 L 1367.5 358.5 L 1350.5 358.5 Z M 1303.5 341.5 L 1320.5 341.5 L 1320.5 358.5 L 1303.5 358.5 Z M 1256.5 341.5 L 1273.5 341.5 L 1273.5 358.5 L 1256.5 358.5 Z M 1209.5 341.5 L 1226.5 341.5 L 1226.5 358.5 L 1209.5 358.5 Z M 1162.5 341.5 L 1179.5 341.5 L 1179.5 358.5 L 1162.5 358.5 Z M 1115.5 341.5 L 1132.5 341.5 L 1132.5 358.5 L 1115.5 358.5 Z M 1068.5 341.5 L 1085.5 341.5 L 1085.5 358.5 L 1068.5 358.5 Z M 1021.5 341.5 L 1038.5 341.5 L 1038.5 358.5 L 1021.5 358.5 Z M 974.5 341.5 L 991.5 341.5 L 991.5 358.5 L 974.5 358.5 Z M 927.5 341.5 L 943.5 341.5 L 943.5 358.5 L 927.5 358.5 Z M 880.5 341.5 L 896.5 341.5 L 896.5 358.5 L 880.5 358.5 Z M 833.5 341.5 L 849.5 341.5 L 849.5 358.5 L 833.5 358.5 Z M 786.5 341.5 L 802.5 341.5 L 802.5 358.5 L 786.5 358.5 Z M 739.5 341.5 L 755.5 341.5 L 755.5 358.5 L 739.5 358.5 Z M 692.5 341.5 L 708.5 341.5 L 708.5 358.5 L 692.5 358.5 Z M 645.5 341.5 L 661.5 341.5 L 661.5 358.5 L 645.5 358.5 Z M 598.5 341.5 L 614.5 341.5 L 614.5 358.5 L 598.5 358.5 Z M 551.5 341.5 L 567.5 341.5 L 567.5 358.5 L 551.5 358.5 Z M 504.5 341.5 L 520.5 341.5 L 520.5 358.5 L 504.5 358.5 Z M 457.5 341.5 L 473.5 341.5 L 473.5 358.5 L 457.5 358.5 Z M 410.5 341.5 L 426.5 341.5 L 426.5 358.5 L 410.5 358.5 Z M 363.5 341.5 L 379.5 341.5 L 379.5 358.5 L 363.5 358.5 Z M 316.5 341.5 L 332.5 341.5 L 332.5 358.5 L 316.5 358.5 Z M 269.5 341.5 L 285.5 341.5 L 285.5 358.5 L 269.5 358.5 Z M 1593.5 388.5 L 1610.5 388.5 L 1610.5 390.5 L 1593.5 390.5 Z M 972.5 388.5 L 989.5 388.5 L 989.5 390.5 L 972.5 390.5 Z M 505.5 388.5 L 522.5 388.5 L 522.5 401.5 L 505.5 401.5 Z M 505.5 401.5 L 522.5 401.5 L 522.5 405.5 L 505.5 405.5 Z M 1593.5 390.5 L 1610.5 390.5 L 1610.5 405.5 L 1593.5 405.5 Z M 1008.5 388.5 L 1024.5 388.5 L 1024.5 405.5 L 1008.5 405.5 Z M 1444.5 388.5 L 1460.5 388.5 L 1460.5 405.5 L 1444.5 405.5 Z M 1236.5 388.5 L 1253.5 388.5 L 1253.5 405.5 L 1236.5 405.5 Z M 1408.5 388.5 L 1425.5 388.5 L 1425.5 405.5 L 1408.5 405.5 Z M 814.5 388.5 L 830.5 388.5 L 830.5 405.5 L 814.5 405.5 Z M 778.5 388.5 L 795.5 388.5 L 795.5 405.5 L 778.5 405.5 Z M 743.5 388.5 L 760.5 388.5 L 760.5 405.5 L 743.5 405.5 Z M 1043.5 388.5 L 1060.5 388.5 L 1060.5 405.5 L 1043.5 405.5 Z M 1272.5 388.5 L 1288.5 388.5 L 1288.5 405.5 L 1272.5 405.5 Z M 1479.5 388.5 L 1495.5 388.5 L 1495.5 405.5 L 1479.5 405.5 Z M 1629.5 388.5 L 1645.5 388.5 L 1645.5 405.5 L 1629.5 405.5 Z M 271.5 388.5 L 288.5 388.5 L 288.5 405.5 L 271.5 405.5 Z M 1307.5 388.5 L 1324.5 388.5 L 1324.5 405.5 L 1307.5 405.5 Z M 306.5 388.5 L 323.5 388.5 L 323.5 405.5 L 306.5 405.5 Z M 1558.5 388.5 L 1575.5 388.5 L 1575.5 405.5 L 1558.5 405.5 Z M 972.5 390.5 L 989.5 390.5 L 989.5 405.5 L 972.5 405.5 Z M 1162.5 540.5 L 1179.5 540.5 L 1179.5 557.5 L 1162.5 557.5 Z M 410.5 540.5 L 426.5 540.5 L 426.5 557.5 L 410.5 557.5 Z M 645.5 540.5 L 661.5 540.5 L 661.5 557.5 L 645.5 557.5 Z M 946.5 693.5 L 963.5 693.5 L 963.5 709.5 L 946.5 709.5 Z M 1625.5 693.5 L 1642.5 693.5 L 1642.5 709.5 L 1625.5 709.5 Z M 1590.5 693.5 L 1607.5 693.5 L 1607.5 709.5 L 1590.5 709.5 Z M 1555.5 693.5 L 1571.5 693.5 L 1571.5 709.5 L 1555.5 709.5 Z M 1370.5 693.5 L 1387.5 693.5 L 1387.5 709.5 L 1370.5 709.5 Z M 1335.5 693.5 L 1351.5 693.5 L 1351.5 709.5 L 1335.5 709.5 Z M 1300.5 693.5 L 1316.5 693.5 L 1316.5 709.5 L 1300.5 709.5 Z M 335.5 693.5 L 351.5 693.5 L 351.5 709.5 L 335.5 709.5 Z M 299.5 693.5 L 316.5 693.5 L 316.5 709.5 L 299.5 709.5 Z M 264.5 693.5 L 281.5 693.5 L 281.5 709.5 L 264.5 709.5 Z M 911.5 693.5 L 927.5 693.5 L 927.5 709.5 L 911.5 709.5 Z M 460.5 693.5 L 477.5 693.5 L 477.5 709.5 L 460.5 709.5 Z M 425.5 693.5 L 441.5 693.5 L 441.5 709.5 L 425.5 709.5 Z M 981.5 693.5 L 998.5 693.5 L 998.5 709.5 L 981.5 709.5 Z M 222.5 740.5 L 238.5 740.5 L 238.5 756.5 L 222.5 756.5 Z M 1679.5 740.5 L 1696.5 740.5 L 1696.5 756.5 L 1679.5 756.5 Z M 1632.5 740.5 L 1649.5 740.5 L 1649.5 756.5 L 1632.5 756.5 Z M 1585.5 740.5 L 1602.5 740.5 L 1602.5 756.5 L 1585.5 756.5 Z M 1538.5 740.5 L 1555.5 740.5 L 1555.5 756.5 L 1538.5 756.5 Z M 1491.5 740.5 L 1508.5 740.5 L 1508.5 756.5 L 1491.5 756.5 Z M 1444.5 740.5 L 1461.5 740.5 L 1461.5 756.5 L 1444.5 756.5 Z M 1397.5 740.5 L 1414.5 740.5 L 1414.5 756.5 L 1397.5 756.5 Z M 1350.5 740.5 L 1367.5 740.5 L 1367.5 756.5 L 1350.5 756.5 Z M 1303.5 740.5 L 1320.5 740.5 L 1320.5 756.5 L 1303.5 756.5 Z M 1256.5 740.5 L 1273.5 740.5 L 1273.5 756.5 L 1256.5 756.5 Z M 1209.5 740.5 L 1226.5 740.5 L 1226.5 756.5 L 1209.5 756.5 Z M 1162.5 740.5 L 1179.5 740.5 L 1179.5 756.5 L 1162.5 756.5 Z M 1115.5 740.5 L 1132.5 740.5 L 1132.5 756.5 L 1115.5 756.5 Z M 1068.5 740.5 L 1085.5 740.5 L 1085.5 756.5 L 1068.5 756.5 Z M 1021.5 740.5 L 1038.5 740.5 L 1038.5 756.5 L 1021.5 756.5 Z M 974.5 740.5 L 991.5 740.5 L 991.5 756.5 L 974.5 756.5 Z M 927.5 740.5 L 943.5 740.5 L 943.5 756.5 L 927.5 756.5 Z M 880.5 740.5 L 896.5 740.5 L 896.5 756.5 L 880.5 756.5 Z M 833.5 740.5 L 849.5 740.5 L 849.5 756.5 L 833.5 756.5 Z M 786.5 740.5 L 802.5 740.5 L 802.5 756.5 L 786.5 756.5 Z M 739.5 740.5 L 755.5 740.5 L 755.5 756.5 L 739.5 756.5 Z M 692.5 740.5 L 708.5 740.5 L 708.5 756.5 L 692.5 756.5 Z M 645.5 740.5 L 661.5 740.5 L 661.5 756.5 L 645.5 756.5 Z M 598.5 740.5 L 614.5 740.5 L 614.5 756.5 L 598.5 756.5 Z M 551.5 740.5 L 567.5 740.5 L 567.5 756.5 L 551.5 756.5 Z M 504.5 740.5 L 520.5 740.5 L 520.5 756.5 L 504.5 756.5 Z M 457.5 740.5 L 473.5 740.5 L 473.5 756.5 L 457.5 756.5 Z M 410.5 740.5 L 426.5 740.5 L 426.5 756.5 L 410.5 756.5 Z M 363.5 740.5 L 379.5 740.5 L 379.5 756.5 L 363.5 756.5 Z M 316.5 740.5 L 332.5 740.5 L 332.5 756.5 L 316.5 756.5 Z M 269.5 740.5 L 285.5 740.5 L 285.5 756.5 L 269.5 756.5 Z M 269.5 740.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface368">
+<g id="surface396">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -225,6 +225,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1698.0625 450.875 L 1696.742188 452.5 L 1693.796875 450.058594 L 1692.957031 450.507812 L 1692.113281 450.84375 L 1691.246094 451.125 L 1690.320312 451.320312 L 1689.394531 451.433594 L 1688.441406 451.488281 L 1687.148438 451.40625 L 1685.941406 451.210938 L 1684.820312 450.875 L 1683.753906 450.425781 L 1682.746094 449.835938 L 1681.847656 449.078125 L 1681.035156 448.265625 L 1680.332031 447.339844 L 1679.773438 446.328125 L 1679.296875 445.234375 L 1678.929688 444.058594 L 1678.707031 442.765625 L 1678.648438 442.457031 L 1678.621094 442.121094 L 1678.59375 441.8125 L 1678.566406 441.476562 L 1678.566406 440.773438 L 1678.621094 439.371094 L 1678.820312 438.027344 L 1679.125 436.792969 L 1679.574219 435.613281 L 1680.136719 434.519531 L 1680.867188 433.511719 L 1681.59375 432.695312 L 1682.4375 431.96875 L 1683.363281 431.351562 L 1684.34375 430.875 L 1685.410156 430.480469 L 1686.589844 430.199219 L 1686.867188 430.171875 L 1687.484375 430.117188 L 1687.792969 430.085938 L 1688.101562 430.085938 L 1688.441406 430.058594 L 1689.703125 430.144531 L 1690.90625 430.339844 L 1692.03125 430.675781 L 1693.097656 431.125 L 1694.105469 431.714844 L 1695.03125 432.445312 L 1695.816406 433.285156 L 1696.519531 434.183594 L 1697.078125 435.164062 L 1697.554688 436.257812 L 1697.921875 437.4375 L 1698.171875 438.671875 L 1698.203125 439.035156 L 1698.257812 439.707031 L 1698.285156 440.046875 L 1698.285156 440.382812 L 1698.3125 440.71875 L 1698.230469 442.289062 L 1697.976562 443.777344 L 1697.585938 445.152344 L 1697.023438 446.441406 L 1696.292969 447.621094 L 1695.425781 448.714844 Z M 1690.992188 445.09375 L 1693.488281 447.140625 L 1694.160156 446.300781 L 1694.722656 445.347656 L 1695.144531 444.308594 L 1695.453125 443.214844 L 1695.621094 442.039062 L 1695.703125 440.746094 L 1695.648438 439.570312 L 1695.480469 438.445312 L 1695.199219 437.410156 L 1694.835938 436.457031 L 1694.359375 435.558594 L 1693.769531 434.742188 L 1693.097656 434.070312 L 1692.394531 433.511719 L 1691.609375 433.0625 L 1690.769531 432.722656 L 1689.84375 432.5 L 1688.886719 432.359375 L 1688.441406 432.359375 L 1687.429688 432.445312 L 1686.476562 432.613281 L 1685.578125 432.894531 L 1684.765625 433.3125 L 1684.007812 433.847656 L 1683.335938 434.492188 L 1682.6875 435.25 L 1682.183594 436.089844 L 1681.765625 437.015625 L 1681.457031 438.027344 L 1681.257812 439.121094 L 1681.175781 440.296875 L 1681.175781 440.773438 L 1681.203125 442.007812 L 1681.371094 443.132812 L 1681.652344 444.167969 L 1682.015625 445.152344 L 1682.519531 446.046875 L 1683.136719 446.832031 L 1683.785156 447.535156 L 1684.511719 448.097656 L 1685.296875 448.542969 L 1686.140625 448.851562 L 1687.066406 449.078125 L 1688.046875 449.160156 L 1688.101562 449.191406 L 1688.917969 449.191406 L 1689.449219 449.132812 L 1689.984375 449.023438 L 1690.488281 448.910156 L 1690.992188 448.742188 L 1691.523438 448.515625 L 1691.554688 448.515625 L 1691.609375 448.488281 L 1691.636719 448.460938 L 1691.695312 448.460938 L 1691.722656 448.433594 L 1691.777344 448.40625 L 1689.703125 446.664062 Z M 1690.992188 445.09375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1679 647 L 1696 647 M 1679 631 L 1696 631 M 1679 631 L 1679 647 M 1696 631 L 1696 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1679 647 L 1696 647 M 1679 631 L 1696 631 M 1696 647 L 1696 631 M 1679 647 L 1679 631 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 326 L 206 335 M 201 331 L 210 331 M 205 332 L 207 332 M 205 330 L 207 330 M 205 330 L 205 332 M 207 330 L 207 332 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.svg b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.svg
index dbf47c4..862f65b 100644
--- a/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.svg
+++ b/cells/dfsbp/sky130_fd_sc_hvl__dfsbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 338.5 L 1743.5 338.5 L 1743.5 517.5 L 174.5 517.5 Z M 1182.5 517.5 L 1743.5 517.5 L 1743.5 559.5 L 1182.5 559.5 Z M 174.5 517.5 L 713.5 517.5 L 713.5 559.5 L 174.5 559.5 Z M 174.5 517.5 "/>
 </clipPath>
-<image id="image484" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image512" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image484"/>
+  <use xlink:href="#image512"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 202.5 366.5 L 1715.5 366.5 L 1715.5 380.5 L 202.5 380.5 Z M 202.5 366.5 "/>
 </clipPath>
-<image id="image485" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image513" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image485"/>
+  <use xlink:href="#image513"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 202.5 366.5 L 1715.5 366.5 L 1715.5 380.5 L 202.5 380.5 Z M 1026.5 574.5 L 1051.5 574.5 L 1051.5 577.5 L 1026.5 577.5 Z M 1026.5 577.5 L 1051.5 577.5 L 1051.5 591.5 L 1026.5 591.5 Z M 1026.5 591.5 L 1145.5 591.5 L 1145.5 592.5 L 1026.5 592.5 Z M 1026.5 592.5 L 1145.5 592.5 L 1145.5 619.5 L 1026.5 619.5 Z M 1345.5 610.5 L 1510.5 610.5 L 1510.5 621.5 L 1345.5 621.5 Z M 1537.5 610.5 L 1703.5 610.5 L 1703.5 621.5 L 1537.5 621.5 Z M 1345.5 621.5 L 1510.5 621.5 L 1510.5 636.5 L 1345.5 636.5 Z M 1537.5 621.5 L 1703.5 621.5 L 1703.5 636.5 L 1537.5 636.5 Z M 950.5 619.5 L 1145.5 619.5 L 1145.5 637.5 L 950.5 637.5 Z M 837.5 610.5 L 924.5 610.5 L 924.5 638.5 L 837.5 638.5 Z M 1345.5 636.5 L 1510.5 636.5 L 1510.5 646.5 L 1345.5 646.5 Z M 1537.5 636.5 L 1703.5 636.5 L 1703.5 646.5 L 1537.5 646.5 Z M 215.5 636.5 L 369.5 636.5 L 369.5 647.5 L 215.5 647.5 Z M 395.5 638.5 L 676.5 638.5 L 676.5 648.5 L 395.5 648.5 Z M 1171.5 638.5 L 1319.5 638.5 L 1319.5 649.5 L 1171.5 649.5 Z M 702.5 638.5 L 924.5 638.5 L 924.5 649.5 L 702.5 649.5 Z M 950.5 637.5 L 1145.5 637.5 L 1145.5 651.5 L 950.5 651.5 Z M 1613.5 646.5 L 1703.5 646.5 L 1703.5 655.5 L 1613.5 655.5 Z M 950.5 651.5 L 1145.5 651.5 L 1145.5 655.5 L 950.5 655.5 Z M 1421.5 646.5 L 1510.5 646.5 L 1510.5 658.5 L 1421.5 658.5 Z M 215.5 647.5 L 369.5 647.5 L 369.5 661.5 L 215.5 661.5 Z M 395.5 648.5 L 676.5 648.5 L 676.5 663.5 L 395.5 663.5 Z M 1171.5 649.5 L 1319.5 649.5 L 1319.5 664.5 L 1171.5 664.5 Z M 702.5 649.5 L 924.5 649.5 L 924.5 664.5 L 702.5 664.5 Z M 1613.5 655.5 L 1703.5 655.5 L 1703.5 669.5 L 1613.5 669.5 Z M 215.5 661.5 L 369.5 661.5 L 369.5 672.5 L 215.5 672.5 Z M 395.5 663.5 L 676.5 663.5 L 676.5 673.5 L 395.5 673.5 Z M 1613.5 669.5 L 1703.5 669.5 L 1703.5 674.5 L 1613.5 674.5 Z M 702.5 664.5 L 924.5 664.5 L 924.5 674.5 L 702.5 674.5 Z M 1171.5 664.5 L 1319.5 664.5 L 1319.5 674.5 L 1171.5 674.5 Z M 1421.5 658.5 L 1510.5 658.5 L 1510.5 674.5 L 1421.5 674.5 Z M 1421.5 658.5 "/>
 </clipPath>
-<image id="image486" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image514" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image486"/>
+  <use xlink:href="#image514"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 202.5 713.5 L 1715.5 713.5 L 1715.5 727.5 L 202.5 727.5 Z M 202.5 713.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image485"/>
+  <use xlink:href="#image513"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1485.5 403.5 L 1510.5 403.5 L 1510.5 407.5 L 1485.5 407.5 Z M 1001.5 403.5 L 1025.5 403.5 L 1025.5 407.5 L 1001.5 407.5 Z M 1418.5 403.5 L 1443.5 403.5 L 1443.5 407.5 L 1418.5 407.5 Z M 1001.5 407.5 L 1025.5 407.5 L 1025.5 421.5 L 1001.5 421.5 Z M 1485.5 407.5 L 1510.5 407.5 L 1510.5 421.5 L 1485.5 421.5 Z M 1418.5 407.5 L 1443.5 407.5 L 1443.5 421.5 L 1418.5 421.5 Z M 215.5 429.5 L 239.5 429.5 L 239.5 433.5 L 215.5 433.5 Z M 348.5 429.5 L 373.5 429.5 L 373.5 433.5 L 348.5 433.5 Z M 282.5 429.5 L 306.5 429.5 L 306.5 433.5 L 282.5 433.5 Z M 1678.5 431.5 L 1703.5 431.5 L 1703.5 434.5 L 1678.5 434.5 Z M 1611.5 431.5 L 1636.5 431.5 L 1636.5 434.5 L 1611.5 434.5 Z M 1001.5 421.5 L 1025.5 421.5 L 1025.5 439.5 L 1001.5 439.5 Z M 1418.5 421.5 L 1443.5 421.5 L 1443.5 442.5 L 1418.5 442.5 Z M 1485.5 421.5 L 1510.5 421.5 L 1510.5 442.5 L 1485.5 442.5 Z M 348.5 433.5 L 373.5 433.5 L 373.5 447.5 L 348.5 447.5 Z M 282.5 433.5 L 306.5 433.5 L 306.5 447.5 L 282.5 447.5 Z M 215.5 433.5 L 239.5 433.5 L 239.5 447.5 L 215.5 447.5 Z M 1611.5 434.5 L 1636.5 434.5 L 1636.5 449.5 L 1611.5 449.5 Z M 1678.5 434.5 L 1703.5 434.5 L 1703.5 449.5 L 1678.5 449.5 Z M 1611.5 449.5 L 1636.5 449.5 L 1636.5 452.5 L 1611.5 452.5 Z M 1001.5 439.5 L 1025.5 439.5 L 1025.5 453.5 L 1001.5 453.5 Z M 876.5 403.5 L 897.5 403.5 L 897.5 453.5 L 876.5 453.5 Z M 1535.5 452.5 L 1559.5 452.5 L 1559.5 455.5 L 1535.5 455.5 Z M 679.5 453.5 L 732.5 453.5 L 732.5 457.5 L 679.5 457.5 Z M 841.5 453.5 L 897.5 453.5 L 897.5 457.5 L 841.5 457.5 Z M 1485.5 442.5 L 1510.5 442.5 L 1510.5 457.5 L 1485.5 457.5 Z M 1418.5 442.5 L 1443.5 442.5 L 1443.5 457.5 L 1418.5 457.5 Z M 775.5 453.5 L 799.5 453.5 L 799.5 463.5 L 775.5 463.5 Z M 1230.5 453.5 L 1254.5 453.5 L 1254.5 463.5 L 1230.5 463.5 Z M 1163.5 453.5 L 1187.5 453.5 L 1187.5 463.5 L 1163.5 463.5 Z M 552.5 453.5 L 575.5 453.5 L 575.5 463.5 L 552.5 463.5 Z M 485.5 453.5 L 509.5 453.5 L 509.5 463.5 L 485.5 463.5 Z M 411.5 453.5 L 443.5 453.5 L 443.5 463.5 L 411.5 463.5 Z M 1678.5 449.5 L 1703.5 449.5 L 1703.5 466.5 L 1678.5 466.5 Z M 1602.5 452.5 L 1636.5 452.5 L 1636.5 466.5 L 1602.5 466.5 Z M 1535.5 455.5 L 1559.5 455.5 L 1559.5 470.5 L 1535.5 470.5 Z M 1001.5 453.5 L 1034.5 453.5 L 1034.5 471.5 L 1001.5 471.5 Z M 679.5 457.5 L 732.5 457.5 L 732.5 472.5 L 679.5 472.5 Z M 841.5 457.5 L 897.5 457.5 L 897.5 472.5 L 841.5 472.5 Z M 348.5 447.5 L 373.5 447.5 L 373.5 475.5 L 348.5 475.5 Z M 282.5 447.5 L 306.5 447.5 L 306.5 475.5 L 282.5 475.5 Z M 215.5 447.5 L 239.5 447.5 L 239.5 475.5 L 215.5 475.5 Z M 552.5 463.5 L 575.5 463.5 L 575.5 478.5 L 552.5 478.5 Z M 1230.5 463.5 L 1254.5 463.5 L 1254.5 478.5 L 1230.5 478.5 Z M 1163.5 463.5 L 1187.5 463.5 L 1187.5 478.5 L 1163.5 478.5 Z M 1485.5 457.5 L 1510.5 457.5 L 1510.5 478.5 L 1485.5 478.5 Z M 1418.5 457.5 L 1443.5 457.5 L 1443.5 478.5 L 1418.5 478.5 Z M 411.5 463.5 L 443.5 463.5 L 443.5 478.5 L 411.5 478.5 Z M 485.5 463.5 L 509.5 463.5 L 509.5 478.5 L 485.5 478.5 Z M 775.5 463.5 L 799.5 463.5 L 799.5 478.5 L 775.5 478.5 Z M 1678.5 466.5 L 1703.5 466.5 L 1703.5 480.5 L 1678.5 480.5 Z M 1602.5 466.5 L 1636.5 466.5 L 1636.5 480.5 L 1602.5 480.5 Z M 1001.5 471.5 L 1034.5 471.5 L 1034.5 485.5 L 1001.5 485.5 Z M 411.5 478.5 L 443.5 478.5 L 443.5 489.5 L 411.5 489.5 Z M 841.5 472.5 L 897.5 472.5 L 897.5 489.5 L 841.5 489.5 Z M 1001.5 485.5 L 1034.5 485.5 L 1034.5 489.5 L 1001.5 489.5 Z M 552.5 478.5 L 575.5 478.5 L 575.5 489.5 L 552.5 489.5 Z M 1077.5 453.5 L 1121.5 453.5 L 1121.5 489.5 L 1077.5 489.5 Z M 1163.5 478.5 L 1187.5 478.5 L 1187.5 489.5 L 1163.5 489.5 Z M 775.5 478.5 L 799.5 478.5 L 799.5 489.5 L 775.5 489.5 Z M 485.5 478.5 L 509.5 478.5 L 509.5 489.5 L 485.5 489.5 Z M 618.5 453.5 L 636.5 453.5 L 636.5 489.5 L 618.5 489.5 Z M 1230.5 478.5 L 1254.5 478.5 L 1254.5 489.5 L 1230.5 489.5 Z M 940.5 403.5 L 958.5 403.5 L 958.5 489.5 L 940.5 489.5 Z M 679.5 472.5 L 732.5 472.5 L 732.5 489.5 L 679.5 489.5 Z M 215.5 475.5 L 239.5 475.5 L 239.5 490.5 L 215.5 490.5 Z M 348.5 475.5 L 373.5 475.5 L 373.5 490.5 L 348.5 490.5 Z M 282.5 475.5 L 306.5 475.5 L 306.5 490.5 L 282.5 490.5 Z M 1418.5 478.5 L 1443.5 478.5 L 1443.5 492.5 L 1418.5 492.5 Z M 1485.5 478.5 L 1510.5 478.5 L 1510.5 492.5 L 1485.5 492.5 Z M 215.5 490.5 L 239.5 490.5 L 239.5 493.5 L 215.5 493.5 Z M 348.5 490.5 L 373.5 490.5 L 373.5 493.5 L 348.5 493.5 Z M 282.5 490.5 L 306.5 490.5 L 306.5 493.5 L 282.5 493.5 Z M 1418.5 492.5 L 1443.5 492.5 L 1443.5 495.5 L 1418.5 495.5 Z M 1678.5 480.5 L 1703.5 480.5 L 1703.5 498.5 L 1678.5 498.5 Z M 1602.5 480.5 L 1636.5 480.5 L 1636.5 498.5 L 1602.5 498.5 Z M 1535.5 470.5 L 1559.5 470.5 L 1559.5 498.5 L 1535.5 498.5 Z M 1342.5 495.5 L 1366.5 495.5 L 1366.5 506.5 L 1342.5 506.5 Z M 1602.5 498.5 L 1636.5 498.5 L 1636.5 512.5 L 1602.5 512.5 Z M 1535.5 498.5 L 1559.5 498.5 L 1559.5 512.5 L 1535.5 512.5 Z M 1678.5 498.5 L 1703.5 498.5 L 1703.5 512.5 L 1678.5 512.5 Z M 1485.5 492.5 L 1510.5 492.5 L 1510.5 513.5 L 1485.5 513.5 Z M 1409.5 495.5 L 1443.5 495.5 L 1443.5 513.5 L 1409.5 513.5 Z M 1678.5 512.5 L 1703.5 512.5 L 1703.5 516.5 L 1678.5 516.5 Z M 1535.5 512.5 L 1559.5 512.5 L 1559.5 516.5 L 1535.5 516.5 Z M 1602.5 512.5 L 1636.5 512.5 L 1636.5 516.5 L 1602.5 516.5 Z M 1342.5 506.5 L 1366.5 506.5 L 1366.5 520.5 L 1342.5 520.5 Z M 1409.5 513.5 L 1443.5 513.5 L 1443.5 528.5 L 1409.5 528.5 Z M 1485.5 513.5 L 1510.5 513.5 L 1510.5 528.5 L 1485.5 528.5 Z M 1485.5 528.5 L 1510.5 528.5 L 1510.5 531.5 L 1485.5 531.5 Z M 1409.5 528.5 L 1443.5 528.5 L 1443.5 531.5 L 1409.5 531.5 Z M 1342.5 520.5 L 1366.5 520.5 L 1366.5 531.5 L 1342.5 531.5 Z M 202.5 713.5 L 1715.5 713.5 L 1715.5 727.5 L 202.5 727.5 Z M 202.5 713.5 "/>
 </clipPath>
-<image id="image487" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image515" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image487"/>
+  <use xlink:href="#image515"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1369.5 610.5 L 1412.5 610.5 L 1412.5 646.5 L 1369.5 646.5 Z M 1561.5 610.5 L 1604.5 610.5 L 1604.5 646.5 L 1561.5 646.5 Z M 1060.5 591.5 L 1103.5 591.5 L 1103.5 655.5 L 1060.5 655.5 Z M 974.5 619.5 L 1017.5 619.5 L 1017.5 655.5 L 974.5 655.5 Z M 238.5 636.5 L 280.5 636.5 L 280.5 672.5 L 238.5 672.5 Z M 304.5 636.5 L 347.5 636.5 L 347.5 672.5 L 304.5 672.5 Z M 417.5 638.5 L 460.5 638.5 L 460.5 673.5 L 417.5 673.5 Z M 484.5 638.5 L 526.5 638.5 L 526.5 673.5 L 484.5 673.5 Z M 550.5 638.5 L 593.5 638.5 L 593.5 673.5 L 550.5 673.5 Z M 611.5 638.5 L 653.5 638.5 L 653.5 673.5 L 611.5 673.5 Z M 1636.5 610.5 L 1678.5 610.5 L 1678.5 674.5 L 1636.5 674.5 Z M 724.5 638.5 L 767.5 638.5 L 767.5 674.5 L 724.5 674.5 Z M 859.5 610.5 L 902.5 610.5 L 902.5 674.5 L 859.5 674.5 Z M 1444.5 610.5 L 1486.5 610.5 L 1486.5 674.5 L 1444.5 674.5 Z M 1194.5 638.5 L 1236.5 638.5 L 1236.5 674.5 L 1194.5 674.5 Z M 1254.5 638.5 L 1297.5 638.5 L 1297.5 674.5 L 1254.5 674.5 Z M 785.5 638.5 L 827.5 638.5 L 827.5 674.5 L 785.5 674.5 Z M 785.5 638.5 "/>
 </clipPath>
-<image id="image488" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image516" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image488"/>
+  <use xlink:href="#image516"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 897.5 403.5 L 940.5 403.5 L 940.5 489.5 L 897.5 489.5 Z M 799.5 453.5 L 841.5 453.5 L 841.5 489.5 L 799.5 489.5 Z M 732.5 453.5 L 775.5 453.5 L 775.5 489.5 L 732.5 489.5 Z M 575.5 453.5 L 618.5 453.5 L 618.5 489.5 L 575.5 489.5 Z M 1187.5 453.5 L 1230.5 453.5 L 1230.5 489.5 L 1187.5 489.5 Z M 443.5 453.5 L 485.5 453.5 L 485.5 489.5 L 443.5 489.5 Z M 636.5 453.5 L 679.5 453.5 L 679.5 489.5 L 636.5 489.5 Z M 1034.5 453.5 L 1077.5 453.5 L 1077.5 489.5 L 1034.5 489.5 Z M 958.5 403.5 L 1001.5 403.5 L 1001.5 489.5 L 958.5 489.5 Z M 1121.5 453.5 L 1163.5 453.5 L 1163.5 489.5 L 1121.5 489.5 Z M 509.5 453.5 L 552.5 453.5 L 552.5 489.5 L 509.5 489.5 Z M 239.5 429.5 L 282.5 429.5 L 282.5 493.5 L 239.5 493.5 Z M 306.5 429.5 L 348.5 429.5 L 348.5 493.5 L 306.5 493.5 Z M 1636.5 431.5 L 1678.5 431.5 L 1678.5 516.5 L 1636.5 516.5 Z M 1559.5 452.5 L 1602.5 452.5 L 1602.5 516.5 L 1559.5 516.5 Z M 1366.5 495.5 L 1409.5 495.5 L 1409.5 531.5 L 1366.5 531.5 Z M 1443.5 403.5 L 1485.5 403.5 L 1485.5 531.5 L 1443.5 531.5 Z M 1443.5 403.5 "/>
 </clipPath>
-<image id="image489" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image517" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image489"/>
+  <use xlink:href="#image517"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 216.5 366.5 L 230.5 366.5 L 230.5 380.5 L 216.5 380.5 Z M 1688.5 366.5 L 1702.5 366.5 L 1702.5 380.5 L 1688.5 380.5 Z M 1647.5 366.5 L 1661.5 366.5 L 1661.5 380.5 L 1647.5 380.5 Z M 1606.5 366.5 L 1620.5 366.5 L 1620.5 380.5 L 1606.5 380.5 Z M 1565.5 366.5 L 1579.5 366.5 L 1579.5 380.5 L 1565.5 380.5 Z M 1524.5 366.5 L 1539.5 366.5 L 1539.5 380.5 L 1524.5 380.5 Z M 1483.5 366.5 L 1498.5 366.5 L 1498.5 380.5 L 1483.5 380.5 Z M 1442.5 366.5 L 1457.5 366.5 L 1457.5 380.5 L 1442.5 380.5 Z M 1401.5 366.5 L 1416.5 366.5 L 1416.5 380.5 L 1401.5 380.5 Z M 1361.5 366.5 L 1375.5 366.5 L 1375.5 380.5 L 1361.5 380.5 Z M 1320.5 366.5 L 1334.5 366.5 L 1334.5 380.5 L 1320.5 380.5 Z M 1279.5 366.5 L 1293.5 366.5 L 1293.5 380.5 L 1279.5 380.5 Z M 1238.5 366.5 L 1252.5 366.5 L 1252.5 380.5 L 1238.5 380.5 Z M 1197.5 366.5 L 1211.5 366.5 L 1211.5 380.5 L 1197.5 380.5 Z M 1156.5 366.5 L 1171.5 366.5 L 1171.5 380.5 L 1156.5 380.5 Z M 1115.5 366.5 L 1130.5 366.5 L 1130.5 380.5 L 1115.5 380.5 Z M 1074.5 366.5 L 1089.5 366.5 L 1089.5 380.5 L 1074.5 380.5 Z M 1033.5 366.5 L 1048.5 366.5 L 1048.5 380.5 L 1033.5 380.5 Z M 992.5 366.5 L 1007.5 366.5 L 1007.5 380.5 L 992.5 380.5 Z M 952.5 366.5 L 966.5 366.5 L 966.5 380.5 L 952.5 380.5 Z M 911.5 366.5 L 925.5 366.5 L 925.5 380.5 L 911.5 380.5 Z M 870.5 366.5 L 884.5 366.5 L 884.5 380.5 L 870.5 380.5 Z M 829.5 366.5 L 843.5 366.5 L 843.5 380.5 L 829.5 380.5 Z M 788.5 366.5 L 803.5 366.5 L 803.5 380.5 L 788.5 380.5 Z M 747.5 366.5 L 762.5 366.5 L 762.5 380.5 L 747.5 380.5 Z M 706.5 366.5 L 721.5 366.5 L 721.5 380.5 L 706.5 380.5 Z M 665.5 366.5 L 680.5 366.5 L 680.5 380.5 L 665.5 380.5 Z M 624.5 366.5 L 639.5 366.5 L 639.5 380.5 L 624.5 380.5 Z M 584.5 366.5 L 598.5 366.5 L 598.5 380.5 L 584.5 380.5 Z M 543.5 366.5 L 557.5 366.5 L 557.5 380.5 L 543.5 380.5 Z M 502.5 366.5 L 516.5 366.5 L 516.5 380.5 L 502.5 380.5 Z M 461.5 366.5 L 475.5 366.5 L 475.5 380.5 L 461.5 380.5 Z M 420.5 366.5 L 434.5 366.5 L 434.5 380.5 L 420.5 380.5 Z M 379.5 366.5 L 394.5 366.5 L 394.5 380.5 L 379.5 380.5 Z M 338.5 366.5 L 353.5 366.5 L 353.5 380.5 L 338.5 380.5 Z M 297.5 366.5 L 312.5 366.5 L 312.5 380.5 L 297.5 380.5 Z M 256.5 366.5 L 271.5 366.5 L 271.5 380.5 L 256.5 380.5 Z M 260.5 407.5 L 275.5 407.5 L 275.5 421.5 L 260.5 421.5 Z M 1417.5 407.5 L 1432.5 407.5 L 1432.5 421.5 L 1417.5 421.5 Z M 1387.5 407.5 L 1401.5 407.5 L 1401.5 421.5 L 1387.5 421.5 Z M 1179.5 407.5 L 1194.5 407.5 L 1194.5 421.5 L 1179.5 421.5 Z M 1148.5 407.5 L 1163.5 407.5 L 1163.5 421.5 L 1148.5 421.5 Z M 1118.5 407.5 L 1132.5 407.5 L 1132.5 421.5 L 1118.5 421.5 Z M 935.5 407.5 L 950.5 407.5 L 950.5 421.5 L 935.5 421.5 Z M 905.5 407.5 L 919.5 407.5 L 919.5 421.5 L 905.5 421.5 Z M 874.5 407.5 L 889.5 407.5 L 889.5 421.5 L 874.5 421.5 Z M 718.5 407.5 L 733.5 407.5 L 733.5 421.5 L 718.5 421.5 Z M 687.5 407.5 L 702.5 407.5 L 702.5 421.5 L 687.5 421.5 Z M 1448.5 407.5 L 1462.5 407.5 L 1462.5 421.5 L 1448.5 421.5 Z M 1641.5 407.5 L 1655.5 407.5 L 1655.5 421.5 L 1641.5 421.5 Z M 1610.5 407.5 L 1625.5 407.5 L 1625.5 421.5 L 1610.5 421.5 Z M 1579.5 407.5 L 1594.5 407.5 L 1594.5 421.5 L 1579.5 421.5 Z M 414.5 407.5 L 429.5 407.5 L 429.5 421.5 L 414.5 421.5 Z M 291.5 407.5 L 305.5 407.5 L 305.5 421.5 L 291.5 421.5 Z M 394.5 672.5 L 408.5 672.5 L 408.5 686.5 L 394.5 686.5 Z M 1643.5 672.5 L 1657.5 672.5 L 1657.5 686.5 L 1643.5 686.5 Z M 1612.5 672.5 L 1626.5 672.5 L 1626.5 686.5 L 1612.5 686.5 Z M 1581.5 672.5 L 1596.5 672.5 L 1596.5 686.5 L 1581.5 686.5 Z M 1450.5 672.5 L 1464.5 672.5 L 1464.5 686.5 L 1450.5 686.5 Z M 1419.5 672.5 L 1433.5 672.5 L 1433.5 686.5 L 1419.5 686.5 Z M 1388.5 672.5 L 1403.5 672.5 L 1403.5 686.5 L 1388.5 686.5 Z M 1306.5 672.5 L 1320.5 672.5 L 1320.5 686.5 L 1306.5 686.5 Z M 1275.5 672.5 L 1289.5 672.5 L 1289.5 686.5 L 1275.5 686.5 Z M 1244.5 672.5 L 1259.5 672.5 L 1259.5 686.5 L 1244.5 686.5 Z M 312.5 672.5 L 327.5 672.5 L 327.5 686.5 L 312.5 686.5 Z M 282.5 672.5 L 296.5 672.5 L 296.5 686.5 L 282.5 686.5 Z M 251.5 672.5 L 265.5 672.5 L 265.5 686.5 L 251.5 686.5 Z M 844.5 672.5 L 859.5 672.5 L 859.5 686.5 L 844.5 686.5 Z M 814.5 672.5 L 828.5 672.5 L 828.5 686.5 L 814.5 686.5 Z M 783.5 672.5 L 797.5 672.5 L 797.5 686.5 L 783.5 686.5 Z M 662.5 672.5 L 677.5 672.5 L 677.5 686.5 L 662.5 686.5 Z M 632.5 672.5 L 646.5 672.5 L 646.5 686.5 L 632.5 686.5 Z M 601.5 672.5 L 616.5 672.5 L 616.5 686.5 L 601.5 686.5 Z M 216.5 713.5 L 230.5 713.5 L 230.5 727.5 L 216.5 727.5 Z M 1688.5 713.5 L 1702.5 713.5 L 1702.5 727.5 L 1688.5 727.5 Z M 1647.5 713.5 L 1661.5 713.5 L 1661.5 727.5 L 1647.5 727.5 Z M 1606.5 713.5 L 1620.5 713.5 L 1620.5 727.5 L 1606.5 727.5 Z M 1565.5 713.5 L 1579.5 713.5 L 1579.5 727.5 L 1565.5 727.5 Z M 1524.5 713.5 L 1539.5 713.5 L 1539.5 727.5 L 1524.5 727.5 Z M 1483.5 713.5 L 1498.5 713.5 L 1498.5 727.5 L 1483.5 727.5 Z M 1442.5 713.5 L 1457.5 713.5 L 1457.5 727.5 L 1442.5 727.5 Z M 1401.5 713.5 L 1416.5 713.5 L 1416.5 727.5 L 1401.5 727.5 Z M 1361.5 713.5 L 1375.5 713.5 L 1375.5 727.5 L 1361.5 727.5 Z M 1320.5 713.5 L 1334.5 713.5 L 1334.5 727.5 L 1320.5 727.5 Z M 1279.5 713.5 L 1293.5 713.5 L 1293.5 727.5 L 1279.5 727.5 Z M 1238.5 713.5 L 1252.5 713.5 L 1252.5 727.5 L 1238.5 727.5 Z M 1197.5 713.5 L 1211.5 713.5 L 1211.5 727.5 L 1197.5 727.5 Z M 1156.5 713.5 L 1171.5 713.5 L 1171.5 727.5 L 1156.5 727.5 Z M 1115.5 713.5 L 1130.5 713.5 L 1130.5 727.5 L 1115.5 727.5 Z M 1074.5 713.5 L 1089.5 713.5 L 1089.5 727.5 L 1074.5 727.5 Z M 1033.5 713.5 L 1048.5 713.5 L 1048.5 727.5 L 1033.5 727.5 Z M 992.5 713.5 L 1007.5 713.5 L 1007.5 727.5 L 992.5 727.5 Z M 952.5 713.5 L 966.5 713.5 L 966.5 727.5 L 952.5 727.5 Z M 911.5 713.5 L 925.5 713.5 L 925.5 727.5 L 911.5 727.5 Z M 870.5 713.5 L 884.5 713.5 L 884.5 727.5 L 870.5 727.5 Z M 829.5 713.5 L 843.5 713.5 L 843.5 727.5 L 829.5 727.5 Z M 788.5 713.5 L 803.5 713.5 L 803.5 727.5 L 788.5 727.5 Z M 747.5 713.5 L 762.5 713.5 L 762.5 727.5 L 747.5 727.5 Z M 706.5 713.5 L 721.5 713.5 L 721.5 727.5 L 706.5 727.5 Z M 665.5 713.5 L 680.5 713.5 L 680.5 727.5 L 665.5 727.5 Z M 624.5 713.5 L 639.5 713.5 L 639.5 727.5 L 624.5 727.5 Z M 584.5 713.5 L 598.5 713.5 L 598.5 727.5 L 584.5 727.5 Z M 543.5 713.5 L 557.5 713.5 L 557.5 727.5 L 543.5 727.5 Z M 502.5 713.5 L 516.5 713.5 L 516.5 727.5 L 502.5 727.5 Z M 461.5 713.5 L 475.5 713.5 L 475.5 727.5 L 461.5 727.5 Z M 420.5 713.5 L 434.5 713.5 L 434.5 727.5 L 420.5 727.5 Z M 379.5 713.5 L 394.5 713.5 L 394.5 727.5 L 379.5 727.5 Z M 338.5 713.5 L 353.5 713.5 L 353.5 727.5 L 338.5 727.5 Z M 297.5 713.5 L 312.5 713.5 L 312.5 727.5 L 297.5 727.5 Z M 256.5 713.5 L 271.5 713.5 L 271.5 727.5 L 256.5 727.5 Z M 256.5 713.5 "/>
 </clipPath>
-<image id="image490" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image518" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image490"/>
+  <use xlink:href="#image518"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface481">
+<g id="surface509">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -277,6 +277,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1516.433594 442.652344 L 1516.433594 461.058594 L 1513.785156 461.058594 L 1504.265625 446.136719 L 1504.265625 461.058594 L 1502.046875 461.058594 L 1502.046875 442.652344 L 1504.59375 442.652344 L 1514.214844 457.699219 L 1514.214844 442.652344 Z M 1516.433594 442.652344 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1483 634 L 1498 634 M 1483 620 L 1498 620 M 1483 620 L 1483 634 M 1498 620 L 1498 634 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1483 634 L 1498 634 M 1483 620 L 1498 620 M 1498 634 L 1498 620 M 1483 634 L 1483 620 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 202 354 L 202 363 M 197 359 L 206 359 M 201 360 L 203 360 M 201 358 L 203 358 M 201 358 L 201 360 M 203 358 L 203 360 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.svg b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.svg
index 07a7068..f345fb0 100644
--- a/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.svg
+++ b/cells/dfstp/sky130_fd_sc_hvl__dfstp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 302.5 L 1744.5 302.5 L 1744.5 528.5 L 174.5 528.5 Z M 932.5 528.5 L 1744.5 528.5 L 1744.5 564.5 L 932.5 564.5 Z M 174.5 528.5 L 727.5 528.5 L 727.5 564.5 L 174.5 564.5 Z M 174.5 528.5 "/>
 </clipPath>
-<image id="image505" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image532" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image505"/>
+  <use xlink:href="#image532"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 207.5 335.5 L 1710.5 335.5 L 1710.5 352.5 L 207.5 352.5 Z M 207.5 335.5 "/>
 </clipPath>
-<image id="image506" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image533" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image506"/>
+  <use xlink:href="#image533"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 207.5 335.5 L 1710.5 335.5 L 1710.5 352.5 L 207.5 352.5 Z M 771.5 586.5 L 888.5 586.5 L 888.5 598.5 L 771.5 598.5 Z M 771.5 598.5 L 888.5 598.5 L 888.5 610.5 L 771.5 610.5 Z M 771.5 610.5 L 1463.5 610.5 L 1463.5 615.5 L 771.5 615.5 Z M 1497.5 610.5 L 1695.5 610.5 L 1695.5 622.5 L 1497.5 622.5 Z M 771.5 615.5 L 1463.5 615.5 L 1463.5 628.5 L 771.5 628.5 Z M 1497.5 622.5 L 1695.5 622.5 L 1695.5 640.5 L 1497.5 640.5 Z M 1497.5 640.5 L 1695.5 640.5 L 1695.5 652.5 L 1497.5 652.5 Z M 859.5 628.5 L 1463.5 628.5 L 1463.5 652.5 L 859.5 652.5 Z M 223.5 646.5 L 409.5 646.5 L 409.5 659.5 L 223.5 659.5 Z M 961.5 652.5 L 1135.5 652.5 L 1135.5 662.5 L 961.5 662.5 Z M 1587.5 652.5 L 1695.5 652.5 L 1695.5 664.5 L 1587.5 664.5 Z M 452.5 658.5 L 790.5 658.5 L 790.5 671.5 L 452.5 671.5 Z M 223.5 659.5 L 409.5 659.5 L 409.5 676.5 L 223.5 676.5 Z M 961.5 662.5 L 1135.5 662.5 L 1135.5 679.5 L 961.5 679.5 Z M 1587.5 664.5 L 1695.5 664.5 L 1695.5 681.5 L 1587.5 681.5 Z M 1587.5 681.5 L 1695.5 681.5 L 1695.5 686.5 L 1587.5 686.5 Z M 961.5 679.5 L 1135.5 679.5 L 1135.5 686.5 L 961.5 686.5 Z M 452.5 671.5 L 790.5 671.5 L 790.5 688.5 L 452.5 688.5 Z M 223.5 676.5 L 409.5 676.5 L 409.5 689.5 L 223.5 689.5 Z M 452.5 688.5 L 790.5 688.5 L 790.5 701.5 L 452.5 701.5 Z M 452.5 688.5 "/>
 </clipPath>
-<image id="image507" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image534" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image507"/>
+  <use xlink:href="#image534"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 207.5 746.5 L 1710.5 746.5 L 1710.5 763.5 L 207.5 763.5 Z M 207.5 746.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image506"/>
+  <use xlink:href="#image533"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 300.5 379.5 L 329.5 379.5 L 329.5 384.5 L 300.5 384.5 Z M 223.5 379.5 L 250.5 379.5 L 250.5 386.5 L 223.5 386.5 Z M 379.5 379.5 L 406.5 379.5 L 406.5 386.5 L 379.5 386.5 Z M 1351.5 379.5 L 1395.5 379.5 L 1395.5 392.5 L 1351.5 392.5 Z M 1446.5 379.5 L 1473.5 379.5 L 1473.5 392.5 L 1446.5 392.5 Z M 1591.5 392.5 L 1618.5 392.5 L 1618.5 398.5 L 1591.5 398.5 Z M 963.5 394.5 L 992.5 394.5 L 992.5 398.5 L 963.5 398.5 Z M 1669.5 392.5 L 1695.5 392.5 L 1695.5 398.5 L 1669.5 398.5 Z M 300.5 384.5 L 329.5 384.5 L 329.5 401.5 L 300.5 401.5 Z M 379.5 386.5 L 406.5 386.5 L 406.5 403.5 L 379.5 403.5 Z M 223.5 386.5 L 250.5 386.5 L 250.5 403.5 L 223.5 403.5 Z M 1351.5 392.5 L 1395.5 392.5 L 1395.5 409.5 L 1351.5 409.5 Z M 1446.5 392.5 L 1473.5 392.5 L 1473.5 409.5 L 1446.5 409.5 Z M 963.5 398.5 L 992.5 398.5 L 992.5 415.5 L 963.5 415.5 Z M 1591.5 398.5 L 1618.5 398.5 L 1618.5 415.5 L 1591.5 415.5 Z M 1669.5 398.5 L 1695.5 398.5 L 1695.5 415.5 L 1669.5 415.5 Z M 1591.5 415.5 L 1618.5 415.5 L 1618.5 417.5 L 1591.5 417.5 Z M 1114.5 394.5 L 1150.5 394.5 L 1150.5 421.5 L 1114.5 421.5 Z M 1351.5 409.5 L 1395.5 409.5 L 1395.5 422.5 L 1351.5 422.5 Z M 1446.5 409.5 L 1473.5 409.5 L 1473.5 422.5 L 1446.5 422.5 Z M 1503.5 417.5 L 1530.5 417.5 L 1530.5 423.5 L 1503.5 423.5 Z M 379.5 403.5 L 406.5 403.5 L 406.5 432.5 L 379.5 432.5 Z M 223.5 403.5 L 250.5 403.5 L 250.5 432.5 L 223.5 432.5 Z M 963.5 415.5 L 992.5 415.5 L 992.5 433.5 L 963.5 433.5 Z M 1669.5 415.5 L 1695.5 415.5 L 1695.5 434.5 L 1669.5 434.5 Z M 1580.5 417.5 L 1618.5 417.5 L 1618.5 434.5 L 1580.5 434.5 Z M 300.5 401.5 L 329.5 401.5 L 329.5 434.5 L 300.5 434.5 Z M 1114.5 421.5 L 1150.5 421.5 L 1150.5 438.5 L 1114.5 438.5 Z M 1503.5 423.5 L 1530.5 423.5 L 1530.5 440.5 L 1503.5 440.5 Z M 963.5 433.5 L 992.5 433.5 L 992.5 445.5 L 963.5 445.5 Z M 223.5 432.5 L 250.5 432.5 L 250.5 449.5 L 223.5 449.5 Z M 775.5 445.5 L 823.5 445.5 L 823.5 449.5 L 775.5 449.5 Z M 379.5 432.5 L 406.5 432.5 L 406.5 449.5 L 379.5 449.5 Z M 952.5 445.5 L 992.5 445.5 L 992.5 450.5 L 952.5 450.5 Z M 1580.5 434.5 L 1618.5 434.5 L 1618.5 451.5 L 1580.5 451.5 Z M 300.5 434.5 L 329.5 434.5 L 329.5 451.5 L 300.5 451.5 Z M 1669.5 434.5 L 1695.5 434.5 L 1695.5 451.5 L 1669.5 451.5 Z M 1114.5 438.5 L 1150.5 438.5 L 1150.5 452.5 L 1114.5 452.5 Z M 300.5 451.5 L 329.5 451.5 L 329.5 455.5 L 300.5 455.5 Z M 223.5 449.5 L 250.5 449.5 L 250.5 455.5 L 223.5 455.5 Z M 379.5 449.5 L 406.5 449.5 L 406.5 455.5 L 379.5 455.5 Z M 621.5 445.5 L 653.5 445.5 L 653.5 458.5 L 621.5 458.5 Z M 437.5 445.5 L 491.5 445.5 L 491.5 458.5 L 437.5 458.5 Z M 873.5 445.5 L 901.5 445.5 L 901.5 458.5 L 873.5 458.5 Z M 542.5 445.5 L 570.5 445.5 L 570.5 458.5 L 542.5 458.5 Z M 1284.5 452.5 L 1312.5 452.5 L 1312.5 462.5 L 1284.5 462.5 Z M 1362.5 452.5 L 1388.5 452.5 L 1388.5 463.5 L 1362.5 463.5 Z M 775.5 449.5 L 823.5 449.5 L 823.5 466.5 L 775.5 466.5 Z M 952.5 450.5 L 992.5 450.5 L 992.5 467.5 L 952.5 467.5 Z M 1580.5 451.5 L 1618.5 451.5 L 1618.5 469.5 L 1580.5 469.5 Z M 1503.5 440.5 L 1530.5 440.5 L 1530.5 469.5 L 1503.5 469.5 Z M 1669.5 451.5 L 1695.5 451.5 L 1695.5 469.5 L 1669.5 469.5 Z M 1362.5 463.5 L 1391.5 463.5 L 1391.5 471.5 L 1362.5 471.5 Z M 437.5 458.5 L 491.5 458.5 L 491.5 475.5 L 437.5 475.5 Z M 873.5 458.5 L 901.5 458.5 L 901.5 475.5 L 873.5 475.5 Z M 542.5 458.5 L 570.5 458.5 L 570.5 475.5 L 542.5 475.5 Z M 621.5 458.5 L 653.5 458.5 L 653.5 475.5 L 621.5 475.5 Z M 1284.5 462.5 L 1312.5 462.5 L 1312.5 479.5 L 1284.5 479.5 Z M 952.5 467.5 L 992.5 467.5 L 992.5 485.5 L 952.5 485.5 Z M 1503.5 469.5 L 1530.5 469.5 L 1530.5 487.5 L 1503.5 487.5 Z M 1580.5 469.5 L 1618.5 469.5 L 1618.5 487.5 L 1580.5 487.5 Z M 1669.5 469.5 L 1695.5 469.5 L 1695.5 487.5 L 1669.5 487.5 Z M 542.5 475.5 L 570.5 475.5 L 570.5 488.5 L 542.5 488.5 Z M 437.5 475.5 L 491.5 475.5 L 491.5 488.5 L 437.5 488.5 Z M 873.5 475.5 L 901.5 475.5 L 901.5 488.5 L 873.5 488.5 Z M 775.5 466.5 L 823.5 466.5 L 823.5 488.5 L 775.5 488.5 Z M 703.5 445.5 L 725.5 445.5 L 725.5 488.5 L 703.5 488.5 Z M 952.5 485.5 L 992.5 485.5 L 992.5 488.5 L 952.5 488.5 Z M 621.5 475.5 L 653.5 475.5 L 653.5 488.5 L 621.5 488.5 Z M 1362.5 471.5 L 1391.5 471.5 L 1391.5 489.5 L 1362.5 489.5 Z M 1580.5 487.5 L 1618.5 487.5 L 1618.5 493.5 L 1580.5 493.5 Z M 1669.5 487.5 L 1695.5 487.5 L 1695.5 493.5 L 1669.5 493.5 Z M 1503.5 487.5 L 1530.5 487.5 L 1530.5 493.5 L 1503.5 493.5 Z M 1284.5 479.5 L 1312.5 479.5 L 1312.5 495.5 L 1284.5 495.5 Z M 1042.5 394.5 L 1063.5 394.5 L 1063.5 495.5 L 1042.5 495.5 Z M 1114.5 452.5 L 1161.5 452.5 L 1161.5 495.5 L 1114.5 495.5 Z M 1212.5 452.5 L 1233.5 452.5 L 1233.5 495.5 L 1212.5 495.5 Z M 963.5 488.5 L 992.5 488.5 L 992.5 495.5 L 963.5 495.5 Z M 1362.5 489.5 L 1391.5 489.5 L 1391.5 495.5 L 1362.5 495.5 Z M 207.5 746.5 L 1710.5 746.5 L 1710.5 763.5 L 207.5 763.5 Z M 207.5 746.5 "/>
 </clipPath>
-<image id="image508" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image535" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image508"/>
+  <use xlink:href="#image535"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 797.5 586.5 L 848.5 586.5 L 848.5 628.5 L 797.5 628.5 Z M 1384.5 610.5 L 1434.5 610.5 L 1434.5 652.5 L 1384.5 652.5 Z M 899.5 610.5 L 950.5 610.5 L 950.5 652.5 L 899.5 652.5 Z M 1161.5 610.5 L 1212.5 610.5 L 1212.5 652.5 L 1161.5 652.5 Z M 1305.5 610.5 L 1355.5 610.5 L 1355.5 652.5 L 1305.5 652.5 Z M 1233.5 610.5 L 1284.5 610.5 L 1284.5 652.5 L 1233.5 652.5 Z M 1526.5 610.5 L 1576.5 610.5 L 1576.5 652.5 L 1526.5 652.5 Z M 1059.5 610.5 L 1110.5 610.5 L 1110.5 686.5 L 1059.5 686.5 Z M 1616.5 610.5 L 1667.5 610.5 L 1667.5 686.5 L 1616.5 686.5 Z M 988.5 610.5 L 1038.5 610.5 L 1038.5 686.5 L 988.5 686.5 Z M 251.5 646.5 L 302.5 646.5 L 302.5 689.5 L 251.5 689.5 Z M 330.5 646.5 L 381.5 646.5 L 381.5 689.5 L 330.5 689.5 Z M 641.5 658.5 L 691.5 658.5 L 691.5 701.5 L 641.5 701.5 Z M 481.5 658.5 L 532.5 658.5 L 532.5 701.5 L 481.5 701.5 Z M 712.5 658.5 L 763.5 658.5 L 763.5 701.5 L 712.5 701.5 Z M 560.5 658.5 L 610.5 658.5 L 610.5 701.5 L 560.5 701.5 Z M 560.5 658.5 "/>
 </clipPath>
-<image id="image509" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image536" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image509"/>
+  <use xlink:href="#image536"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1395.5 379.5 L 1446.5 379.5 L 1446.5 422.5 L 1395.5 422.5 Z M 329.5 379.5 L 379.5 379.5 L 379.5 455.5 L 329.5 455.5 Z M 250.5 379.5 L 300.5 379.5 L 300.5 455.5 L 250.5 455.5 Z M 823.5 445.5 L 873.5 445.5 L 873.5 488.5 L 823.5 488.5 Z M 725.5 445.5 L 775.5 445.5 L 775.5 488.5 L 725.5 488.5 Z M 653.5 445.5 L 703.5 445.5 L 703.5 488.5 L 653.5 488.5 Z M 570.5 445.5 L 621.5 445.5 L 621.5 488.5 L 570.5 488.5 Z M 491.5 445.5 L 542.5 445.5 L 542.5 488.5 L 491.5 488.5 Z M 901.5 445.5 L 952.5 445.5 L 952.5 488.5 L 901.5 488.5 Z M 1618.5 392.5 L 1669.5 392.5 L 1669.5 493.5 L 1618.5 493.5 Z M 1530.5 417.5 L 1580.5 417.5 L 1580.5 493.5 L 1530.5 493.5 Z M 1161.5 452.5 L 1212.5 452.5 L 1212.5 495.5 L 1161.5 495.5 Z M 1063.5 394.5 L 1114.5 394.5 L 1114.5 495.5 L 1063.5 495.5 Z M 1233.5 452.5 L 1284.5 452.5 L 1284.5 495.5 L 1233.5 495.5 Z M 1312.5 452.5 L 1362.5 452.5 L 1362.5 495.5 L 1312.5 495.5 Z M 992.5 394.5 L 1042.5 394.5 L 1042.5 495.5 L 992.5 495.5 Z M 992.5 394.5 "/>
 </clipPath>
-<image id="image510" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image537" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image510"/>
+  <use xlink:href="#image537"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 223.5 335.5 L 240.5 335.5 L 240.5 352.5 L 223.5 352.5 Z M 1678.5 335.5 L 1695.5 335.5 L 1695.5 352.5 L 1678.5 352.5 Z M 1629.5 335.5 L 1646.5 335.5 L 1646.5 352.5 L 1629.5 352.5 Z M 1581.5 335.5 L 1598.5 335.5 L 1598.5 352.5 L 1581.5 352.5 Z M 1532.5 335.5 L 1549.5 335.5 L 1549.5 352.5 L 1532.5 352.5 Z M 1484.5 335.5 L 1501.5 335.5 L 1501.5 352.5 L 1484.5 352.5 Z M 1435.5 335.5 L 1452.5 335.5 L 1452.5 352.5 L 1435.5 352.5 Z M 1387.5 335.5 L 1404.5 335.5 L 1404.5 352.5 L 1387.5 352.5 Z M 1338.5 335.5 L 1355.5 335.5 L 1355.5 352.5 L 1338.5 352.5 Z M 1290.5 335.5 L 1307.5 335.5 L 1307.5 352.5 L 1290.5 352.5 Z M 1241.5 335.5 L 1258.5 335.5 L 1258.5 352.5 L 1241.5 352.5 Z M 1193.5 335.5 L 1210.5 335.5 L 1210.5 352.5 L 1193.5 352.5 Z M 1144.5 335.5 L 1161.5 335.5 L 1161.5 352.5 L 1144.5 352.5 Z M 1096.5 335.5 L 1113.5 335.5 L 1113.5 352.5 L 1096.5 352.5 Z M 1047.5 335.5 L 1064.5 335.5 L 1064.5 352.5 L 1047.5 352.5 Z M 999.5 335.5 L 1016.5 335.5 L 1016.5 352.5 L 999.5 352.5 Z M 950.5 335.5 L 968.5 335.5 L 968.5 352.5 L 950.5 352.5 Z M 902.5 335.5 L 919.5 335.5 L 919.5 352.5 L 902.5 352.5 Z M 853.5 335.5 L 871.5 335.5 L 871.5 352.5 L 853.5 352.5 Z M 805.5 335.5 L 822.5 335.5 L 822.5 352.5 L 805.5 352.5 Z M 756.5 335.5 L 774.5 335.5 L 774.5 352.5 L 756.5 352.5 Z M 708.5 335.5 L 725.5 335.5 L 725.5 352.5 L 708.5 352.5 Z M 659.5 335.5 L 677.5 335.5 L 677.5 352.5 L 659.5 352.5 Z M 611.5 335.5 L 628.5 335.5 L 628.5 352.5 L 611.5 352.5 Z M 562.5 335.5 L 580.5 335.5 L 580.5 352.5 L 562.5 352.5 Z M 514.5 335.5 L 531.5 335.5 L 531.5 352.5 L 514.5 352.5 Z M 465.5 335.5 L 483.5 335.5 L 483.5 352.5 L 465.5 352.5 Z M 417.5 335.5 L 434.5 335.5 L 434.5 352.5 L 417.5 352.5 Z M 369.5 335.5 L 386.5 335.5 L 386.5 352.5 L 369.5 352.5 Z M 320.5 335.5 L 337.5 335.5 L 337.5 352.5 L 320.5 352.5 Z M 272.5 335.5 L 289.5 335.5 L 289.5 352.5 L 272.5 352.5 Z M 1468.5 384.5 L 1485.5 384.5 L 1485.5 392.5 L 1468.5 392.5 Z M 961.5 384.5 L 979.5 384.5 L 979.5 398.5 L 961.5 398.5 Z M 1589.5 384.5 L 1606.5 384.5 L 1606.5 398.5 L 1589.5 398.5 Z M 961.5 398.5 L 979.5 398.5 L 979.5 401.5 L 961.5 401.5 Z M 1468.5 392.5 L 1485.5 392.5 L 1485.5 401.5 L 1468.5 401.5 Z M 925.5 384.5 L 942.5 384.5 L 942.5 401.5 L 925.5 401.5 Z M 777.5 384.5 L 794.5 384.5 L 794.5 401.5 L 777.5 401.5 Z M 1294.5 384.5 L 1311.5 384.5 L 1311.5 401.5 L 1294.5 401.5 Z M 1258.5 384.5 L 1275.5 384.5 L 1275.5 401.5 L 1258.5 401.5 Z M 1395.5 384.5 L 1412.5 384.5 L 1412.5 401.5 L 1395.5 401.5 Z M 998.5 384.5 L 1015.5 384.5 L 1015.5 401.5 L 998.5 401.5 Z M 1432.5 384.5 L 1449.5 384.5 L 1449.5 401.5 L 1432.5 401.5 Z M 1626.5 384.5 L 1643.5 384.5 L 1643.5 401.5 L 1626.5 401.5 Z M 436.5 384.5 L 453.5 384.5 L 453.5 401.5 L 436.5 401.5 Z M 265.5 384.5 L 283.5 384.5 L 283.5 401.5 L 265.5 401.5 Z M 338.5 384.5 L 355.5 384.5 L 355.5 401.5 L 338.5 401.5 Z M 1553.5 384.5 L 1570.5 384.5 L 1570.5 401.5 L 1553.5 401.5 Z M 1222.5 384.5 L 1239.5 384.5 L 1239.5 401.5 L 1222.5 401.5 Z M 302.5 384.5 L 319.5 384.5 L 319.5 401.5 L 302.5 401.5 Z M 1589.5 398.5 L 1606.5 398.5 L 1606.5 401.5 L 1589.5 401.5 Z M 774.5 698.5 L 791.5 698.5 L 791.5 715.5 L 774.5 715.5 Z M 1622.5 698.5 L 1639.5 698.5 L 1639.5 715.5 L 1622.5 715.5 Z M 1586.5 698.5 L 1603.5 698.5 L 1603.5 715.5 L 1586.5 715.5 Z M 1549.5 698.5 L 1567.5 698.5 L 1567.5 715.5 L 1549.5 715.5 Z M 1392.5 698.5 L 1409.5 698.5 L 1409.5 715.5 L 1392.5 715.5 Z M 1356.5 698.5 L 1373.5 698.5 L 1373.5 715.5 L 1356.5 715.5 Z M 970.5 698.5 L 987.5 698.5 L 987.5 715.5 L 970.5 715.5 Z M 934.5 698.5 L 951.5 698.5 L 951.5 715.5 L 934.5 715.5 Z M 897.5 698.5 L 914.5 698.5 L 914.5 715.5 L 897.5 715.5 Z M 737.5 698.5 L 754.5 698.5 L 754.5 715.5 L 737.5 715.5 Z M 701.5 698.5 L 718.5 698.5 L 718.5 715.5 L 701.5 715.5 Z M 493.5 698.5 L 510.5 698.5 L 510.5 715.5 L 493.5 715.5 Z M 457.5 698.5 L 474.5 698.5 L 474.5 715.5 L 457.5 715.5 Z M 304.5 698.5 L 322.5 698.5 L 322.5 715.5 L 304.5 715.5 Z M 268.5 698.5 L 285.5 698.5 L 285.5 715.5 L 268.5 715.5 Z M 223.5 746.5 L 240.5 746.5 L 240.5 763.5 L 223.5 763.5 Z M 1678.5 746.5 L 1695.5 746.5 L 1695.5 763.5 L 1678.5 763.5 Z M 1629.5 746.5 L 1646.5 746.5 L 1646.5 763.5 L 1629.5 763.5 Z M 1581.5 746.5 L 1598.5 746.5 L 1598.5 763.5 L 1581.5 763.5 Z M 1532.5 746.5 L 1549.5 746.5 L 1549.5 763.5 L 1532.5 763.5 Z M 1484.5 746.5 L 1501.5 746.5 L 1501.5 763.5 L 1484.5 763.5 Z M 1435.5 746.5 L 1452.5 746.5 L 1452.5 763.5 L 1435.5 763.5 Z M 1387.5 746.5 L 1404.5 746.5 L 1404.5 763.5 L 1387.5 763.5 Z M 1338.5 746.5 L 1355.5 746.5 L 1355.5 763.5 L 1338.5 763.5 Z M 1290.5 746.5 L 1307.5 746.5 L 1307.5 763.5 L 1290.5 763.5 Z M 1241.5 746.5 L 1258.5 746.5 L 1258.5 763.5 L 1241.5 763.5 Z M 1193.5 746.5 L 1210.5 746.5 L 1210.5 763.5 L 1193.5 763.5 Z M 1144.5 746.5 L 1161.5 746.5 L 1161.5 763.5 L 1144.5 763.5 Z M 1096.5 746.5 L 1113.5 746.5 L 1113.5 763.5 L 1096.5 763.5 Z M 1047.5 746.5 L 1064.5 746.5 L 1064.5 763.5 L 1047.5 763.5 Z M 999.5 746.5 L 1016.5 746.5 L 1016.5 763.5 L 999.5 763.5 Z M 950.5 746.5 L 968.5 746.5 L 968.5 763.5 L 950.5 763.5 Z M 902.5 746.5 L 919.5 746.5 L 919.5 763.5 L 902.5 763.5 Z M 853.5 746.5 L 871.5 746.5 L 871.5 763.5 L 853.5 763.5 Z M 805.5 746.5 L 822.5 746.5 L 822.5 763.5 L 805.5 763.5 Z M 756.5 746.5 L 774.5 746.5 L 774.5 763.5 L 756.5 763.5 Z M 708.5 746.5 L 725.5 746.5 L 725.5 763.5 L 708.5 763.5 Z M 659.5 746.5 L 677.5 746.5 L 677.5 763.5 L 659.5 763.5 Z M 611.5 746.5 L 628.5 746.5 L 628.5 763.5 L 611.5 763.5 Z M 562.5 746.5 L 580.5 746.5 L 580.5 763.5 L 562.5 763.5 Z M 514.5 746.5 L 531.5 746.5 L 531.5 763.5 L 514.5 763.5 Z M 465.5 746.5 L 483.5 746.5 L 483.5 763.5 L 465.5 763.5 Z M 417.5 746.5 L 434.5 746.5 L 434.5 763.5 L 417.5 763.5 Z M 369.5 746.5 L 386.5 746.5 L 386.5 763.5 L 369.5 763.5 Z M 320.5 746.5 L 337.5 746.5 L 337.5 763.5 L 320.5 763.5 Z M 272.5 746.5 L 289.5 746.5 L 289.5 763.5 L 272.5 763.5 Z M 272.5 746.5 "/>
 </clipPath>
-<image id="image511" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image538" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image511"/>
+  <use xlink:href="#image538"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface502">
+<g id="surface529">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -272,6 +272,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1697.089844 447.792969 L 1695.703125 449.5 L 1692.613281 446.9375 L 1691.730469 447.410156 L 1690.84375 447.761719 L 1689.933594 448.058594 L 1688.960938 448.261719 L 1687.988281 448.378906 L 1686.988281 448.441406 L 1685.632812 448.351562 L 1684.367188 448.144531 L 1683.1875 447.792969 L 1682.066406 447.320312 L 1681.007812 446.703125 L 1680.066406 445.90625 L 1679.210938 445.050781 L 1678.476562 444.082031 L 1677.886719 443.019531 L 1677.386719 441.871094 L 1677.003906 440.632812 L 1676.765625 439.28125 L 1676.707031 438.957031 L 1676.679688 438.601562 L 1676.648438 438.277344 L 1676.621094 437.925781 L 1676.621094 437.1875 L 1676.679688 435.714844 L 1676.882812 434.300781 L 1677.207031 433.007812 L 1677.679688 431.769531 L 1678.269531 430.621094 L 1679.035156 429.558594 L 1679.800781 428.707031 L 1680.683594 427.941406 L 1681.65625 427.292969 L 1682.6875 426.792969 L 1683.804688 426.378906 L 1685.042969 426.085938 L 1685.335938 426.054688 L 1685.660156 426.027344 L 1685.984375 425.996094 L 1686.308594 425.96875 L 1686.632812 425.96875 L 1686.988281 425.9375 L 1688.3125 426.027344 L 1689.578125 426.230469 L 1690.757812 426.585938 L 1691.875 427.058594 L 1692.9375 427.675781 L 1693.90625 428.441406 L 1694.734375 429.324219 L 1695.46875 430.265625 L 1696.058594 431.296875 L 1696.558594 432.445312 L 1696.941406 433.683594 L 1697.207031 434.980469 L 1697.234375 435.363281 L 1697.265625 435.714844 L 1697.296875 436.070312 L 1697.324219 436.421875 L 1697.324219 436.777344 L 1697.355469 437.128906 L 1697.265625 438.777344 L 1697 440.339844 L 1696.589844 441.785156 L 1696 443.136719 L 1695.234375 444.375 L 1694.320312 445.523438 Z M 1689.667969 441.722656 L 1692.289062 443.875 L 1692.996094 442.992188 L 1693.585938 441.988281 L 1694.027344 440.898438 L 1694.351562 439.75 L 1694.527344 438.515625 L 1694.613281 437.160156 L 1694.554688 435.921875 L 1694.378906 434.742188 L 1694.085938 433.652344 L 1693.703125 432.652344 L 1693.203125 431.710938 L 1692.582031 430.855469 L 1691.875 430.148438 L 1691.140625 429.558594 L 1690.316406 429.089844 L 1689.429688 428.734375 L 1688.460938 428.5 L 1687.457031 428.351562 L 1686.988281 428.351562 L 1685.925781 428.441406 L 1684.925781 428.617188 L 1683.984375 428.914062 L 1683.128906 429.355469 L 1682.332031 429.914062 L 1681.625 430.589844 L 1680.949219 431.386719 L 1680.417969 432.269531 L 1679.976562 433.242188 L 1679.652344 434.300781 L 1679.445312 435.449219 L 1679.359375 436.6875 L 1679.359375 437.1875 L 1679.386719 438.484375 L 1679.566406 439.664062 L 1679.859375 440.753906 L 1680.242188 441.785156 L 1680.773438 442.726562 L 1681.421875 443.550781 L 1682.097656 444.285156 L 1682.863281 444.875 L 1683.6875 445.347656 L 1684.570312 445.671875 L 1685.542969 445.90625 L 1686.574219 445.996094 L 1686.632812 446.023438 L 1687.488281 446.023438 L 1688.046875 445.964844 L 1688.605469 445.847656 L 1689.136719 445.730469 L 1689.667969 445.554688 L 1690.226562 445.316406 L 1690.257812 445.316406 L 1690.316406 445.289062 L 1690.34375 445.257812 L 1690.402344 445.257812 L 1690.433594 445.230469 L 1690.492188 445.199219 L 1688.3125 443.375 Z M 1689.667969 441.722656 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1678 651 L 1695 651 M 1678 633 L 1695 633 M 1678 633 L 1678 651 M 1695 633 L 1695 651 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1678 651 L 1695 651 M 1678 633 L 1695 633 M 1695 651 L 1695 633 M 1678 651 L 1678 633 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 319 L 207 328 M 202 324 L 211 324 M 206 325 L 208 325 M 206 323 L 208 323 M 206 323 L 206 325 M 208 323 L 208 325 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.svg b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.svg
index 8d463ea..46cf590 100644
--- a/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.svg
+++ b/cells/dfxbp/sky130_fd_sc_hvl__dfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 287.5 L 1744.5 287.5 L 1744.5 566.5 L 174.5 566.5 Z M 174.5 287.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 210.5 322.5 L 1708.5 322.5 L 1708.5 340.5 L 210.5 340.5 Z M 210.5 322.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 210.5 322.5 L 1708.5 322.5 L 1708.5 340.5 L 210.5 340.5 Z M 1340.5 614.5 L 1453.5 614.5 L 1453.5 620.5 L 1340.5 620.5 Z M 1485.5 614.5 L 1692.5 614.5 L 1692.5 627.5 L 1485.5 627.5 Z M 1196.5 629.5 L 1307.5 629.5 L 1307.5 635.5 L 1196.5 635.5 Z M 1340.5 620.5 L 1453.5 620.5 L 1453.5 639.5 L 1340.5 639.5 Z M 1485.5 627.5 L 1692.5 627.5 L 1692.5 646.5 L 1485.5 646.5 Z M 1196.5 635.5 L 1307.5 635.5 L 1307.5 654.5 L 1196.5 654.5 Z M 1485.5 646.5 L 1692.5 646.5 L 1692.5 659.5 L 1485.5 659.5 Z M 848.5 629.5 L 958.5 629.5 L 958.5 664.5 L 848.5 664.5 Z M 1196.5 654.5 L 1307.5 654.5 L 1307.5 664.5 L 1196.5 664.5 Z M 1340.5 639.5 L 1453.5 639.5 L 1453.5 670.5 L 1340.5 670.5 Z M 1579.5 659.5 L 1692.5 659.5 L 1692.5 672.5 L 1579.5 672.5 Z M 226.5 664.5 L 423.5 664.5 L 423.5 677.5 L 226.5 677.5 Z M 498.5 664.5 L 1307.5 664.5 L 1307.5 678.5 L 498.5 678.5 Z M 1340.5 670.5 L 1453.5 670.5 L 1453.5 688.5 L 1340.5 688.5 Z M 1579.5 672.5 L 1692.5 672.5 L 1692.5 690.5 L 1579.5 690.5 Z M 1579.5 690.5 L 1692.5 690.5 L 1692.5 695.5 L 1579.5 695.5 Z M 1340.5 688.5 L 1453.5 688.5 L 1453.5 695.5 L 1340.5 695.5 Z M 226.5 677.5 L 423.5 677.5 L 423.5 696.5 L 226.5 696.5 Z M 498.5 678.5 L 1307.5 678.5 L 1307.5 696.5 L 498.5 696.5 Z M 226.5 696.5 L 423.5 696.5 L 423.5 709.5 L 226.5 709.5 Z M 498.5 696.5 L 1307.5 696.5 L 1307.5 710.5 L 498.5 710.5 Z M 498.5 696.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 210.5 760.5 L 1708.5 760.5 L 1708.5 779.5 L 210.5 779.5 Z M 210.5 760.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1661.5 369.5 L 1692.5 369.5 L 1692.5 374.5 L 1661.5 374.5 Z M 1577.5 369.5 L 1608.5 369.5 L 1608.5 374.5 L 1577.5 374.5 Z M 1340.5 369.5 L 1368.5 369.5 L 1368.5 376.5 L 1340.5 376.5 Z M 1422.5 369.5 L 1450.5 369.5 L 1450.5 376.5 L 1422.5 376.5 Z M 1279.5 372.5 L 1307.5 372.5 L 1307.5 378.5 L 1279.5 378.5 Z M 1196.5 372.5 L 1225.5 372.5 L 1225.5 378.5 L 1196.5 378.5 Z M 848.5 372.5 L 876.5 372.5 L 876.5 378.5 L 848.5 378.5 Z M 1577.5 374.5 L 1608.5 374.5 L 1608.5 392.5 L 1577.5 392.5 Z M 1661.5 374.5 L 1692.5 374.5 L 1692.5 392.5 L 1661.5 392.5 Z M 1340.5 376.5 L 1368.5 376.5 L 1368.5 394.5 L 1340.5 394.5 Z M 1422.5 376.5 L 1450.5 376.5 L 1450.5 394.5 L 1422.5 394.5 Z M 1279.5 378.5 L 1307.5 378.5 L 1307.5 396.5 L 1279.5 396.5 Z M 848.5 378.5 L 876.5 378.5 L 876.5 396.5 L 848.5 396.5 Z M 1196.5 378.5 L 1225.5 378.5 L 1225.5 396.5 L 1196.5 396.5 Z M 1014.5 372.5 L 1042.5 372.5 L 1042.5 397.5 L 1014.5 397.5 Z M 930.5 372.5 L 960.5 372.5 L 960.5 406.5 L 930.5 406.5 Z M 1196.5 396.5 L 1225.5 396.5 L 1225.5 416.5 L 1196.5 416.5 Z M 1279.5 396.5 L 1307.5 396.5 L 1307.5 416.5 L 1279.5 416.5 Z M 1014.5 397.5 L 1042.5 397.5 L 1042.5 416.5 L 1014.5 416.5 Z M 1577.5 392.5 L 1608.5 392.5 L 1608.5 418.5 L 1577.5 418.5 Z M 1661.5 392.5 L 1692.5 392.5 L 1692.5 418.5 L 1661.5 418.5 Z M 1340.5 394.5 L 1368.5 394.5 L 1368.5 419.5 L 1340.5 419.5 Z M 1422.5 394.5 L 1450.5 394.5 L 1450.5 419.5 L 1422.5 419.5 Z M 930.5 406.5 L 960.5 406.5 L 960.5 424.5 L 930.5 424.5 Z M 848.5 396.5 L 876.5 396.5 L 876.5 430.5 L 848.5 430.5 Z M 394.5 426.5 L 425.5 426.5 L 425.5 430.5 L 394.5 430.5 Z M 226.5 426.5 L 257.5 426.5 L 257.5 430.5 L 226.5 430.5 Z M 310.5 426.5 L 341.5 426.5 L 341.5 430.5 L 310.5 430.5 Z M 848.5 430.5 L 876.5 430.5 L 876.5 434.5 L 848.5 434.5 Z M 1196.5 416.5 L 1225.5 416.5 L 1225.5 434.5 L 1196.5 434.5 Z M 1014.5 416.5 L 1042.5 416.5 L 1042.5 434.5 L 1014.5 434.5 Z M 1184.5 434.5 L 1225.5 434.5 L 1225.5 435.5 L 1184.5 435.5 Z M 1279.5 416.5 L 1307.5 416.5 L 1307.5 435.5 L 1279.5 435.5 Z M 1577.5 418.5 L 1608.5 418.5 L 1608.5 437.5 L 1577.5 437.5 Z M 1340.5 419.5 L 1368.5 419.5 L 1368.5 437.5 L 1340.5 437.5 Z M 1661.5 418.5 L 1692.5 418.5 L 1692.5 437.5 L 1661.5 437.5 Z M 1422.5 419.5 L 1450.5 419.5 L 1450.5 437.5 L 1422.5 437.5 Z M 507.5 434.5 L 538.5 434.5 L 538.5 447.5 L 507.5 447.5 Z M 675.5 434.5 L 705.5 434.5 L 705.5 447.5 L 675.5 447.5 Z M 591.5 434.5 L 621.5 434.5 L 621.5 447.5 L 591.5 447.5 Z M 836.5 434.5 L 876.5 434.5 L 876.5 448.5 L 836.5 448.5 Z M 394.5 430.5 L 425.5 430.5 L 425.5 449.5 L 394.5 449.5 Z M 310.5 430.5 L 341.5 430.5 L 341.5 449.5 L 310.5 449.5 Z M 226.5 430.5 L 257.5 430.5 L 257.5 449.5 L 226.5 449.5 Z M 1577.5 437.5 L 1608.5 437.5 L 1608.5 450.5 L 1577.5 450.5 Z M 1184.5 435.5 L 1225.5 435.5 L 1225.5 454.5 L 1184.5 454.5 Z M 1279.5 435.5 L 1307.5 435.5 L 1307.5 454.5 L 1279.5 454.5 Z M 1014.5 434.5 L 1054.5 434.5 L 1054.5 454.5 L 1014.5 454.5 Z M 930.5 424.5 L 960.5 424.5 L 960.5 457.5 L 930.5 457.5 Z M 1483.5 450.5 L 1511.5 450.5 L 1511.5 457.5 L 1483.5 457.5 Z M 1340.5 437.5 L 1368.5 437.5 L 1368.5 463.5 L 1340.5 463.5 Z M 1422.5 437.5 L 1450.5 437.5 L 1450.5 463.5 L 1422.5 463.5 Z M 1565.5 450.5 L 1608.5 450.5 L 1608.5 464.5 L 1565.5 464.5 Z M 1661.5 437.5 L 1692.5 437.5 L 1692.5 464.5 L 1661.5 464.5 Z M 507.5 447.5 L 538.5 447.5 L 538.5 466.5 L 507.5 466.5 Z M 591.5 447.5 L 621.5 447.5 L 621.5 466.5 L 591.5 466.5 Z M 675.5 447.5 L 705.5 447.5 L 705.5 466.5 L 675.5 466.5 Z M 1014.5 454.5 L 1054.5 454.5 L 1054.5 473.5 L 1014.5 473.5 Z M 1184.5 454.5 L 1225.5 454.5 L 1225.5 473.5 L 1184.5 473.5 Z M 1279.5 454.5 L 1307.5 454.5 L 1307.5 473.5 L 1279.5 473.5 Z M 930.5 457.5 L 960.5 457.5 L 960.5 475.5 L 930.5 475.5 Z M 1483.5 457.5 L 1511.5 457.5 L 1511.5 475.5 L 1483.5 475.5 Z M 930.5 475.5 L 960.5 475.5 L 960.5 479.5 L 930.5 479.5 Z M 1279.5 473.5 L 1307.5 473.5 L 1307.5 479.5 L 1279.5 479.5 Z M 1184.5 473.5 L 1225.5 473.5 L 1225.5 479.5 L 1184.5 479.5 Z M 591.5 466.5 L 621.5 466.5 L 621.5 479.5 L 591.5 479.5 Z M 675.5 466.5 L 705.5 466.5 L 705.5 479.5 L 675.5 479.5 Z M 507.5 466.5 L 538.5 466.5 L 538.5 479.5 L 507.5 479.5 Z M 1014.5 473.5 L 1054.5 473.5 L 1054.5 479.5 L 1014.5 479.5 Z M 1108.5 434.5 L 1131.5 434.5 L 1131.5 479.5 L 1108.5 479.5 Z M 759.5 434.5 L 782.5 434.5 L 782.5 479.5 L 759.5 479.5 Z M 836.5 448.5 L 876.5 448.5 L 876.5 479.5 L 836.5 479.5 Z M 1422.5 463.5 L 1450.5 463.5 L 1450.5 481.5 L 1422.5 481.5 Z M 1340.5 463.5 L 1368.5 463.5 L 1368.5 481.5 L 1340.5 481.5 Z M 1565.5 464.5 L 1608.5 464.5 L 1608.5 482.5 L 1565.5 482.5 Z M 1661.5 464.5 L 1692.5 464.5 L 1692.5 482.5 L 1661.5 482.5 Z M 394.5 449.5 L 425.5 449.5 L 425.5 484.5 L 394.5 484.5 Z M 226.5 449.5 L 257.5 449.5 L 257.5 484.5 L 226.5 484.5 Z M 310.5 449.5 L 341.5 449.5 L 341.5 484.5 L 310.5 484.5 Z M 394.5 484.5 L 425.5 484.5 L 425.5 502.5 L 394.5 502.5 Z M 226.5 484.5 L 257.5 484.5 L 257.5 502.5 L 226.5 502.5 Z M 310.5 484.5 L 341.5 484.5 L 341.5 502.5 L 310.5 502.5 Z M 1483.5 475.5 L 1511.5 475.5 L 1511.5 506.5 L 1483.5 506.5 Z M 1340.5 481.5 L 1368.5 481.5 L 1368.5 506.5 L 1340.5 506.5 Z M 1422.5 481.5 L 1450.5 481.5 L 1450.5 506.5 L 1422.5 506.5 Z M 310.5 502.5 L 341.5 502.5 L 341.5 507.5 L 310.5 507.5 Z M 394.5 502.5 L 425.5 502.5 L 425.5 507.5 L 394.5 507.5 Z M 226.5 502.5 L 257.5 502.5 L 257.5 507.5 L 226.5 507.5 Z M 1661.5 482.5 L 1692.5 482.5 L 1692.5 508.5 L 1661.5 508.5 Z M 1565.5 482.5 L 1608.5 482.5 L 1608.5 508.5 L 1565.5 508.5 Z M 1483.5 506.5 L 1511.5 506.5 L 1511.5 524.5 L 1483.5 524.5 Z M 1422.5 506.5 L 1450.5 506.5 L 1450.5 524.5 L 1422.5 524.5 Z M 1340.5 506.5 L 1368.5 506.5 L 1368.5 524.5 L 1340.5 524.5 Z M 1661.5 508.5 L 1692.5 508.5 L 1692.5 527.5 L 1661.5 527.5 Z M 1565.5 508.5 L 1608.5 508.5 L 1608.5 527.5 L 1565.5 527.5 Z M 1340.5 524.5 L 1368.5 524.5 L 1368.5 531.5 L 1340.5 531.5 Z M 1661.5 527.5 L 1692.5 527.5 L 1692.5 531.5 L 1661.5 531.5 Z M 1422.5 524.5 L 1450.5 524.5 L 1450.5 531.5 L 1422.5 531.5 Z M 1483.5 524.5 L 1511.5 524.5 L 1511.5 531.5 L 1483.5 531.5 Z M 1565.5 527.5 L 1608.5 527.5 L 1608.5 531.5 L 1565.5 531.5 Z M 210.5 760.5 L 1708.5 760.5 L 1708.5 779.5 L 210.5 779.5 Z M 210.5 760.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1513.5 614.5 L 1567.5 614.5 L 1567.5 659.5 L 1513.5 659.5 Z M 1368.5 614.5 L 1422.5 614.5 L 1422.5 695.5 L 1368.5 695.5 Z M 1610.5 614.5 L 1664.5 614.5 L 1664.5 695.5 L 1610.5 695.5 Z M 254.5 664.5 L 308.5 664.5 L 308.5 709.5 L 254.5 709.5 Z M 338.5 664.5 L 392.5 664.5 L 392.5 709.5 L 338.5 709.5 Z M 705.5 664.5 L 759.5 664.5 L 759.5 710.5 L 705.5 710.5 Z M 1131.5 664.5 L 1184.5 664.5 L 1184.5 710.5 L 1131.5 710.5 Z M 1054.5 664.5 L 1108.5 664.5 L 1108.5 710.5 L 1054.5 710.5 Z M 970.5 664.5 L 1024.5 664.5 L 1024.5 710.5 L 970.5 710.5 Z M 538.5 664.5 L 591.5 664.5 L 591.5 710.5 L 538.5 710.5 Z M 1225.5 629.5 L 1279.5 629.5 L 1279.5 710.5 L 1225.5 710.5 Z M 876.5 629.5 L 930.5 629.5 L 930.5 710.5 L 876.5 710.5 Z M 782.5 664.5 L 836.5 664.5 L 836.5 710.5 L 782.5 710.5 Z M 621.5 664.5 L 675.5 664.5 L 675.5 710.5 L 621.5 710.5 Z M 621.5 664.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image434"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 960.5 372.5 L 1014.5 372.5 L 1014.5 479.5 L 960.5 479.5 Z M 876.5 372.5 L 930.5 372.5 L 930.5 479.5 L 876.5 479.5 Z M 782.5 434.5 L 836.5 434.5 L 836.5 479.5 L 782.5 479.5 Z M 1054.5 434.5 L 1108.5 434.5 L 1108.5 479.5 L 1054.5 479.5 Z M 705.5 434.5 L 759.5 434.5 L 759.5 479.5 L 705.5 479.5 Z M 1225.5 372.5 L 1279.5 372.5 L 1279.5 479.5 L 1225.5 479.5 Z M 1131.5 434.5 L 1184.5 434.5 L 1184.5 479.5 L 1131.5 479.5 Z M 621.5 434.5 L 675.5 434.5 L 675.5 479.5 L 621.5 479.5 Z M 538.5 434.5 L 591.5 434.5 L 591.5 479.5 L 538.5 479.5 Z M 341.5 426.5 L 394.5 426.5 L 394.5 507.5 L 341.5 507.5 Z M 257.5 426.5 L 310.5 426.5 L 310.5 507.5 L 257.5 507.5 Z M 1511.5 450.5 L 1565.5 450.5 L 1565.5 531.5 L 1511.5 531.5 Z M 1368.5 369.5 L 1422.5 369.5 L 1422.5 531.5 L 1368.5 531.5 Z M 1608.5 369.5 L 1661.5 369.5 L 1661.5 531.5 L 1608.5 531.5 Z M 1608.5 369.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image406"/>
+  <use xlink:href="#image435"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 226.5 322.5 L 245.5 322.5 L 245.5 340.5 L 226.5 340.5 Z M 1673.5 322.5 L 1692.5 322.5 L 1692.5 340.5 L 1673.5 340.5 Z M 1622.5 322.5 L 1640.5 322.5 L 1640.5 340.5 L 1622.5 340.5 Z M 1570.5 322.5 L 1588.5 322.5 L 1588.5 340.5 L 1570.5 340.5 Z M 1518.5 322.5 L 1537.5 322.5 L 1537.5 340.5 L 1518.5 340.5 Z M 1467.5 322.5 L 1485.5 322.5 L 1485.5 340.5 L 1467.5 340.5 Z M 1415.5 322.5 L 1433.5 322.5 L 1433.5 340.5 L 1415.5 340.5 Z M 1363.5 322.5 L 1381.5 322.5 L 1381.5 340.5 L 1363.5 340.5 Z M 1312.5 322.5 L 1330.5 322.5 L 1330.5 340.5 L 1312.5 340.5 Z M 1260.5 322.5 L 1278.5 322.5 L 1278.5 340.5 L 1260.5 340.5 Z M 1208.5 322.5 L 1226.5 322.5 L 1226.5 340.5 L 1208.5 340.5 Z M 1157.5 322.5 L 1175.5 322.5 L 1175.5 340.5 L 1157.5 340.5 Z M 1105.5 322.5 L 1123.5 322.5 L 1123.5 340.5 L 1105.5 340.5 Z M 1053.5 322.5 L 1071.5 322.5 L 1071.5 340.5 L 1053.5 340.5 Z M 1001.5 322.5 L 1020.5 322.5 L 1020.5 340.5 L 1001.5 340.5 Z M 950.5 322.5 L 968.5 322.5 L 968.5 340.5 L 950.5 340.5 Z M 898.5 322.5 L 916.5 322.5 L 916.5 340.5 L 898.5 340.5 Z M 846.5 322.5 L 865.5 322.5 L 865.5 340.5 L 846.5 340.5 Z M 795.5 322.5 L 813.5 322.5 L 813.5 340.5 L 795.5 340.5 Z M 743.5 322.5 L 761.5 322.5 L 761.5 340.5 L 743.5 340.5 Z M 691.5 322.5 L 710.5 322.5 L 710.5 340.5 L 691.5 340.5 Z M 640.5 322.5 L 658.5 322.5 L 658.5 340.5 L 640.5 340.5 Z M 588.5 322.5 L 606.5 322.5 L 606.5 340.5 L 588.5 340.5 Z M 536.5 322.5 L 555.5 322.5 L 555.5 340.5 L 536.5 340.5 Z M 485.5 322.5 L 503.5 322.5 L 503.5 340.5 L 485.5 340.5 Z M 433.5 322.5 L 451.5 322.5 L 451.5 340.5 L 433.5 340.5 Z M 381.5 322.5 L 400.5 322.5 L 400.5 340.5 L 381.5 340.5 Z M 330.5 322.5 L 348.5 322.5 L 348.5 340.5 L 330.5 340.5 Z M 278.5 322.5 L 296.5 322.5 L 296.5 340.5 L 278.5 340.5 Z M 1440.5 374.5 L 1458.5 374.5 L 1458.5 376.5 L 1440.5 376.5 Z M 1206.5 373.5 L 1224.5 373.5 L 1224.5 378.5 L 1206.5 378.5 Z M 857.5 374.5 L 876.5 374.5 L 876.5 378.5 L 857.5 378.5 Z M 1167.5 373.5 L 1186.5 373.5 L 1186.5 391.5 L 1167.5 391.5 Z M 1206.5 378.5 L 1224.5 378.5 L 1224.5 391.5 L 1206.5 391.5 Z M 1129.5 373.5 L 1147.5 373.5 L 1147.5 391.5 L 1129.5 391.5 Z M 274.5 374.5 L 293.5 374.5 L 293.5 392.5 L 274.5 392.5 Z M 313.5 374.5 L 331.5 374.5 L 331.5 392.5 L 313.5 392.5 Z M 1401.5 374.5 L 1420.5 374.5 L 1420.5 392.5 L 1401.5 392.5 Z M 1614.5 374.5 L 1632.5 374.5 L 1632.5 392.5 L 1614.5 392.5 Z M 476.5 374.5 L 494.5 374.5 L 494.5 392.5 L 476.5 392.5 Z M 514.5 374.5 L 533.5 374.5 L 533.5 392.5 L 514.5 392.5 Z M 780.5 374.5 L 798.5 374.5 L 798.5 392.5 L 780.5 392.5 Z M 1575.5 374.5 L 1594.5 374.5 L 1594.5 392.5 L 1575.5 392.5 Z M 818.5 374.5 L 837.5 374.5 L 837.5 392.5 L 818.5 392.5 Z M 857.5 378.5 L 876.5 378.5 L 876.5 392.5 L 857.5 392.5 Z M 1440.5 376.5 L 1458.5 376.5 L 1458.5 392.5 L 1440.5 392.5 Z M 1537.5 374.5 L 1555.5 374.5 L 1555.5 392.5 L 1537.5 392.5 Z M 849.5 709.5 L 867.5 709.5 L 867.5 727.5 L 849.5 727.5 Z M 1616.5 709.5 L 1634.5 709.5 L 1634.5 727.5 L 1616.5 727.5 Z M 1577.5 709.5 L 1596.5 709.5 L 1596.5 727.5 L 1577.5 727.5 Z M 1539.5 709.5 L 1557.5 709.5 L 1557.5 727.5 L 1539.5 727.5 Z M 1441.5 709.5 L 1460.5 709.5 L 1460.5 727.5 L 1441.5 727.5 Z M 1402.5 709.5 L 1421.5 709.5 L 1421.5 727.5 L 1402.5 727.5 Z M 1235.5 709.5 L 1253.5 709.5 L 1253.5 727.5 L 1235.5 727.5 Z M 1196.5 709.5 L 1215.5 709.5 L 1215.5 727.5 L 1196.5 727.5 Z M 1158.5 709.5 L 1176.5 709.5 L 1176.5 727.5 L 1158.5 727.5 Z M 357.5 709.5 L 375.5 709.5 L 375.5 727.5 L 357.5 727.5 Z M 318.5 709.5 L 337.5 709.5 L 337.5 727.5 L 318.5 727.5 Z M 280.5 709.5 L 298.5 709.5 L 298.5 727.5 L 280.5 727.5 Z M 475.5 709.5 L 493.5 709.5 L 493.5 727.5 L 475.5 727.5 Z M 436.5 709.5 L 454.5 709.5 L 454.5 727.5 L 436.5 727.5 Z M 513.5 709.5 L 532.5 709.5 L 532.5 727.5 L 513.5 727.5 Z M 810.5 709.5 L 828.5 709.5 L 828.5 727.5 L 810.5 727.5 Z M 771.5 709.5 L 789.5 709.5 L 789.5 727.5 L 771.5 727.5 Z M 226.5 760.5 L 245.5 760.5 L 245.5 779.5 L 226.5 779.5 Z M 1673.5 760.5 L 1692.5 760.5 L 1692.5 779.5 L 1673.5 779.5 Z M 1622.5 760.5 L 1640.5 760.5 L 1640.5 779.5 L 1622.5 779.5 Z M 1570.5 760.5 L 1588.5 760.5 L 1588.5 779.5 L 1570.5 779.5 Z M 1518.5 760.5 L 1537.5 760.5 L 1537.5 779.5 L 1518.5 779.5 Z M 1467.5 760.5 L 1485.5 760.5 L 1485.5 779.5 L 1467.5 779.5 Z M 1415.5 760.5 L 1433.5 760.5 L 1433.5 779.5 L 1415.5 779.5 Z M 1363.5 760.5 L 1381.5 760.5 L 1381.5 779.5 L 1363.5 779.5 Z M 1312.5 760.5 L 1330.5 760.5 L 1330.5 779.5 L 1312.5 779.5 Z M 1260.5 760.5 L 1278.5 760.5 L 1278.5 779.5 L 1260.5 779.5 Z M 1208.5 760.5 L 1226.5 760.5 L 1226.5 779.5 L 1208.5 779.5 Z M 1157.5 760.5 L 1175.5 760.5 L 1175.5 779.5 L 1157.5 779.5 Z M 1105.5 760.5 L 1123.5 760.5 L 1123.5 779.5 L 1105.5 779.5 Z M 1053.5 760.5 L 1071.5 760.5 L 1071.5 779.5 L 1053.5 779.5 Z M 1001.5 760.5 L 1020.5 760.5 L 1020.5 779.5 L 1001.5 779.5 Z M 950.5 760.5 L 968.5 760.5 L 968.5 779.5 L 950.5 779.5 Z M 898.5 760.5 L 916.5 760.5 L 916.5 779.5 L 898.5 779.5 Z M 846.5 760.5 L 865.5 760.5 L 865.5 779.5 L 846.5 779.5 Z M 795.5 760.5 L 813.5 760.5 L 813.5 779.5 L 795.5 779.5 Z M 743.5 760.5 L 761.5 760.5 L 761.5 779.5 L 743.5 779.5 Z M 691.5 760.5 L 710.5 760.5 L 710.5 779.5 L 691.5 779.5 Z M 640.5 760.5 L 658.5 760.5 L 658.5 779.5 L 640.5 779.5 Z M 588.5 760.5 L 606.5 760.5 L 606.5 779.5 L 588.5 779.5 Z M 536.5 760.5 L 555.5 760.5 L 555.5 779.5 L 536.5 779.5 Z M 485.5 760.5 L 503.5 760.5 L 503.5 779.5 L 485.5 779.5 Z M 433.5 760.5 L 451.5 760.5 L 451.5 779.5 L 433.5 779.5 Z M 381.5 760.5 L 400.5 760.5 L 400.5 779.5 L 381.5 779.5 Z M 330.5 760.5 L 348.5 760.5 L 348.5 779.5 L 330.5 779.5 Z M 278.5 760.5 L 296.5 760.5 L 296.5 779.5 L 278.5 779.5 Z M 278.5 760.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image436"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface398">
+<g id="surface427">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -243,6 +243,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1384.117188 442.710938 L 1382.667969 444.5 L 1379.425781 441.816406 L 1378.5 442.308594 L 1377.574219 442.679688 L 1376.621094 442.988281 L 1375.601562 443.203125 L 1374.582031 443.328125 L 1373.535156 443.390625 L 1372.113281 443.296875 L 1370.789062 443.082031 L 1369.554688 442.710938 L 1368.378906 442.214844 L 1367.269531 441.570312 L 1366.28125 440.734375 L 1365.386719 439.839844 L 1364.617188 438.824219 L 1364 437.710938 L 1363.476562 436.507812 L 1363.074219 435.210938 L 1362.828125 433.792969 L 1362.765625 433.453125 L 1362.734375 433.082031 L 1362.703125 432.742188 L 1362.671875 432.375 L 1362.671875 431.601562 L 1362.734375 430.058594 L 1362.949219 428.578125 L 1363.289062 427.222656 L 1363.785156 425.925781 L 1364.402344 424.722656 L 1365.203125 423.609375 L 1366.003906 422.714844 L 1366.929688 421.914062 L 1367.949219 421.234375 L 1369.027344 420.710938 L 1370.203125 420.277344 L 1371.496094 419.96875 L 1371.804688 419.9375 L 1372.144531 419.90625 L 1372.484375 419.878906 L 1372.824219 419.847656 L 1373.164062 419.847656 L 1373.535156 419.816406 L 1374.921875 419.90625 L 1376.25 420.125 L 1377.484375 420.496094 L 1378.65625 420.988281 L 1379.765625 421.636719 L 1380.785156 422.4375 L 1381.648438 423.363281 L 1382.421875 424.351562 L 1383.039062 425.429688 L 1383.5625 426.632812 L 1383.960938 427.929688 L 1384.242188 429.289062 L 1384.269531 429.6875 L 1384.363281 430.800781 L 1384.363281 431.171875 L 1384.394531 431.539062 L 1384.300781 433.269531 L 1384.023438 434.902344 L 1383.59375 436.414062 L 1382.976562 437.835938 L 1382.171875 439.132812 L 1381.214844 440.335938 Z M 1376.339844 436.355469 L 1379.085938 438.605469 L 1379.828125 437.679688 L 1380.445312 436.632812 L 1380.90625 435.488281 L 1381.246094 434.285156 L 1381.433594 432.992188 L 1381.523438 431.570312 L 1381.464844 430.277344 L 1381.277344 429.042969 L 1380.96875 427.898438 L 1380.570312 426.851562 L 1380.042969 425.863281 L 1379.394531 424.96875 L 1378.65625 424.226562 L 1377.882812 423.609375 L 1377.019531 423.117188 L 1376.09375 422.746094 L 1375.078125 422.5 L 1374.027344 422.347656 L 1373.535156 422.347656 L 1372.421875 422.4375 L 1371.375 422.625 L 1370.386719 422.933594 L 1369.492188 423.394531 L 1368.660156 423.980469 L 1367.917969 424.691406 L 1367.207031 425.523438 L 1366.652344 426.449219 L 1366.191406 427.46875 L 1365.851562 428.578125 L 1365.632812 429.78125 L 1365.542969 431.078125 L 1365.542969 431.601562 L 1365.574219 432.960938 L 1365.757812 434.195312 L 1366.066406 435.335938 L 1366.46875 436.414062 L 1367.023438 437.402344 L 1367.703125 438.265625 L 1368.410156 439.039062 L 1369.214844 439.65625 L 1370.078125 440.148438 L 1371.003906 440.488281 L 1372.023438 440.734375 L 1373.101562 440.828125 L 1373.164062 440.859375 L 1374.058594 440.859375 L 1374.644531 440.796875 L 1375.230469 440.675781 L 1375.785156 440.550781 L 1376.339844 440.367188 L 1376.929688 440.117188 L 1376.957031 440.117188 L 1377.019531 440.085938 L 1377.050781 440.058594 L 1377.113281 440.058594 L 1377.144531 440.027344 L 1377.207031 439.996094 L 1374.921875 438.082031 Z M 1376.339844 436.355469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1363 657 L 1381 657 M 1363 639 L 1381 639 M 1363 639 L 1363 657 M 1381 639 L 1381 657 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1363 657 L 1381 657 M 1363 639 L 1381 639 M 1381 657 L 1381 639 M 1363 657 L 1363 639 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 210 305 L 210 314 M 205 310 L 214 310 M 209 311 L 211 311 M 209 309 L 211 309 M 209 309 L 209 311 M 211 309 L 211 311 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.svg b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.svg
index 3af74d0..6344f7a 100644
--- a/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.svg
+++ b/cells/dfxtp/sky130_fd_sc_hvl__dfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 249.5 L 1744.5 249.5 L 1744.5 572.5 L 174.5 572.5 Z M 174.5 249.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 215.5 290.5 L 1703.5 290.5 L 1703.5 311.5 L 215.5 311.5 Z M 215.5 290.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 215.5 290.5 L 1703.5 290.5 L 1703.5 311.5 L 215.5 311.5 Z M 1554.5 625.5 L 1684.5 625.5 L 1684.5 630.5 L 1554.5 630.5 Z M 1385.5 642.5 L 1516.5 642.5 L 1516.5 651.5 L 1385.5 651.5 Z M 1554.5 630.5 L 1684.5 630.5 L 1684.5 651.5 L 1554.5 651.5 Z M 1385.5 651.5 L 1516.5 651.5 L 1516.5 672.5 L 1385.5 672.5 Z M 946.5 642.5 L 1089.5 642.5 L 1089.5 683.5 L 946.5 683.5 Z M 1385.5 672.5 L 1516.5 672.5 L 1516.5 683.5 L 1385.5 683.5 Z M 234.5 675.5 L 463.5 675.5 L 463.5 690.5 L 234.5 690.5 Z M 1554.5 651.5 L 1684.5 651.5 L 1684.5 692.5 L 1554.5 692.5 Z M 515.5 683.5 L 1516.5 683.5 L 1516.5 699.5 L 515.5 699.5 Z M 234.5 690.5 L 463.5 690.5 L 463.5 711.5 L 234.5 711.5 Z M 1554.5 692.5 L 1684.5 692.5 L 1684.5 713.5 L 1554.5 713.5 Z M 1554.5 713.5 L 1684.5 713.5 L 1684.5 718.5 L 1554.5 718.5 Z M 515.5 699.5 L 1516.5 699.5 L 1516.5 720.5 L 515.5 720.5 Z M 234.5 711.5 L 463.5 711.5 L 463.5 727.5 L 234.5 727.5 Z M 515.5 720.5 L 1516.5 720.5 L 1516.5 735.5 L 515.5 735.5 Z M 515.5 720.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 215.5 795.5 L 1703.5 795.5 L 1703.5 816.5 L 215.5 816.5 Z M 215.5 795.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 926.5 345.5 L 958.5 345.5 L 958.5 352.5 L 926.5 352.5 Z M 1557.5 345.5 L 1589.5 345.5 L 1589.5 352.5 L 1557.5 352.5 Z M 1485.5 345.5 L 1517.5 345.5 L 1517.5 352.5 L 1485.5 352.5 Z M 1651.5 345.5 L 1684.5 345.5 L 1684.5 352.5 L 1651.5 352.5 Z M 1117.5 345.5 L 1213.5 345.5 L 1213.5 352.5 L 1117.5 352.5 Z M 1390.5 345.5 L 1423.5 345.5 L 1423.5 352.5 L 1390.5 352.5 Z M 329.5 366.5 L 363.5 366.5 L 363.5 371.5 L 329.5 371.5 Z M 1390.5 352.5 L 1423.5 352.5 L 1423.5 373.5 L 1390.5 373.5 Z M 1485.5 352.5 L 1517.5 352.5 L 1517.5 373.5 L 1485.5 373.5 Z M 1557.5 352.5 L 1589.5 352.5 L 1589.5 373.5 L 1557.5 373.5 Z M 1651.5 352.5 L 1684.5 352.5 L 1684.5 373.5 L 1651.5 373.5 Z M 425.5 366.5 L 458.5 366.5 L 458.5 373.5 L 425.5 373.5 Z M 234.5 366.5 L 267.5 366.5 L 267.5 373.5 L 234.5 373.5 Z M 926.5 352.5 L 958.5 352.5 L 958.5 373.5 L 926.5 373.5 Z M 1117.5 352.5 L 1213.5 352.5 L 1213.5 373.5 L 1117.5 373.5 Z M 329.5 371.5 L 363.5 371.5 L 363.5 392.5 L 329.5 392.5 Z M 234.5 373.5 L 267.5 373.5 L 267.5 394.5 L 234.5 394.5 Z M 425.5 373.5 L 458.5 373.5 L 458.5 394.5 L 425.5 394.5 Z M 1485.5 373.5 L 1517.5 373.5 L 1517.5 396.5 L 1485.5 396.5 Z M 1390.5 373.5 L 1423.5 373.5 L 1423.5 396.5 L 1390.5 396.5 Z M 1117.5 373.5 L 1213.5 373.5 L 1213.5 396.5 L 1117.5 396.5 Z M 1651.5 373.5 L 1684.5 373.5 L 1684.5 402.5 L 1651.5 402.5 Z M 1557.5 373.5 L 1589.5 373.5 L 1589.5 402.5 L 1557.5 402.5 Z M 606.5 398.5 L 637.5 398.5 L 637.5 404.5 L 606.5 404.5 Z M 699.5 398.5 L 748.5 398.5 L 748.5 417.5 L 699.5 417.5 Z M 1485.5 396.5 L 1517.5 396.5 L 1517.5 417.5 L 1485.5 417.5 Z M 926.5 373.5 L 958.5 373.5 L 958.5 417.5 L 926.5 417.5 Z M 1390.5 396.5 L 1423.5 396.5 L 1423.5 417.5 L 1390.5 417.5 Z M 1117.5 396.5 L 1213.5 396.5 L 1213.5 417.5 L 1117.5 417.5 Z M 495.5 404.5 L 528.5 404.5 L 528.5 420.5 L 495.5 420.5 Z M 590.5 404.5 L 637.5 404.5 L 637.5 423.5 L 590.5 423.5 Z M 1651.5 402.5 L 1684.5 402.5 L 1684.5 423.5 L 1651.5 423.5 Z M 1557.5 402.5 L 1589.5 402.5 L 1589.5 423.5 L 1557.5 423.5 Z M 234.5 394.5 L 267.5 394.5 L 267.5 430.5 L 234.5 430.5 Z M 425.5 394.5 L 458.5 394.5 L 458.5 430.5 L 425.5 430.5 Z M 329.5 392.5 L 363.5 392.5 L 363.5 433.5 L 329.5 433.5 Z M 1485.5 417.5 L 1517.5 417.5 L 1517.5 440.5 L 1485.5 440.5 Z M 1117.5 417.5 L 1226.5 417.5 L 1226.5 440.5 L 1117.5 440.5 Z M 1376.5 417.5 L 1423.5 417.5 L 1423.5 440.5 L 1376.5 440.5 Z M 1020.5 345.5 L 1055.5 345.5 L 1055.5 441.5 L 1020.5 441.5 Z M 699.5 417.5 L 762.5 417.5 L 762.5 441.5 L 699.5 441.5 Z M 495.5 420.5 L 528.5 420.5 L 528.5 441.5 L 495.5 441.5 Z M 590.5 423.5 L 637.5 423.5 L 637.5 444.5 L 590.5 444.5 Z M 699.5 441.5 L 762.5 441.5 L 762.5 450.5 L 699.5 450.5 Z M 590.5 444.5 L 637.5 444.5 L 637.5 450.5 L 590.5 450.5 Z M 425.5 430.5 L 458.5 430.5 L 458.5 451.5 L 425.5 451.5 Z M 234.5 430.5 L 267.5 430.5 L 267.5 451.5 L 234.5 451.5 Z M 1557.5 423.5 L 1589.5 423.5 L 1589.5 453.5 L 1557.5 453.5 Z M 1651.5 423.5 L 1684.5 423.5 L 1684.5 453.5 L 1651.5 453.5 Z M 329.5 433.5 L 363.5 433.5 L 363.5 454.5 L 329.5 454.5 Z M 590.5 450.5 L 623.5 450.5 L 623.5 456.5 L 590.5 456.5 Z M 495.5 441.5 L 528.5 441.5 L 528.5 456.5 L 495.5 456.5 Z M 234.5 451.5 L 267.5 451.5 L 267.5 459.5 L 234.5 459.5 Z M 329.5 454.5 L 363.5 454.5 L 363.5 459.5 L 329.5 459.5 Z M 425.5 451.5 L 458.5 451.5 L 458.5 459.5 L 425.5 459.5 Z M 1117.5 440.5 L 1226.5 440.5 L 1226.5 461.5 L 1117.5 461.5 Z M 1485.5 440.5 L 1517.5 440.5 L 1517.5 461.5 L 1485.5 461.5 Z M 1376.5 440.5 L 1423.5 440.5 L 1423.5 461.5 L 1376.5 461.5 Z M 712.5 450.5 L 762.5 450.5 L 762.5 462.5 L 712.5 462.5 Z M 1020.5 441.5 L 1055.5 441.5 L 1055.5 462.5 L 1020.5 462.5 Z M 824.5 417.5 L 850.5 417.5 L 850.5 469.5 L 824.5 469.5 Z M 1117.5 461.5 L 1226.5 461.5 L 1226.5 469.5 L 1117.5 469.5 Z M 1288.5 417.5 L 1314.5 417.5 L 1314.5 469.5 L 1288.5 469.5 Z M 1020.5 462.5 L 1055.5 462.5 L 1055.5 469.5 L 1020.5 469.5 Z M 712.5 462.5 L 762.5 462.5 L 762.5 469.5 L 712.5 469.5 Z M 1376.5 461.5 L 1423.5 461.5 L 1423.5 469.5 L 1376.5 469.5 Z M 1485.5 461.5 L 1517.5 461.5 L 1517.5 469.5 L 1485.5 469.5 Z M 912.5 417.5 L 958.5 417.5 L 958.5 469.5 L 912.5 469.5 Z M 1557.5 453.5 L 1589.5 453.5 L 1589.5 474.5 L 1557.5 474.5 Z M 1651.5 453.5 L 1684.5 453.5 L 1684.5 474.5 L 1651.5 474.5 Z M 1651.5 474.5 L 1684.5 474.5 L 1684.5 502.5 L 1651.5 502.5 Z M 1557.5 474.5 L 1589.5 474.5 L 1589.5 502.5 L 1557.5 502.5 Z M 1651.5 502.5 L 1684.5 502.5 L 1684.5 523.5 L 1651.5 523.5 Z M 1557.5 502.5 L 1589.5 502.5 L 1589.5 523.5 L 1557.5 523.5 Z M 1651.5 523.5 L 1684.5 523.5 L 1684.5 531.5 L 1651.5 531.5 Z M 1557.5 523.5 L 1589.5 523.5 L 1589.5 531.5 L 1557.5 531.5 Z M 215.5 795.5 L 1703.5 795.5 L 1703.5 816.5 L 215.5 816.5 Z M 215.5 795.5 "/>
 </clipPath>
-<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image386"/>
+  <use xlink:href="#image414"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1589.5 625.5 L 1651.5 625.5 L 1651.5 718.5 L 1589.5 718.5 Z M 366.5 675.5 L 428.5 675.5 L 428.5 727.5 L 366.5 727.5 Z M 269.5 675.5 L 331.5 675.5 L 331.5 727.5 L 269.5 727.5 Z M 1287.5 683.5 L 1349.5 683.5 L 1349.5 735.5 L 1287.5 735.5 Z M 1199.5 683.5 L 1261.5 683.5 L 1261.5 735.5 L 1199.5 735.5 Z M 1102.5 683.5 L 1164.5 683.5 L 1164.5 735.5 L 1102.5 735.5 Z M 782.5 683.5 L 844.5 683.5 L 844.5 735.5 L 782.5 735.5 Z M 870.5 683.5 L 932.5 683.5 L 932.5 735.5 L 870.5 735.5 Z M 662.5 683.5 L 724.5 683.5 L 724.5 735.5 L 662.5 735.5 Z M 991.5 642.5 L 1053.5 642.5 L 1053.5 735.5 L 991.5 735.5 Z M 1418.5 642.5 L 1480.5 642.5 L 1480.5 735.5 L 1418.5 735.5 Z M 550.5 683.5 L 612.5 683.5 L 612.5 735.5 L 550.5 735.5 Z M 550.5 683.5 "/>
 </clipPath>
-<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image387"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 637.5 398.5 L 699.5 398.5 L 699.5 450.5 L 637.5 450.5 Z M 528.5 404.5 L 590.5 404.5 L 590.5 456.5 L 528.5 456.5 Z M 363.5 366.5 L 425.5 366.5 L 425.5 459.5 L 363.5 459.5 Z M 267.5 366.5 L 329.5 366.5 L 329.5 459.5 L 267.5 459.5 Z M 1226.5 417.5 L 1288.5 417.5 L 1288.5 469.5 L 1226.5 469.5 Z M 850.5 417.5 L 912.5 417.5 L 912.5 469.5 L 850.5 469.5 Z M 762.5 417.5 L 824.5 417.5 L 824.5 469.5 L 762.5 469.5 Z M 1423.5 345.5 L 1485.5 345.5 L 1485.5 469.5 L 1423.5 469.5 Z M 958.5 345.5 L 1020.5 345.5 L 1020.5 469.5 L 958.5 469.5 Z M 1055.5 345.5 L 1117.5 345.5 L 1117.5 469.5 L 1055.5 469.5 Z M 1314.5 417.5 L 1376.5 417.5 L 1376.5 469.5 L 1314.5 469.5 Z M 1589.5 345.5 L 1651.5 345.5 L 1651.5 531.5 L 1589.5 531.5 Z M 1589.5 345.5 "/>
 </clipPath>
-<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image388"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 235.5 290.5 L 256.5 290.5 L 256.5 311.5 L 235.5 311.5 Z M 1662.5 290.5 L 1684.5 290.5 L 1684.5 311.5 L 1662.5 311.5 Z M 1603.5 290.5 L 1624.5 290.5 L 1624.5 311.5 L 1603.5 311.5 Z M 1544.5 290.5 L 1565.5 290.5 L 1565.5 311.5 L 1544.5 311.5 Z M 1484.5 290.5 L 1505.5 290.5 L 1505.5 311.5 L 1484.5 311.5 Z M 1425.5 290.5 L 1446.5 290.5 L 1446.5 311.5 L 1425.5 311.5 Z M 1365.5 290.5 L 1386.5 290.5 L 1386.5 311.5 L 1365.5 311.5 Z M 1306.5 290.5 L 1327.5 290.5 L 1327.5 311.5 L 1306.5 311.5 Z M 1246.5 290.5 L 1267.5 290.5 L 1267.5 311.5 L 1246.5 311.5 Z M 1187.5 290.5 L 1208.5 290.5 L 1208.5 311.5 L 1187.5 311.5 Z M 1127.5 290.5 L 1148.5 290.5 L 1148.5 311.5 L 1127.5 311.5 Z M 1068.5 290.5 L 1089.5 290.5 L 1089.5 311.5 L 1068.5 311.5 Z M 1008.5 290.5 L 1029.5 290.5 L 1029.5 311.5 L 1008.5 311.5 Z M 949.5 290.5 L 970.5 290.5 L 970.5 311.5 L 949.5 311.5 Z M 889.5 290.5 L 910.5 290.5 L 910.5 311.5 L 889.5 311.5 Z M 830.5 290.5 L 851.5 290.5 L 851.5 311.5 L 830.5 311.5 Z M 770.5 290.5 L 791.5 290.5 L 791.5 311.5 L 770.5 311.5 Z M 711.5 290.5 L 732.5 290.5 L 732.5 311.5 L 711.5 311.5 Z M 651.5 290.5 L 672.5 290.5 L 672.5 311.5 L 651.5 311.5 Z M 592.5 290.5 L 613.5 290.5 L 613.5 311.5 L 592.5 311.5 Z M 532.5 290.5 L 553.5 290.5 L 553.5 311.5 L 532.5 311.5 Z M 473.5 290.5 L 494.5 290.5 L 494.5 311.5 L 473.5 311.5 Z M 413.5 290.5 L 434.5 290.5 L 434.5 311.5 L 413.5 311.5 Z M 354.5 290.5 L 375.5 290.5 L 375.5 311.5 L 354.5 311.5 Z M 294.5 290.5 L 315.5 290.5 L 315.5 311.5 L 294.5 311.5 Z M 937.5 349.5 L 958.5 349.5 L 958.5 352.5 L 937.5 352.5 Z M 1548.5 350.5 L 1570.5 350.5 L 1570.5 352.5 L 1548.5 352.5 Z M 1401.5 350.5 L 1422.5 350.5 L 1422.5 352.5 L 1401.5 352.5 Z M 892.5 349.5 L 913.5 349.5 L 913.5 370.5 L 892.5 370.5 Z M 848.5 349.5 L 869.5 349.5 L 869.5 370.5 L 848.5 370.5 Z M 937.5 352.5 L 958.5 352.5 L 958.5 370.5 L 937.5 370.5 Z M 1312.5 350.5 L 1333.5 350.5 L 1333.5 371.5 L 1312.5 371.5 Z M 1593.5 350.5 L 1614.5 350.5 L 1614.5 371.5 L 1593.5 371.5 Z M 1356.5 350.5 L 1377.5 350.5 L 1377.5 371.5 L 1356.5 371.5 Z M 494.5 350.5 L 515.5 350.5 L 515.5 371.5 L 494.5 371.5 Z M 1401.5 352.5 L 1422.5 352.5 L 1422.5 371.5 L 1401.5 371.5 Z M 331.5 350.5 L 352.5 350.5 L 352.5 371.5 L 331.5 371.5 Z M 375.5 350.5 L 396.5 350.5 L 396.5 371.5 L 375.5 371.5 Z M 1548.5 352.5 L 1570.5 352.5 L 1570.5 371.5 L 1548.5 371.5 Z M 286.5 350.5 L 307.5 350.5 L 307.5 371.5 L 286.5 371.5 Z M 535.5 735.5 L 556.5 735.5 L 556.5 756.5 L 535.5 756.5 Z M 1589.5 735.5 L 1610.5 735.5 L 1610.5 756.5 L 1589.5 756.5 Z M 1544.5 735.5 L 1565.5 735.5 L 1565.5 756.5 L 1544.5 756.5 Z M 1397.5 735.5 L 1418.5 735.5 L 1418.5 756.5 L 1397.5 756.5 Z M 1352.5 735.5 L 1373.5 735.5 L 1373.5 756.5 L 1352.5 756.5 Z M 1307.5 735.5 L 1328.5 735.5 L 1328.5 756.5 L 1307.5 756.5 Z M 333.5 735.5 L 354.5 735.5 L 354.5 756.5 L 333.5 756.5 Z M 288.5 735.5 L 310.5 735.5 L 310.5 756.5 L 288.5 756.5 Z M 490.5 735.5 L 511.5 735.5 L 511.5 756.5 L 490.5 756.5 Z M 378.5 735.5 L 399.5 735.5 L 399.5 756.5 L 378.5 756.5 Z M 960.5 735.5 L 981.5 735.5 L 981.5 756.5 L 960.5 756.5 Z M 915.5 735.5 L 936.5 735.5 L 936.5 756.5 L 915.5 756.5 Z M 870.5 735.5 L 892.5 735.5 L 892.5 756.5 L 870.5 756.5 Z M 235.5 795.5 L 256.5 795.5 L 256.5 816.5 L 235.5 816.5 Z M 1662.5 795.5 L 1684.5 795.5 L 1684.5 816.5 L 1662.5 816.5 Z M 1603.5 795.5 L 1624.5 795.5 L 1624.5 816.5 L 1603.5 816.5 Z M 1544.5 795.5 L 1565.5 795.5 L 1565.5 816.5 L 1544.5 816.5 Z M 1484.5 795.5 L 1505.5 795.5 L 1505.5 816.5 L 1484.5 816.5 Z M 1425.5 795.5 L 1446.5 795.5 L 1446.5 816.5 L 1425.5 816.5 Z M 1365.5 795.5 L 1386.5 795.5 L 1386.5 816.5 L 1365.5 816.5 Z M 1306.5 795.5 L 1327.5 795.5 L 1327.5 816.5 L 1306.5 816.5 Z M 1246.5 795.5 L 1267.5 795.5 L 1267.5 816.5 L 1246.5 816.5 Z M 1187.5 795.5 L 1208.5 795.5 L 1208.5 816.5 L 1187.5 816.5 Z M 1127.5 795.5 L 1148.5 795.5 L 1148.5 816.5 L 1127.5 816.5 Z M 1068.5 795.5 L 1089.5 795.5 L 1089.5 816.5 L 1068.5 816.5 Z M 1008.5 795.5 L 1029.5 795.5 L 1029.5 816.5 L 1008.5 816.5 Z M 949.5 795.5 L 970.5 795.5 L 970.5 816.5 L 949.5 816.5 Z M 889.5 795.5 L 910.5 795.5 L 910.5 816.5 L 889.5 816.5 Z M 830.5 795.5 L 851.5 795.5 L 851.5 816.5 L 830.5 816.5 Z M 770.5 795.5 L 791.5 795.5 L 791.5 816.5 L 770.5 816.5 Z M 711.5 795.5 L 732.5 795.5 L 732.5 816.5 L 711.5 816.5 Z M 651.5 795.5 L 672.5 795.5 L 672.5 816.5 L 651.5 816.5 Z M 592.5 795.5 L 613.5 795.5 L 613.5 816.5 L 592.5 816.5 Z M 532.5 795.5 L 553.5 795.5 L 553.5 816.5 L 532.5 816.5 Z M 473.5 795.5 L 494.5 795.5 L 494.5 816.5 L 473.5 816.5 Z M 413.5 795.5 L 434.5 795.5 L 434.5 816.5 L 413.5 816.5 Z M 354.5 795.5 L 375.5 795.5 L 375.5 816.5 L 354.5 816.5 Z M 294.5 795.5 L 315.5 795.5 L 315.5 816.5 L 294.5 816.5 Z M 294.5 795.5 "/>
 </clipPath>
-<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image389"/>
+  <use xlink:href="#image417"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface380">
+<g id="surface408">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -223,6 +223,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1687.230469 429.386719 L 1685.515625 431.5 L 1681.6875 428.328125 L 1680.59375 428.910156 L 1679.5 429.347656 L 1678.367188 429.714844 L 1677.164062 429.96875 L 1675.960938 430.113281 L 1674.722656 430.1875 L 1673.042969 430.078125 L 1671.476562 429.824219 L 1670.015625 429.386719 L 1668.632812 428.800781 L 1667.320312 428.035156 L 1666.152344 427.050781 L 1665.09375 425.992188 L 1664.183594 424.789062 L 1663.453125 423.476562 L 1662.832031 422.054688 L 1662.359375 420.523438 L 1662.066406 418.847656 L 1661.996094 418.445312 L 1661.957031 418.007812 L 1661.921875 417.605469 L 1661.886719 417.167969 L 1661.886719 416.257812 L 1661.957031 414.433594 L 1662.214844 412.683594 L 1662.613281 411.078125 L 1663.199219 409.546875 L 1663.929688 408.125 L 1664.875 406.8125 L 1665.824219 405.753906 L 1666.917969 404.808594 L 1668.121094 404.003906 L 1669.398438 403.386719 L 1670.785156 402.875 L 1672.316406 402.511719 L 1672.679688 402.472656 L 1673.082031 402.4375 L 1673.480469 402.402344 L 1673.882812 402.363281 L 1674.285156 402.363281 L 1674.722656 402.328125 L 1676.363281 402.4375 L 1677.929688 402.691406 L 1679.390625 403.128906 L 1680.773438 403.714844 L 1682.085938 404.480469 L 1683.292969 405.425781 L 1684.3125 406.519531 L 1685.222656 407.6875 L 1685.953125 408.964844 L 1686.574219 410.386719 L 1687.046875 411.917969 L 1687.375 413.523438 L 1687.410156 413.996094 L 1687.449219 414.433594 L 1687.519531 415.308594 L 1687.519531 415.746094 L 1687.558594 416.183594 L 1687.449219 418.226562 L 1687.121094 420.160156 L 1686.609375 421.945312 L 1685.878906 423.625 L 1684.933594 425.15625 L 1683.800781 426.578125 Z M 1678.039062 421.875 L 1681.285156 424.535156 L 1682.160156 423.441406 L 1682.890625 422.203125 L 1683.4375 420.851562 L 1683.839844 419.429688 L 1684.058594 417.898438 L 1684.167969 416.222656 L 1684.09375 414.6875 L 1683.875 413.230469 L 1683.511719 411.882812 L 1683.035156 410.640625 L 1682.414062 409.476562 L 1681.648438 408.417969 L 1680.773438 407.542969 L 1679.863281 406.8125 L 1678.84375 406.230469 L 1677.75 405.792969 L 1676.542969 405.5 L 1675.304688 405.316406 L 1674.722656 405.316406 L 1673.410156 405.425781 L 1672.167969 405.644531 L 1671.003906 406.011719 L 1669.945312 406.558594 L 1668.960938 407.25 L 1668.085938 408.089844 L 1667.246094 409.074219 L 1666.589844 410.167969 L 1666.042969 411.371094 L 1665.640625 412.683594 L 1665.386719 414.105469 L 1665.277344 415.636719 L 1665.277344 416.257812 L 1665.3125 417.863281 L 1665.53125 419.320312 L 1665.898438 420.667969 L 1666.371094 421.945312 L 1667.027344 423.113281 L 1667.828125 424.132812 L 1668.667969 425.046875 L 1669.617188 425.773438 L 1670.636719 426.359375 L 1671.730469 426.757812 L 1672.933594 427.050781 L 1674.210938 427.160156 L 1674.285156 427.195312 L 1675.339844 427.195312 L 1676.035156 427.125 L 1676.726562 426.976562 L 1677.382812 426.832031 L 1678.039062 426.613281 L 1678.734375 426.320312 L 1678.769531 426.320312 L 1678.84375 426.285156 L 1678.878906 426.25 L 1678.953125 426.25 L 1678.988281 426.210938 L 1679.0625 426.175781 L 1676.363281 423.914062 Z M 1678.039062 421.875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1662 674 L 1684 674 M 1662 653 L 1684 653 M 1662 653 L 1662 674 M 1684 653 L 1684 674 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1662 674 L 1684 674 M 1662 653 L 1684 653 M 1684 674 L 1684 653 M 1662 674 L 1662 653 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 215 269 L 215 278 M 210 274 L 219 274 M 214 275 L 216 275 M 214 273 L 216 273 M 214 273 L 214 275 M 216 273 L 216 275 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/diode/sky130_fd_sc_hvl__diode_2.svg b/cells/diode/sky130_fd_sc_hvl__diode_2.svg
index 62d151d..ca13e98 100644
--- a/cells/diode/sky130_fd_sc_hvl__diode_2.svg
+++ b/cells/diode/sky130_fd_sc_hvl__diode_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 811.5 98.5 L 1120.5 98.5 L 1120.5 593.5 L 811.5 593.5 Z M 811.5 98.5 "/>
 </clipPath>
-<image id="image507" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image543" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image507"/>
+  <use xlink:href="#image543"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -20,9 +20,9 @@
 <clipPath id="clip4">
   <path d="M 874.5 161.5 L 1057.5 161.5 L 1057.5 193.5 L 874.5 193.5 Z M 874.5 161.5 "/>
 </clipPath>
-<image id="image508" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image544" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image508"/>
+  <use xlink:href="#image544"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -30,9 +30,9 @@
 <clipPath id="clip5">
   <path d="M 874.5 161.5 L 1057.5 161.5 L 1057.5 193.5 L 874.5 193.5 Z M 903.5 675.5 L 1028.5 675.5 L 1028.5 686.5 L 903.5 686.5 Z M 903.5 686.5 L 1028.5 686.5 L 1028.5 718.5 L 903.5 718.5 Z M 903.5 718.5 L 1028.5 718.5 L 1028.5 806.5 L 903.5 806.5 Z M 903.5 806.5 L 1028.5 806.5 L 1028.5 838.5 L 903.5 838.5 Z M 903.5 838.5 L 1028.5 838.5 L 1028.5 850.5 L 903.5 850.5 Z M 903.5 838.5 "/>
 </clipPath>
-<image id="image509" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image545" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image509"/>
+  <use xlink:href="#image545"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -41,14 +41,14 @@
   <path d="M 874.5 935.5 L 1057.5 935.5 L 1057.5 968.5 L 874.5 968.5 Z M 874.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image508"/>
+  <use xlink:href="#image544"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
-<image id="image510" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image546" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image510"/>
+  <use xlink:href="#image546"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -56,9 +56,9 @@
 <clipPath id="clip7">
   <path d="M 903.5 675.5 L 1028.5 675.5 L 1028.5 686.5 L 903.5 686.5 Z M 903.5 686.5 L 1028.5 686.5 L 1028.5 718.5 L 903.5 718.5 Z M 903.5 718.5 L 1028.5 718.5 L 1028.5 806.5 L 903.5 806.5 Z M 903.5 806.5 L 1028.5 806.5 L 1028.5 838.5 L 903.5 838.5 Z M 903.5 838.5 L 1028.5 838.5 L 1028.5 850.5 L 903.5 850.5 Z M 903.5 838.5 "/>
 </clipPath>
-<image id="image511" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAlSURBVDiN3cohAQAwDASx+De9SejjQyEBPG2Nr67x1TW+uq73AQuJf4EmKJrNAAAAAElFTkSuQmCC"/>
+<image id="image547" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAlSURBVDiN3cohAQAwDASx+De9SejjQyEBPG2Nr67x1TW+uq73AQuJf4EmKJrNAAAAAElFTkSuQmCC"/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image511"/>
+  <use xlink:href="#image547"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -72,15 +72,15 @@
 <clipPath id="clip10">
   <path d="M 904.5 161.5 L 936.5 161.5 L 936.5 193.5 L 904.5 193.5 Z M 995.5 161.5 L 1027.5 161.5 L 1027.5 193.5 L 995.5 193.5 Z M 904.5 935.5 L 936.5 935.5 L 936.5 968.5 L 904.5 968.5 Z M 995.5 935.5 L 1027.5 935.5 L 1027.5 968.5 L 995.5 968.5 Z M 995.5 935.5 "/>
 </clipPath>
-<image id="image512" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image548" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image512"/>
+  <use xlink:href="#image548"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface504">
+<g id="surface540">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -247,6 +247,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1021.175781 197.832031 L 1021.066406 199.625 L 1020.785156 201.253906 L 1020.28125 202.769531 L 1019.605469 204.113281 L 1018.707031 205.40625 L 1017.644531 206.527344 L 1016.464844 207.480469 L 1015.230469 208.210938 L 1013.828125 208.769531 L 1012.371094 209.21875 L 1010.796875 209.445312 L 1009.117188 209.5 L 990.660156 209.5 L 990.660156 168.601562 L 1007.265625 168.601562 L 1009.675781 168.769531 L 1011.808594 169.164062 L 1013.714844 169.835938 L 1015.34375 170.789062 L 1016.746094 172.023438 L 1017.867188 173.539062 L 1018.316406 174.378906 L 1018.707031 175.277344 L 1018.988281 176.121094 L 1019.214844 177.074219 L 1019.324219 178.027344 L 1019.382812 178.980469 L 1019.214844 181 L 1018.707031 182.738281 L 1017.921875 184.367188 L 1016.800781 185.714844 L 1015.398438 186.949219 L 1013.714844 187.902344 L 1015.34375 188.628906 L 1016.746094 189.414062 L 1017.980469 190.3125 L 1018.988281 191.324219 L 1019.773438 192.390625 L 1020.390625 193.511719 L 1020.617188 194.183594 L 1020.785156 194.859375 L 1020.953125 195.53125 L 1021.066406 196.316406 L 1021.121094 197.046875 Z M 1014.164062 179.710938 L 1013.996094 178.027344 L 1013.492188 176.625 L 1012.707031 175.390625 L 1011.585938 174.492188 L 1010.179688 173.820312 L 1008.441406 173.371094 L 1008.050781 173.371094 L 1007.65625 173.316406 L 1007.265625 173.257812 L 1006.367188 173.257812 L 1005.972656 173.203125 L 995.875 173.203125 L 995.875 186.21875 L 1005.972656 186.21875 L 1008.050781 186.105469 L 1009.84375 185.769531 L 1011.359375 185.152344 L 1012.480469 184.3125 L 1013.378906 183.1875 L 1013.941406 181.84375 L 1013.996094 181.5625 L 1014.050781 181.226562 L 1014.109375 180.886719 L 1014.109375 180.101562 Z M 1008.609375 204.898438 L 1010.179688 204.84375 L 1011.585938 204.507812 L 1012.820312 203.945312 L 1013.828125 203.214844 L 1014.667969 202.261719 L 1015.34375 201.085938 L 1015.511719 200.636719 L 1015.625 200.132812 L 1015.792969 199.570312 L 1015.847656 199.066406 L 1015.902344 198.503906 L 1015.960938 197.886719 L 1015.847656 196.652344 L 1015.625 195.476562 L 1015.230469 194.464844 L 1014.667969 193.511719 L 1013.941406 192.726562 L 1013.097656 191.996094 L 1012.480469 191.660156 L 1011.808594 191.378906 L 1011.078125 191.15625 L 1010.292969 190.988281 L 1009.453125 190.875 L 1008.609375 190.820312 L 995.875 190.820312 L 995.875 204.898438 Z M 1008.609375 204.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 966 886 L 966 893 M 962 890 L 969 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 966 890 L 966 890 M 966 890 L 966 890 M 966 890 L 966 890 M 966 890 L 966 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 874 122 L 874 131 M 869 127 L 878 127 M 873 128 L 875 128 M 873 126 L 875 126 M 873 126 L 873 128 M 875 126 L 875 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.svg b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.svg
index 3a5e2ef..bb7981e 100644
--- a/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.svg
+++ b/cells/dlclkp/sky130_fd_sc_hvl__dlclkp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 199.5 L 1743.5 199.5 L 1743.5 579.5 L 174.5 579.5 Z M 174.5 199.5 "/>
 </clipPath>
-<image id="image531" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image558" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image531"/>
+  <use xlink:href="#image558"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 222.5 247.5 L 1695.5 247.5 L 1695.5 272.5 L 222.5 272.5 Z M 222.5 247.5 "/>
 </clipPath>
-<image id="image532" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image559" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image532"/>
+  <use xlink:href="#image559"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 222.5 247.5 L 1695.5 247.5 L 1695.5 272.5 L 222.5 272.5 Z M 1509.5 666.5 L 1660.5 666.5 L 1660.5 668.5 L 1509.5 668.5 Z M 1273.5 668.5 L 1660.5 668.5 L 1660.5 688.5 L 1273.5 688.5 Z M 244.5 677.5 L 508.5 677.5 L 508.5 695.5 L 244.5 695.5 Z M 861.5 677.5 L 1229.5 677.5 L 1229.5 695.5 L 861.5 695.5 Z M 1273.5 688.5 L 1660.5 688.5 L 1660.5 713.5 L 1273.5 713.5 Z M 552.5 696.5 L 817.5 696.5 L 817.5 715.5 L 552.5 715.5 Z M 244.5 695.5 L 508.5 695.5 L 508.5 720.5 L 244.5 720.5 Z M 861.5 695.5 L 1229.5 695.5 L 1229.5 720.5 L 861.5 720.5 Z M 1273.5 713.5 L 1660.5 713.5 L 1660.5 729.5 L 1273.5 729.5 Z M 244.5 720.5 L 508.5 720.5 L 508.5 738.5 L 244.5 738.5 Z M 861.5 720.5 L 1229.5 720.5 L 1229.5 738.5 L 861.5 738.5 Z M 552.5 715.5 L 817.5 715.5 L 817.5 740.5 L 552.5 740.5 Z M 1509.5 729.5 L 1660.5 729.5 L 1660.5 742.5 L 1509.5 742.5 Z M 552.5 740.5 L 817.5 740.5 L 817.5 758.5 L 552.5 758.5 Z M 1509.5 742.5 L 1660.5 742.5 L 1660.5 767.5 L 1509.5 767.5 Z M 1509.5 767.5 L 1660.5 767.5 L 1660.5 776.5 L 1509.5 776.5 Z M 1509.5 767.5 "/>
 </clipPath>
-<image id="image533" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image560" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image533"/>
+  <use xlink:href="#image560"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 222.5 842.5 L 1695.5 842.5 L 1695.5 867.5 L 222.5 867.5 Z M 222.5 842.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image532"/>
+  <use xlink:href="#image559"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1509.5 311.5 L 1548.5 311.5 L 1548.5 320.5 L 1509.5 320.5 Z M 1621.5 311.5 L 1660.5 311.5 L 1660.5 320.5 L 1621.5 320.5 Z M 1621.5 320.5 L 1660.5 320.5 L 1660.5 345.5 L 1621.5 345.5 Z M 1509.5 320.5 L 1548.5 320.5 L 1548.5 345.5 L 1509.5 345.5 Z M 1621.5 345.5 L 1660.5 345.5 L 1660.5 370.5 L 1621.5 370.5 Z M 1509.5 345.5 L 1548.5 345.5 L 1548.5 370.5 L 1509.5 370.5 Z M 1509.5 370.5 L 1548.5 370.5 L 1548.5 395.5 L 1509.5 395.5 Z M 1621.5 370.5 L 1660.5 370.5 L 1660.5 395.5 L 1621.5 395.5 Z M 664.5 411.5 L 705.5 411.5 L 705.5 417.5 L 664.5 417.5 Z M 552.5 411.5 L 591.5 411.5 L 591.5 419.5 L 552.5 419.5 Z M 778.5 411.5 L 817.5 411.5 L 817.5 419.5 L 778.5 419.5 Z M 1509.5 395.5 L 1548.5 395.5 L 1548.5 421.5 L 1509.5 421.5 Z M 470.5 419.5 L 508.5 419.5 L 508.5 428.5 L 470.5 428.5 Z M 244.5 419.5 L 287.5 419.5 L 287.5 428.5 L 244.5 428.5 Z M 1273.5 421.5 L 1311.5 421.5 L 1311.5 430.5 L 1273.5 430.5 Z M 1384.5 421.5 L 1425.5 421.5 L 1425.5 434.5 L 1384.5 434.5 Z M 664.5 417.5 L 705.5 417.5 L 705.5 441.5 L 664.5 441.5 Z M 778.5 419.5 L 817.5 419.5 L 817.5 444.5 L 778.5 444.5 Z M 552.5 419.5 L 591.5 419.5 L 591.5 444.5 L 552.5 444.5 Z M 1621.5 395.5 L 1660.5 395.5 L 1660.5 447.5 L 1621.5 447.5 Z M 1498.5 421.5 L 1548.5 421.5 L 1548.5 447.5 L 1498.5 447.5 Z M 244.5 428.5 L 287.5 428.5 L 287.5 453.5 L 244.5 453.5 Z M 470.5 428.5 L 508.5 428.5 L 508.5 453.5 L 470.5 453.5 Z M 1273.5 430.5 L 1311.5 430.5 L 1311.5 455.5 L 1273.5 455.5 Z M 1384.5 434.5 L 1425.5 434.5 L 1425.5 459.5 L 1384.5 459.5 Z M 664.5 441.5 L 705.5 441.5 L 705.5 466.5 L 664.5 466.5 Z M 1621.5 447.5 L 1660.5 447.5 L 1660.5 472.5 L 1621.5 472.5 Z M 1498.5 447.5 L 1548.5 447.5 L 1548.5 472.5 L 1498.5 472.5 Z M 1190.5 459.5 L 1229.5 459.5 L 1229.5 477.5 L 1190.5 477.5 Z M 861.5 459.5 L 899.5 459.5 L 899.5 477.5 L 861.5 477.5 Z M 1076.5 459.5 L 1117.5 459.5 L 1117.5 477.5 L 1076.5 477.5 Z M 778.5 444.5 L 817.5 444.5 L 817.5 487.5 L 778.5 487.5 Z M 552.5 444.5 L 591.5 444.5 L 591.5 487.5 L 552.5 487.5 Z M 664.5 466.5 L 705.5 466.5 L 705.5 491.5 L 664.5 491.5 Z M 470.5 453.5 L 508.5 453.5 L 508.5 495.5 L 470.5 495.5 Z M 244.5 453.5 L 287.5 453.5 L 287.5 495.5 L 244.5 495.5 Z M 1384.5 459.5 L 1425.5 459.5 L 1425.5 497.5 L 1384.5 497.5 Z M 1498.5 472.5 L 1548.5 472.5 L 1548.5 497.5 L 1498.5 497.5 Z M 1621.5 472.5 L 1660.5 472.5 L 1660.5 497.5 L 1621.5 497.5 Z M 1273.5 455.5 L 1311.5 455.5 L 1311.5 497.5 L 1273.5 497.5 Z M 1190.5 477.5 L 1229.5 477.5 L 1229.5 502.5 L 1190.5 502.5 Z M 1076.5 477.5 L 1117.5 477.5 L 1117.5 502.5 L 1076.5 502.5 Z M 861.5 477.5 L 899.5 477.5 L 899.5 502.5 L 861.5 502.5 Z M 552.5 487.5 L 591.5 487.5 L 591.5 512.5 L 552.5 512.5 Z M 778.5 487.5 L 817.5 487.5 L 817.5 512.5 L 778.5 512.5 Z M 1076.5 502.5 L 1117.5 502.5 L 1117.5 520.5 L 1076.5 520.5 Z M 778.5 512.5 L 817.5 512.5 L 817.5 520.5 L 778.5 520.5 Z M 1190.5 502.5 L 1229.5 502.5 L 1229.5 520.5 L 1190.5 520.5 Z M 552.5 512.5 L 591.5 512.5 L 591.5 520.5 L 552.5 520.5 Z M 861.5 502.5 L 899.5 502.5 L 899.5 520.5 L 861.5 520.5 Z M 244.5 495.5 L 287.5 495.5 L 287.5 520.5 L 244.5 520.5 Z M 664.5 491.5 L 705.5 491.5 L 705.5 520.5 L 664.5 520.5 Z M 470.5 495.5 L 508.5 495.5 L 508.5 520.5 L 470.5 520.5 Z M 972.5 459.5 L 1003.5 459.5 L 1003.5 520.5 L 972.5 520.5 Z M 1384.5 497.5 L 1425.5 497.5 L 1425.5 522.5 L 1384.5 522.5 Z M 1498.5 497.5 L 1548.5 497.5 L 1548.5 522.5 L 1498.5 522.5 Z M 1621.5 497.5 L 1660.5 497.5 L 1660.5 522.5 L 1621.5 522.5 Z M 1273.5 497.5 L 1311.5 497.5 L 1311.5 522.5 L 1273.5 522.5 Z M 360.5 419.5 L 397.5 419.5 L 397.5 529.5 L 360.5 529.5 Z M 244.5 520.5 L 287.5 520.5 L 287.5 529.5 L 244.5 529.5 Z M 470.5 520.5 L 508.5 520.5 L 508.5 529.5 L 470.5 529.5 Z M 1498.5 522.5 L 1548.5 522.5 L 1548.5 531.5 L 1498.5 531.5 Z M 1273.5 522.5 L 1311.5 522.5 L 1311.5 531.5 L 1273.5 531.5 Z M 1621.5 522.5 L 1660.5 522.5 L 1660.5 531.5 L 1621.5 531.5 Z M 1384.5 522.5 L 1425.5 522.5 L 1425.5 531.5 L 1384.5 531.5 Z M 222.5 842.5 L 1695.5 842.5 L 1695.5 867.5 L 222.5 867.5 Z M 222.5 842.5 "/>
 </clipPath>
-<image id="image534" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image561" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image534"/>
+  <use xlink:href="#image561"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1425.5 668.5 L 1498.5 668.5 L 1498.5 729.5 L 1425.5 729.5 Z M 1311.5 668.5 L 1384.5 668.5 L 1384.5 729.5 L 1311.5 729.5 Z M 397.5 677.5 L 470.5 677.5 L 470.5 738.5 L 397.5 738.5 Z M 287.5 677.5 L 360.5 677.5 L 360.5 738.5 L 287.5 738.5 Z M 1117.5 677.5 L 1190.5 677.5 L 1190.5 738.5 L 1117.5 738.5 Z M 899.5 677.5 L 972.5 677.5 L 972.5 738.5 L 899.5 738.5 Z M 1003.5 677.5 L 1076.5 677.5 L 1076.5 738.5 L 1003.5 738.5 Z M 705.5 696.5 L 778.5 696.5 L 778.5 758.5 L 705.5 758.5 Z M 591.5 696.5 L 664.5 696.5 L 664.5 758.5 L 591.5 758.5 Z M 1548.5 666.5 L 1621.5 666.5 L 1621.5 776.5 L 1548.5 776.5 Z M 1548.5 666.5 "/>
 </clipPath>
-<image id="image535" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image562" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image535"/>
+  <use xlink:href="#image562"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 591.5 411.5 L 664.5 411.5 L 664.5 520.5 L 591.5 520.5 Z M 1117.5 459.5 L 1190.5 459.5 L 1190.5 520.5 L 1117.5 520.5 Z M 1003.5 459.5 L 1076.5 459.5 L 1076.5 520.5 L 1003.5 520.5 Z M 899.5 459.5 L 972.5 459.5 L 972.5 520.5 L 899.5 520.5 Z M 705.5 411.5 L 778.5 411.5 L 778.5 520.5 L 705.5 520.5 Z M 397.5 419.5 L 470.5 419.5 L 470.5 529.5 L 397.5 529.5 Z M 287.5 419.5 L 360.5 419.5 L 360.5 529.5 L 287.5 529.5 Z M 1548.5 311.5 L 1621.5 311.5 L 1621.5 531.5 L 1548.5 531.5 Z M 1311.5 421.5 L 1384.5 421.5 L 1384.5 531.5 L 1311.5 531.5 Z M 1425.5 421.5 L 1498.5 421.5 L 1498.5 531.5 L 1425.5 531.5 Z M 1425.5 421.5 "/>
 </clipPath>
-<image id="image536" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image563" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image536"/>
+  <use xlink:href="#image563"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 245.5 247.5 L 269.5 247.5 L 269.5 272.5 L 245.5 272.5 Z M 1647.5 247.5 L 1672.5 247.5 L 1672.5 272.5 L 1647.5 272.5 Z M 1577.5 247.5 L 1602.5 247.5 L 1602.5 272.5 L 1577.5 272.5 Z M 1507.5 247.5 L 1532.5 247.5 L 1532.5 272.5 L 1507.5 272.5 Z M 1437.5 247.5 L 1462.5 247.5 L 1462.5 272.5 L 1437.5 272.5 Z M 1367.5 247.5 L 1392.5 247.5 L 1392.5 272.5 L 1367.5 272.5 Z M 1297.5 247.5 L 1322.5 247.5 L 1322.5 272.5 L 1297.5 272.5 Z M 1227.5 247.5 L 1251.5 247.5 L 1251.5 272.5 L 1227.5 272.5 Z M 1156.5 247.5 L 1181.5 247.5 L 1181.5 272.5 L 1156.5 272.5 Z M 1086.5 247.5 L 1111.5 247.5 L 1111.5 272.5 L 1086.5 272.5 Z M 1016.5 247.5 L 1041.5 247.5 L 1041.5 272.5 L 1016.5 272.5 Z M 946.5 247.5 L 971.5 247.5 L 971.5 272.5 L 946.5 272.5 Z M 876.5 247.5 L 901.5 247.5 L 901.5 272.5 L 876.5 272.5 Z M 806.5 247.5 L 831.5 247.5 L 831.5 272.5 L 806.5 272.5 Z M 736.5 247.5 L 760.5 247.5 L 760.5 272.5 L 736.5 272.5 Z M 665.5 247.5 L 690.5 247.5 L 690.5 272.5 L 665.5 272.5 Z M 595.5 247.5 L 620.5 247.5 L 620.5 272.5 L 595.5 272.5 Z M 525.5 247.5 L 550.5 247.5 L 550.5 272.5 L 525.5 272.5 Z M 455.5 247.5 L 480.5 247.5 L 480.5 272.5 L 455.5 272.5 Z M 385.5 247.5 L 410.5 247.5 L 410.5 272.5 L 385.5 272.5 Z M 315.5 247.5 L 340.5 247.5 L 340.5 272.5 L 315.5 272.5 Z M 1420.5 301.5 L 1444.5 301.5 L 1444.5 326.5 L 1420.5 326.5 Z M 1472.5 301.5 L 1497.5 301.5 L 1497.5 326.5 L 1472.5 326.5 Z M 400.5 303.5 L 425.5 303.5 L 425.5 328.5 L 400.5 328.5 Z M 453.5 303.5 L 478.5 303.5 L 478.5 328.5 L 453.5 328.5 Z M 348.5 303.5 L 372.5 303.5 L 372.5 328.5 L 348.5 328.5 Z M 513.5 303.5 L 538.5 303.5 L 538.5 328.5 L 513.5 328.5 Z M 566.5 303.5 L 591.5 303.5 L 591.5 328.5 L 566.5 328.5 Z M 1162.5 311.5 L 1187.5 311.5 L 1187.5 336.5 L 1162.5 336.5 Z M 1215.5 311.5 L 1240.5 311.5 L 1240.5 336.5 L 1215.5 336.5 Z M 1525.5 322.5 L 1550.5 322.5 L 1550.5 345.5 L 1525.5 345.5 Z M 1110.5 322.5 L 1135.5 322.5 L 1135.5 346.5 L 1110.5 346.5 Z M 1057.5 322.5 L 1082.5 322.5 L 1082.5 346.5 L 1057.5 346.5 Z M 1268.5 322.5 L 1292.5 322.5 L 1292.5 346.5 L 1268.5 346.5 Z M 1577.5 322.5 L 1602.5 322.5 L 1602.5 346.5 L 1577.5 346.5 Z M 242.5 322.5 L 267.5 322.5 L 267.5 346.5 L 242.5 346.5 Z M 295.5 322.5 L 320.5 322.5 L 320.5 346.5 L 295.5 346.5 Z M 619.5 322.5 L 644.5 322.5 L 644.5 346.5 L 619.5 346.5 Z M 671.5 322.5 L 696.5 322.5 L 696.5 346.5 L 671.5 346.5 Z M 1320.5 322.5 L 1345.5 322.5 L 1345.5 346.5 L 1320.5 346.5 Z M 1525.5 345.5 L 1550.5 345.5 L 1550.5 346.5 L 1525.5 346.5 Z M 248.5 767.5 L 272.5 767.5 L 272.5 792.5 L 248.5 792.5 Z M 300.5 767.5 L 325.5 767.5 L 325.5 792.5 L 300.5 792.5 Z M 712.5 767.5 L 737.5 767.5 L 737.5 792.5 L 712.5 792.5 Z M 1039.5 767.5 L 1064.5 767.5 L 1064.5 792.5 L 1039.5 792.5 Z M 1091.5 767.5 L 1116.5 767.5 L 1116.5 792.5 L 1091.5 792.5 Z M 1575.5 767.5 L 1600.5 767.5 L 1600.5 792.5 L 1575.5 792.5 Z M 660.5 767.5 L 684.5 767.5 L 684.5 792.5 L 660.5 792.5 Z M 1470.5 767.5 L 1495.5 767.5 L 1495.5 792.5 L 1470.5 792.5 Z M 1523.5 767.5 L 1547.5 767.5 L 1547.5 792.5 L 1523.5 792.5 Z M 765.5 777.5 L 790.5 777.5 L 790.5 802.5 L 765.5 802.5 Z M 1259.5 777.5 L 1284.5 777.5 L 1284.5 802.5 L 1259.5 802.5 Z M 1312.5 777.5 L 1337.5 777.5 L 1337.5 802.5 L 1312.5 802.5 Z M 1417.5 777.5 L 1442.5 777.5 L 1442.5 802.5 L 1417.5 802.5 Z M 934.5 777.5 L 958.5 777.5 L 958.5 802.5 L 934.5 802.5 Z M 986.5 777.5 L 1011.5 777.5 L 1011.5 802.5 L 986.5 802.5 Z M 1365.5 777.5 L 1390.5 777.5 L 1390.5 802.5 L 1365.5 802.5 Z M 245.5 842.5 L 269.5 842.5 L 269.5 867.5 L 245.5 867.5 Z M 1647.5 842.5 L 1672.5 842.5 L 1672.5 867.5 L 1647.5 867.5 Z M 1577.5 842.5 L 1602.5 842.5 L 1602.5 867.5 L 1577.5 867.5 Z M 1507.5 842.5 L 1532.5 842.5 L 1532.5 867.5 L 1507.5 867.5 Z M 1437.5 842.5 L 1462.5 842.5 L 1462.5 867.5 L 1437.5 867.5 Z M 1367.5 842.5 L 1392.5 842.5 L 1392.5 867.5 L 1367.5 867.5 Z M 1297.5 842.5 L 1322.5 842.5 L 1322.5 867.5 L 1297.5 867.5 Z M 1227.5 842.5 L 1251.5 842.5 L 1251.5 867.5 L 1227.5 867.5 Z M 1156.5 842.5 L 1181.5 842.5 L 1181.5 867.5 L 1156.5 867.5 Z M 1086.5 842.5 L 1111.5 842.5 L 1111.5 867.5 L 1086.5 867.5 Z M 1016.5 842.5 L 1041.5 842.5 L 1041.5 867.5 L 1016.5 867.5 Z M 946.5 842.5 L 971.5 842.5 L 971.5 867.5 L 946.5 867.5 Z M 876.5 842.5 L 901.5 842.5 L 901.5 867.5 L 876.5 867.5 Z M 806.5 842.5 L 831.5 842.5 L 831.5 867.5 L 806.5 867.5 Z M 736.5 842.5 L 760.5 842.5 L 760.5 867.5 L 736.5 867.5 Z M 665.5 842.5 L 690.5 842.5 L 690.5 867.5 L 665.5 867.5 Z M 595.5 842.5 L 620.5 842.5 L 620.5 867.5 L 595.5 867.5 Z M 525.5 842.5 L 550.5 842.5 L 550.5 867.5 L 525.5 867.5 Z M 455.5 842.5 L 480.5 842.5 L 480.5 867.5 L 455.5 867.5 Z M 385.5 842.5 L 410.5 842.5 L 410.5 867.5 L 385.5 867.5 Z M 315.5 842.5 L 340.5 842.5 L 340.5 867.5 L 315.5 867.5 Z M 315.5 842.5 "/>
 </clipPath>
-<image id="image537" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image564" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image537"/>
+  <use xlink:href="#image564"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface528">
+<g id="surface555">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -263,6 +263,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 368.71875 558.066406 L 368.71875 568.933594 L 387.414062 568.933594 L 387.414062 572.5 L 364.675781 572.5 L 364.675781 540.804688 L 386.628906 540.804688 L 386.628906 544.371094 L 368.71875 544.371094 L 368.71875 554.5 L 385.976562 554.5 L 385.976562 558.066406 Z M 368.71875 558.066406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 315 535 L 340 535 M 315 510 L 340 510 M 315 510 L 315 535 M 340 510 L 340 535 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 315 535 L 340 535 M 315 510 L 340 510 M 340 535 L 340 510 M 315 535 L 315 510 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 222 220 L 222 229 M 217 225 L 226 225 M 221 226 L 223 226 M 221 224 L 223 224 M 221 224 L 221 226 M 223 224 L 223 226 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.svg b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.svg
index 05ffb6f..45a6696 100644
--- a/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.svg
+++ b/cells/dlrtp/sky130_fd_sc_hvl__dlrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 183.5 L 1744.5 183.5 L 1744.5 581.5 L 174.5 581.5 Z M 174.5 183.5 "/>
 </clipPath>
-<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image419"/>
+  <use xlink:href="#image447"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 225.5 234.5 L 1693.5 234.5 L 1693.5 260.5 L 225.5 260.5 Z M 225.5 234.5 "/>
 </clipPath>
-<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image420"/>
+  <use xlink:href="#image448"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 225.5 234.5 L 1693.5 234.5 L 1693.5 260.5 L 225.5 260.5 Z M 1506.5 673.5 L 1670.5 673.5 L 1670.5 679.5 L 1506.5 679.5 Z M 1506.5 679.5 L 1670.5 679.5 L 1670.5 705.5 L 1506.5 705.5 Z M 1506.5 705.5 L 1670.5 705.5 L 1670.5 723.5 L 1506.5 723.5 Z M 1261.5 723.5 L 1670.5 723.5 L 1670.5 742.5 L 1261.5 742.5 Z M 249.5 723.5 L 532.5 723.5 L 532.5 742.5 L 249.5 742.5 Z M 578.5 723.5 L 1215.5 723.5 L 1215.5 742.5 L 578.5 742.5 Z M 249.5 742.5 L 532.5 742.5 L 532.5 768.5 L 249.5 768.5 Z M 1261.5 742.5 L 1670.5 742.5 L 1670.5 768.5 L 1261.5 768.5 Z M 578.5 742.5 L 1215.5 742.5 L 1215.5 768.5 L 578.5 768.5 Z M 1261.5 768.5 L 1670.5 768.5 L 1670.5 787.5 L 1261.5 787.5 Z M 249.5 768.5 L 532.5 768.5 L 532.5 787.5 L 249.5 787.5 Z M 578.5 768.5 L 1215.5 768.5 L 1215.5 787.5 L 578.5 787.5 Z M 578.5 768.5 "/>
 </clipPath>
-<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image449" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image421"/>
+  <use xlink:href="#image449"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 225.5 856.5 L 1693.5 856.5 L 1693.5 882.5 L 225.5 882.5 Z M 225.5 856.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image420"/>
+  <use xlink:href="#image448"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1444.5 301.5 L 1488.5 301.5 L 1488.5 307.5 L 1444.5 307.5 Z M 1565.5 301.5 L 1608.5 301.5 L 1608.5 307.5 L 1565.5 307.5 Z M 489.5 323.5 L 532.5 323.5 L 532.5 329.5 L 489.5 329.5 Z M 249.5 323.5 L 293.5 323.5 L 293.5 329.5 L 249.5 329.5 Z M 369.5 323.5 L 412.5 323.5 L 412.5 329.5 L 369.5 329.5 Z M 1565.5 307.5 L 1608.5 307.5 L 1608.5 333.5 L 1565.5 333.5 Z M 1444.5 307.5 L 1488.5 307.5 L 1488.5 333.5 L 1444.5 333.5 Z M 489.5 329.5 L 532.5 329.5 L 532.5 355.5 L 489.5 355.5 Z M 369.5 329.5 L 412.5 329.5 L 412.5 355.5 L 369.5 355.5 Z M 249.5 329.5 L 293.5 329.5 L 293.5 355.5 L 249.5 355.5 Z M 1444.5 333.5 L 1488.5 333.5 L 1488.5 364.5 L 1444.5 364.5 Z M 1565.5 333.5 L 1608.5 333.5 L 1608.5 371.5 L 1565.5 371.5 Z M 578.5 379.5 L 622.5 379.5 L 622.5 385.5 L 578.5 385.5 Z M 1444.5 364.5 L 1488.5 364.5 L 1488.5 390.5 L 1444.5 390.5 Z M 1565.5 371.5 L 1608.5 371.5 L 1608.5 397.5 L 1565.5 397.5 Z M 926.5 379.5 L 970.5 379.5 L 970.5 406.5 L 926.5 406.5 Z M 489.5 355.5 L 532.5 355.5 L 532.5 406.5 L 489.5 406.5 Z M 249.5 355.5 L 293.5 355.5 L 293.5 406.5 L 249.5 406.5 Z M 369.5 355.5 L 412.5 355.5 L 412.5 406.5 L 369.5 406.5 Z M 698.5 379.5 L 741.5 379.5 L 741.5 406.5 L 698.5 406.5 Z M 578.5 385.5 L 622.5 385.5 L 622.5 411.5 L 578.5 411.5 Z M 1444.5 390.5 L 1488.5 390.5 L 1488.5 416.5 L 1444.5 416.5 Z M 1308.5 416.5 L 1351.5 416.5 L 1351.5 422.5 L 1308.5 422.5 Z M 1428.5 416.5 L 1488.5 416.5 L 1488.5 422.5 L 1428.5 422.5 Z M 1188.5 416.5 L 1232.5 416.5 L 1232.5 422.5 L 1188.5 422.5 Z M 1188.5 422.5 L 1232.5 422.5 L 1232.5 430.5 L 1188.5 430.5 Z M 926.5 406.5 L 970.5 406.5 L 970.5 430.5 L 926.5 430.5 Z M 369.5 406.5 L 412.5 406.5 L 412.5 432.5 L 369.5 432.5 Z M 489.5 406.5 L 532.5 406.5 L 532.5 432.5 L 489.5 432.5 Z M 249.5 406.5 L 293.5 406.5 L 293.5 432.5 L 249.5 432.5 Z M 926.5 430.5 L 986.5 430.5 L 986.5 432.5 L 926.5 432.5 Z M 698.5 406.5 L 741.5 406.5 L 741.5 432.5 L 698.5 432.5 Z M 1565.5 397.5 L 1608.5 397.5 L 1608.5 435.5 L 1565.5 435.5 Z M 489.5 432.5 L 532.5 432.5 L 532.5 438.5 L 489.5 438.5 Z M 369.5 432.5 L 412.5 432.5 L 412.5 438.5 L 369.5 438.5 Z M 249.5 432.5 L 293.5 432.5 L 293.5 438.5 L 249.5 438.5 Z M 1308.5 422.5 L 1351.5 422.5 L 1351.5 448.5 L 1308.5 448.5 Z M 1428.5 422.5 L 1488.5 422.5 L 1488.5 448.5 L 1428.5 448.5 Z M 1171.5 430.5 L 1232.5 430.5 L 1232.5 448.5 L 1171.5 448.5 Z M 1565.5 435.5 L 1608.5 435.5 L 1608.5 461.5 L 1565.5 461.5 Z M 578.5 411.5 L 622.5 411.5 L 622.5 462.5 L 578.5 462.5 Z M 1428.5 448.5 L 1488.5 448.5 L 1488.5 478.5 L 1428.5 478.5 Z M 578.5 462.5 L 622.5 462.5 L 622.5 488.5 L 578.5 488.5 Z M 578.5 488.5 L 622.5 488.5 L 622.5 494.5 L 578.5 494.5 Z M 817.5 379.5 L 849.5 379.5 L 849.5 494.5 L 817.5 494.5 Z M 1063.5 430.5 L 1095.5 430.5 L 1095.5 494.5 L 1063.5 494.5 Z M 1171.5 448.5 L 1232.5 448.5 L 1232.5 494.5 L 1171.5 494.5 Z M 926.5 432.5 L 986.5 432.5 L 986.5 494.5 L 926.5 494.5 Z M 698.5 432.5 L 741.5 432.5 L 741.5 494.5 L 698.5 494.5 Z M 1565.5 461.5 L 1608.5 461.5 L 1608.5 498.5 L 1565.5 498.5 Z M 1308.5 448.5 L 1351.5 448.5 L 1351.5 498.5 L 1308.5 498.5 Z M 1188.5 494.5 L 1232.5 494.5 L 1232.5 498.5 L 1188.5 498.5 Z M 1428.5 478.5 L 1488.5 478.5 L 1488.5 504.5 L 1428.5 504.5 Z M 1565.5 498.5 L 1608.5 498.5 L 1608.5 524.5 L 1565.5 524.5 Z M 1308.5 498.5 L 1351.5 498.5 L 1351.5 524.5 L 1308.5 524.5 Z M 1188.5 498.5 L 1232.5 498.5 L 1232.5 524.5 L 1188.5 524.5 Z M 1188.5 524.5 L 1232.5 524.5 L 1232.5 530.5 L 1188.5 530.5 Z M 1308.5 524.5 L 1351.5 524.5 L 1351.5 530.5 L 1308.5 530.5 Z M 1428.5 504.5 L 1488.5 504.5 L 1488.5 530.5 L 1428.5 530.5 Z M 1565.5 524.5 L 1608.5 524.5 L 1608.5 530.5 L 1565.5 530.5 Z M 225.5 856.5 L 1693.5 856.5 L 1693.5 882.5 L 225.5 882.5 Z M 225.5 856.5 "/>
 </clipPath>
-<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image450" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image422"/>
+  <use xlink:href="#image450"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1550.5 673.5 L 1627.5 673.5 L 1627.5 787.5 L 1550.5 787.5 Z M 622.5 723.5 L 698.5 723.5 L 698.5 787.5 L 622.5 787.5 Z M 1413.5 723.5 L 1490.5 723.5 L 1490.5 787.5 L 1413.5 787.5 Z M 1305.5 723.5 L 1381.5 723.5 L 1381.5 787.5 L 1305.5 787.5 Z M 1095.5 723.5 L 1171.5 723.5 L 1171.5 787.5 L 1095.5 787.5 Z M 986.5 723.5 L 1063.5 723.5 L 1063.5 787.5 L 986.5 787.5 Z M 849.5 723.5 L 926.5 723.5 L 926.5 787.5 L 849.5 787.5 Z M 741.5 723.5 L 817.5 723.5 L 817.5 787.5 L 741.5 787.5 Z M 293.5 723.5 L 369.5 723.5 L 369.5 787.5 L 293.5 787.5 Z M 412.5 723.5 L 489.5 723.5 L 489.5 787.5 L 412.5 787.5 Z M 412.5 723.5 "/>
 </clipPath>
-<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image451" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image423"/>
+  <use xlink:href="#image451"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 412.5 323.5 L 489.5 323.5 L 489.5 438.5 L 412.5 438.5 Z M 293.5 323.5 L 369.5 323.5 L 369.5 438.5 L 293.5 438.5 Z M 741.5 379.5 L 817.5 379.5 L 817.5 494.5 L 741.5 494.5 Z M 986.5 430.5 L 1063.5 430.5 L 1063.5 494.5 L 986.5 494.5 Z M 849.5 379.5 L 926.5 379.5 L 926.5 494.5 L 849.5 494.5 Z M 622.5 379.5 L 698.5 379.5 L 698.5 494.5 L 622.5 494.5 Z M 1095.5 430.5 L 1171.5 430.5 L 1171.5 494.5 L 1095.5 494.5 Z M 1488.5 301.5 L 1565.5 301.5 L 1565.5 530.5 L 1488.5 530.5 Z M 1232.5 416.5 L 1308.5 416.5 L 1308.5 530.5 L 1232.5 530.5 Z M 1351.5 416.5 L 1428.5 416.5 L 1428.5 530.5 L 1351.5 530.5 Z M 1351.5 416.5 "/>
 </clipPath>
-<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image424"/>
+  <use xlink:href="#image452"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 248.5 234.5 L 274.5 234.5 L 274.5 260.5 L 248.5 260.5 Z M 1643.5 234.5 L 1669.5 234.5 L 1669.5 260.5 L 1643.5 260.5 Z M 1570.5 234.5 L 1596.5 234.5 L 1596.5 260.5 L 1570.5 260.5 Z M 1496.5 234.5 L 1522.5 234.5 L 1522.5 260.5 L 1496.5 260.5 Z M 1423.5 234.5 L 1449.5 234.5 L 1449.5 260.5 L 1423.5 260.5 Z M 1350.5 234.5 L 1376.5 234.5 L 1376.5 260.5 L 1350.5 260.5 Z M 1276.5 234.5 L 1302.5 234.5 L 1302.5 260.5 L 1276.5 260.5 Z M 1203.5 234.5 L 1229.5 234.5 L 1229.5 260.5 L 1203.5 260.5 Z M 1129.5 234.5 L 1155.5 234.5 L 1155.5 260.5 L 1129.5 260.5 Z M 1056.5 234.5 L 1082.5 234.5 L 1082.5 260.5 L 1056.5 260.5 Z M 983.5 234.5 L 1009.5 234.5 L 1009.5 260.5 L 983.5 260.5 Z M 909.5 234.5 L 935.5 234.5 L 935.5 260.5 L 909.5 260.5 Z M 836.5 234.5 L 862.5 234.5 L 862.5 260.5 L 836.5 260.5 Z M 762.5 234.5 L 788.5 234.5 L 788.5 260.5 L 762.5 260.5 Z M 689.5 234.5 L 715.5 234.5 L 715.5 260.5 L 689.5 260.5 Z M 615.5 234.5 L 641.5 234.5 L 641.5 260.5 L 615.5 260.5 Z M 542.5 234.5 L 568.5 234.5 L 568.5 260.5 L 542.5 260.5 Z M 469.5 234.5 L 495.5 234.5 L 495.5 260.5 L 469.5 260.5 Z M 395.5 234.5 L 421.5 234.5 L 421.5 260.5 L 395.5 260.5 Z M 322.5 234.5 L 348.5 234.5 L 348.5 260.5 L 322.5 260.5 Z M 371.5 307.5 L 397.5 307.5 L 397.5 329.5 L 371.5 329.5 Z M 371.5 329.5 L 397.5 329.5 L 397.5 333.5 L 371.5 333.5 Z M 1442.5 307.5 L 1468.5 307.5 L 1468.5 333.5 L 1442.5 333.5 Z M 1212.5 307.5 L 1238.5 307.5 L 1238.5 333.5 L 1212.5 333.5 Z M 1157.5 307.5 L 1183.5 307.5 L 1183.5 333.5 L 1157.5 333.5 Z M 1102.5 307.5 L 1128.5 307.5 L 1128.5 333.5 L 1102.5 333.5 Z M 768.5 307.5 L 794.5 307.5 L 794.5 333.5 L 768.5 333.5 Z M 713.5 307.5 L 739.5 307.5 L 739.5 333.5 L 713.5 333.5 Z M 658.5 307.5 L 684.5 307.5 L 684.5 333.5 L 658.5 333.5 Z M 427.5 307.5 L 453.5 307.5 L 453.5 333.5 L 427.5 333.5 Z M 1387.5 307.5 L 1413.5 307.5 L 1413.5 333.5 L 1387.5 333.5 Z M 1497.5 307.5 L 1523.5 307.5 L 1523.5 333.5 L 1497.5 333.5 Z M 316.5 307.5 L 342.5 307.5 L 342.5 333.5 L 316.5 333.5 Z M 316.5 783.5 L 342.5 783.5 L 342.5 809.5 L 316.5 809.5 Z M 1554.5 783.5 L 1580.5 783.5 L 1580.5 809.5 L 1554.5 809.5 Z M 1499.5 783.5 L 1525.5 783.5 L 1525.5 809.5 L 1499.5 809.5 Z M 1188.5 783.5 L 1214.5 783.5 L 1214.5 809.5 L 1188.5 809.5 Z M 1132.5 783.5 L 1158.5 783.5 L 1158.5 809.5 L 1132.5 809.5 Z M 1077.5 783.5 L 1103.5 783.5 L 1103.5 809.5 L 1077.5 809.5 Z M 768.5 783.5 L 794.5 783.5 L 794.5 809.5 L 768.5 809.5 Z M 713.5 783.5 L 739.5 783.5 L 739.5 809.5 L 713.5 809.5 Z M 658.5 783.5 L 684.5 783.5 L 684.5 809.5 L 658.5 809.5 Z M 427.5 783.5 L 453.5 783.5 L 453.5 809.5 L 427.5 809.5 Z M 371.5 783.5 L 397.5 783.5 L 397.5 809.5 L 371.5 809.5 Z M 248.5 856.5 L 274.5 856.5 L 274.5 882.5 L 248.5 882.5 Z M 1643.5 856.5 L 1669.5 856.5 L 1669.5 882.5 L 1643.5 882.5 Z M 1570.5 856.5 L 1596.5 856.5 L 1596.5 882.5 L 1570.5 882.5 Z M 1496.5 856.5 L 1522.5 856.5 L 1522.5 882.5 L 1496.5 882.5 Z M 1423.5 856.5 L 1449.5 856.5 L 1449.5 882.5 L 1423.5 882.5 Z M 1350.5 856.5 L 1376.5 856.5 L 1376.5 882.5 L 1350.5 882.5 Z M 1276.5 856.5 L 1302.5 856.5 L 1302.5 882.5 L 1276.5 882.5 Z M 1203.5 856.5 L 1229.5 856.5 L 1229.5 882.5 L 1203.5 882.5 Z M 1129.5 856.5 L 1155.5 856.5 L 1155.5 882.5 L 1129.5 882.5 Z M 1056.5 856.5 L 1082.5 856.5 L 1082.5 882.5 L 1056.5 882.5 Z M 983.5 856.5 L 1009.5 856.5 L 1009.5 882.5 L 983.5 882.5 Z M 909.5 856.5 L 935.5 856.5 L 935.5 882.5 L 909.5 882.5 Z M 836.5 856.5 L 862.5 856.5 L 862.5 882.5 L 836.5 882.5 Z M 762.5 856.5 L 788.5 856.5 L 788.5 882.5 L 762.5 882.5 Z M 689.5 856.5 L 715.5 856.5 L 715.5 882.5 L 689.5 882.5 Z M 615.5 856.5 L 641.5 856.5 L 641.5 882.5 L 615.5 882.5 Z M 542.5 856.5 L 568.5 856.5 L 568.5 882.5 L 542.5 882.5 Z M 469.5 856.5 L 495.5 856.5 L 495.5 882.5 L 469.5 882.5 Z M 395.5 856.5 L 421.5 856.5 L 421.5 882.5 L 395.5 882.5 Z M 322.5 856.5 L 348.5 856.5 L 348.5 882.5 L 322.5 882.5 Z M 322.5 856.5 "/>
 </clipPath>
-<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image425"/>
+  <use xlink:href="#image453"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface416">
+<g id="surface444">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -243,6 +243,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1673.398438 404.898438 L 1671.289062 407.5 L 1666.574219 403.59375 L 1665.230469 404.3125 L 1663.882812 404.851562 L 1662.492188 405.300781 L 1661.011719 405.613281 L 1659.53125 405.792969 L 1658.003906 405.882812 L 1655.9375 405.75 L 1654.007812 405.433594 L 1652.214844 404.898438 L 1650.507812 404.179688 L 1648.894531 403.234375 L 1647.457031 402.023438 L 1646.15625 400.722656 L 1645.03125 399.242188 L 1644.136719 397.625 L 1643.371094 395.875 L 1642.789062 393.992188 L 1642.429688 391.925781 L 1642.339844 391.433594 L 1642.296875 390.894531 L 1642.25 390.402344 L 1642.207031 389.863281 L 1642.207031 388.738281 L 1642.296875 386.496094 L 1642.609375 384.339844 L 1643.101562 382.367188 L 1643.820312 380.480469 L 1644.71875 378.730469 L 1645.886719 377.117188 L 1647.050781 375.8125 L 1648.398438 374.648438 L 1649.878906 373.660156 L 1651.449219 372.898438 L 1653.15625 372.269531 L 1655.042969 371.820312 L 1655.488281 371.773438 L 1655.984375 371.730469 L 1656.476562 371.683594 L 1656.972656 371.640625 L 1657.464844 371.640625 L 1658.003906 371.59375 L 1660.023438 371.730469 L 1661.953125 372.042969 L 1663.75 372.582031 L 1665.453125 373.300781 L 1667.070312 374.242188 L 1668.550781 375.410156 L 1669.808594 376.757812 L 1670.929688 378.191406 L 1671.828125 379.765625 L 1672.589844 381.515625 L 1673.171875 383.398438 L 1673.578125 385.375 L 1673.621094 385.957031 L 1673.667969 386.496094 L 1673.710938 387.035156 L 1673.757812 387.574219 L 1673.757812 388.113281 L 1673.800781 388.648438 L 1673.667969 391.164062 L 1673.261719 393.542969 L 1672.632812 395.742188 L 1671.738281 397.804688 L 1670.570312 399.691406 L 1669.179688 401.441406 Z M 1662.085938 395.652344 L 1666.082031 398.929688 L 1667.160156 397.582031 L 1668.058594 396.054688 L 1668.730469 394.394531 L 1669.222656 392.644531 L 1669.492188 390.757812 L 1669.628906 388.695312 L 1669.539062 386.808594 L 1669.269531 385.015625 L 1668.820312 383.355469 L 1668.234375 381.828125 L 1667.472656 380.390625 L 1666.53125 379.089844 L 1665.453125 378.011719 L 1664.332031 377.117188 L 1663.074219 376.398438 L 1661.730469 375.859375 L 1660.246094 375.5 L 1658.722656 375.277344 L 1658.003906 375.277344 L 1656.386719 375.410156 L 1654.863281 375.679688 L 1653.425781 376.128906 L 1652.125 376.800781 L 1650.914062 377.652344 L 1649.835938 378.6875 L 1648.804688 379.898438 L 1647.996094 381.246094 L 1647.320312 382.726562 L 1646.828125 384.339844 L 1646.515625 386.09375 L 1646.378906 387.976562 L 1646.378906 388.738281 L 1646.425781 390.714844 L 1646.695312 392.511719 L 1647.140625 394.171875 L 1647.726562 395.742188 L 1648.535156 397.175781 L 1649.519531 398.433594 L 1650.554688 399.554688 L 1651.71875 400.453125 L 1652.976562 401.171875 L 1654.324219 401.664062 L 1655.804688 402.023438 L 1657.375 402.160156 L 1657.464844 402.203125 L 1658.765625 402.203125 L 1659.621094 402.113281 L 1660.472656 401.933594 L 1661.28125 401.753906 L 1662.085938 401.484375 L 1662.941406 401.125 L 1662.984375 401.125 L 1663.074219 401.082031 L 1663.121094 401.039062 L 1663.210938 401.039062 L 1663.253906 400.992188 L 1663.34375 400.949219 L 1660.023438 398.164062 Z M 1662.085938 395.652344 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1643 704 L 1669 704 M 1643 678 L 1669 678 M 1643 678 L 1643 704 M 1669 678 L 1669 704 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1643 704 L 1669 704 M 1643 678 L 1669 678 M 1669 704 L 1669 678 M 1643 704 L 1643 678 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 225 205 L 225 214 M 220 210 L 229 210 M 224 211 L 226 211 M 224 209 L 226 209 M 224 209 L 224 211 M 226 209 L 226 211 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.svg b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.svg
index 00c9cb7..def43ee 100644
--- a/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.svg
+++ b/cells/dlxtp/sky130_fd_sc_hvl__dlxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 126.5 L 1743.5 126.5 L 1743.5 589.5 L 174.5 589.5 Z M 174.5 126.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 233.5 185.5 L 1684.5 185.5 L 1684.5 215.5 L 233.5 215.5 Z M 233.5 185.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 233.5 185.5 L 1684.5 185.5 L 1684.5 215.5 L 233.5 215.5 Z M 1315.5 696.5 L 1658.5 696.5 L 1658.5 718.5 L 1315.5 718.5 Z M 1315.5 718.5 L 1658.5 718.5 L 1658.5 748.5 L 1315.5 748.5 Z M 1315.5 748.5 L 1658.5 748.5 L 1658.5 770.5 L 1315.5 770.5 Z M 675.5 754.5 L 1262.5 754.5 L 1262.5 777.5 L 675.5 777.5 Z M 296.5 754.5 L 621.5 754.5 L 621.5 777.5 L 296.5 777.5 Z M 1471.5 770.5 L 1658.5 770.5 L 1658.5 792.5 L 1471.5 792.5 Z M 675.5 777.5 L 1262.5 777.5 L 1262.5 807.5 L 675.5 807.5 Z M 296.5 777.5 L 621.5 777.5 L 621.5 807.5 L 296.5 807.5 Z M 1471.5 792.5 L 1658.5 792.5 L 1658.5 822.5 L 1471.5 822.5 Z M 296.5 807.5 L 621.5 807.5 L 621.5 829.5 L 296.5 829.5 Z M 1471.5 822.5 L 1658.5 822.5 L 1658.5 829.5 L 1471.5 829.5 Z M 675.5 807.5 L 1262.5 807.5 L 1262.5 829.5 L 675.5 829.5 Z M 675.5 807.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 233.5 909.5 L 1684.5 909.5 L 1684.5 939.5 L 233.5 939.5 Z M 233.5 909.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1467.5 263.5 L 1518.5 263.5 L 1518.5 271.5 L 1467.5 271.5 Z M 1607.5 263.5 L 1658.5 263.5 L 1658.5 271.5 L 1607.5 271.5 Z M 975.5 269.5 L 1026.5 269.5 L 1026.5 276.5 L 975.5 276.5 Z M 686.5 269.5 L 734.5 269.5 L 734.5 279.5 L 686.5 279.5 Z M 1607.5 271.5 L 1658.5 271.5 L 1658.5 301.5 L 1607.5 301.5 Z M 1467.5 271.5 L 1518.5 271.5 L 1518.5 301.5 L 1467.5 301.5 Z M 975.5 276.5 L 1026.5 276.5 L 1026.5 306.5 L 975.5 306.5 Z M 686.5 279.5 L 734.5 279.5 L 734.5 310.5 L 686.5 310.5 Z M 975.5 306.5 L 1026.5 306.5 L 1026.5 327.5 L 975.5 327.5 Z M 823.5 269.5 L 886.5 269.5 L 886.5 337.5 L 823.5 337.5 Z M 1607.5 301.5 L 1658.5 301.5 L 1658.5 344.5 L 1607.5 344.5 Z M 1261.5 327.5 L 1312.5 327.5 L 1312.5 350.5 L 1261.5 350.5 Z M 1467.5 301.5 L 1518.5 301.5 L 1518.5 357.5 L 1467.5 357.5 Z M 686.5 310.5 L 734.5 310.5 L 734.5 361.5 L 686.5 361.5 Z M 975.5 327.5 L 1046.5 327.5 L 1046.5 365.5 L 975.5 365.5 Z M 823.5 337.5 L 886.5 337.5 L 886.5 367.5 L 823.5 367.5 Z M 1607.5 344.5 L 1658.5 344.5 L 1658.5 375.5 L 1607.5 375.5 Z M 1261.5 350.5 L 1312.5 350.5 L 1312.5 380.5 L 1261.5 380.5 Z M 1467.5 357.5 L 1518.5 357.5 L 1518.5 387.5 L 1467.5 387.5 Z M 686.5 361.5 L 734.5 361.5 L 734.5 391.5 L 686.5 391.5 Z M 975.5 365.5 L 1046.5 365.5 L 1046.5 395.5 L 975.5 395.5 Z M 1261.5 380.5 L 1312.5 380.5 L 1312.5 402.5 L 1261.5 402.5 Z M 975.5 395.5 L 1046.5 395.5 L 1046.5 402.5 L 975.5 402.5 Z M 686.5 391.5 L 734.5 391.5 L 734.5 402.5 L 686.5 402.5 Z M 823.5 367.5 L 886.5 367.5 L 886.5 402.5 L 823.5 402.5 Z M 1135.5 327.5 L 1172.5 327.5 L 1172.5 402.5 L 1135.5 402.5 Z M 395.5 397.5 L 497.5 397.5 L 497.5 404.5 L 395.5 404.5 Z M 259.5 397.5 L 307.5 397.5 L 307.5 407.5 L 259.5 407.5 Z M 1607.5 375.5 L 1658.5 375.5 L 1658.5 419.5 L 1607.5 419.5 Z M 395.5 404.5 L 497.5 404.5 L 497.5 434.5 L 395.5 434.5 Z M 259.5 407.5 L 307.5 407.5 L 307.5 438.5 L 259.5 438.5 Z M 1467.5 387.5 L 1518.5 387.5 L 1518.5 443.5 L 1467.5 443.5 Z M 1607.5 419.5 L 1658.5 419.5 L 1658.5 449.5 L 1607.5 449.5 Z M 1467.5 443.5 L 1518.5 443.5 L 1518.5 456.5 L 1467.5 456.5 Z M 1448.5 456.5 L 1518.5 456.5 L 1518.5 473.5 L 1448.5 473.5 Z M 1308.5 456.5 L 1359.5 456.5 L 1359.5 478.5 L 1308.5 478.5 Z M 586.5 397.5 L 633.5 397.5 L 633.5 488.5 L 586.5 488.5 Z M 259.5 438.5 L 307.5 438.5 L 307.5 489.5 L 259.5 489.5 Z M 395.5 434.5 L 497.5 434.5 L 497.5 493.5 L 395.5 493.5 Z M 1607.5 449.5 L 1658.5 449.5 L 1658.5 493.5 L 1607.5 493.5 Z M 1308.5 478.5 L 1359.5 478.5 L 1359.5 508.5 L 1308.5 508.5 Z M 586.5 488.5 L 633.5 488.5 L 633.5 518.5 L 586.5 518.5 Z M 259.5 489.5 L 307.5 489.5 L 307.5 520.5 L 259.5 520.5 Z M 1607.5 493.5 L 1658.5 493.5 L 1658.5 523.5 L 1607.5 523.5 Z M 395.5 493.5 L 497.5 493.5 L 497.5 523.5 L 395.5 523.5 Z M 259.5 520.5 L 307.5 520.5 L 307.5 530.5 L 259.5 530.5 Z M 1308.5 508.5 L 1359.5 508.5 L 1359.5 530.5 L 1308.5 530.5 Z M 395.5 523.5 L 497.5 523.5 L 497.5 530.5 L 395.5 530.5 Z M 1607.5 523.5 L 1658.5 523.5 L 1658.5 530.5 L 1607.5 530.5 Z M 586.5 518.5 L 633.5 518.5 L 633.5 530.5 L 586.5 530.5 Z M 1448.5 473.5 L 1518.5 473.5 L 1518.5 530.5 L 1448.5 530.5 Z M 233.5 909.5 L 1684.5 909.5 L 1684.5 939.5 L 233.5 939.5 Z M 233.5 909.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1362.5 696.5 L 1451.5 696.5 L 1451.5 770.5 L 1362.5 770.5 Z M 485.5 754.5 L 574.5 754.5 L 574.5 829.5 L 485.5 829.5 Z M 347.5 754.5 L 435.5 754.5 L 435.5 829.5 L 347.5 829.5 Z M 1126.5 754.5 L 1215.5 754.5 L 1215.5 829.5 L 1126.5 829.5 Z M 999.5 754.5 L 1088.5 754.5 L 1088.5 829.5 L 999.5 829.5 Z M 861.5 754.5 L 950.5 754.5 L 950.5 829.5 L 861.5 829.5 Z M 722.5 754.5 L 811.5 754.5 L 811.5 829.5 L 722.5 829.5 Z M 1522.5 696.5 L 1610.5 696.5 L 1610.5 829.5 L 1522.5 829.5 Z M 1522.5 696.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 886.5 269.5 L 975.5 269.5 L 975.5 402.5 L 886.5 402.5 Z M 1046.5 327.5 L 1135.5 327.5 L 1135.5 402.5 L 1046.5 402.5 Z M 1172.5 327.5 L 1261.5 327.5 L 1261.5 402.5 L 1172.5 402.5 Z M 734.5 269.5 L 823.5 269.5 L 823.5 402.5 L 734.5 402.5 Z M 1518.5 263.5 L 1607.5 263.5 L 1607.5 530.5 L 1518.5 530.5 Z M 1359.5 456.5 L 1448.5 456.5 L 1448.5 530.5 L 1359.5 530.5 Z M 497.5 397.5 L 586.5 397.5 L 586.5 530.5 L 497.5 530.5 Z M 307.5 397.5 L 395.5 397.5 L 395.5 530.5 L 307.5 530.5 Z M 307.5 397.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 260.5 185.5 L 291.5 185.5 L 291.5 215.5 L 260.5 215.5 Z M 1626.5 185.5 L 1657.5 185.5 L 1657.5 215.5 L 1626.5 215.5 Z M 1541.5 185.5 L 1571.5 185.5 L 1571.5 215.5 L 1541.5 215.5 Z M 1456.5 185.5 L 1486.5 185.5 L 1486.5 215.5 L 1456.5 215.5 Z M 1370.5 185.5 L 1401.5 185.5 L 1401.5 215.5 L 1370.5 215.5 Z M 1285.5 185.5 L 1315.5 185.5 L 1315.5 215.5 L 1285.5 215.5 Z M 1200.5 185.5 L 1230.5 185.5 L 1230.5 215.5 L 1200.5 215.5 Z M 1114.5 185.5 L 1144.5 185.5 L 1144.5 215.5 L 1114.5 215.5 Z M 1029.5 185.5 L 1059.5 185.5 L 1059.5 215.5 L 1029.5 215.5 Z M 943.5 185.5 L 974.5 185.5 L 974.5 215.5 L 943.5 215.5 Z M 858.5 185.5 L 888.5 185.5 L 888.5 215.5 L 858.5 215.5 Z M 773.5 185.5 L 803.5 185.5 L 803.5 215.5 L 773.5 215.5 Z M 687.5 185.5 L 717.5 185.5 L 717.5 215.5 L 687.5 215.5 Z M 602.5 185.5 L 632.5 185.5 L 632.5 215.5 L 602.5 215.5 Z M 516.5 185.5 L 547.5 185.5 L 547.5 215.5 L 516.5 215.5 Z M 431.5 185.5 L 461.5 185.5 L 461.5 215.5 L 431.5 215.5 Z M 346.5 185.5 L 376.5 185.5 L 376.5 215.5 L 346.5 215.5 Z M 702.5 271.5 L 733.5 271.5 L 733.5 279.5 L 702.5 279.5 Z M 702.5 279.5 L 733.5 279.5 L 733.5 301.5 L 702.5 301.5 Z M 1465.5 271.5 L 1495.5 271.5 L 1495.5 301.5 L 1465.5 301.5 Z M 1401.5 271.5 L 1431.5 271.5 L 1431.5 301.5 L 1401.5 301.5 Z M 1304.5 271.5 L 1334.5 271.5 L 1334.5 301.5 L 1304.5 301.5 Z M 1240.5 271.5 L 1270.5 271.5 L 1270.5 301.5 L 1240.5 301.5 Z M 1176.5 271.5 L 1206.5 271.5 L 1206.5 301.5 L 1176.5 301.5 Z M 1529.5 271.5 L 1559.5 271.5 L 1559.5 301.5 L 1529.5 301.5 Z M 457.5 271.5 L 487.5 271.5 L 487.5 301.5 L 457.5 301.5 Z M 638.5 271.5 L 669.5 271.5 L 669.5 301.5 L 638.5 301.5 Z M 574.5 271.5 L 604.5 271.5 L 604.5 301.5 L 574.5 301.5 Z M 329.5 271.5 L 359.5 271.5 L 359.5 301.5 L 329.5 301.5 Z M 393.5 271.5 L 423.5 271.5 L 423.5 301.5 L 393.5 301.5 Z M 388.5 824.5 L 419.5 824.5 L 419.5 854.5 L 388.5 854.5 Z M 1532.5 824.5 L 1562.5 824.5 L 1562.5 854.5 L 1532.5 854.5 Z M 1468.5 824.5 L 1498.5 824.5 L 1498.5 854.5 L 1468.5 854.5 Z M 1404.5 824.5 L 1434.5 824.5 L 1434.5 854.5 L 1404.5 854.5 Z M 1240.5 824.5 L 1270.5 824.5 L 1270.5 854.5 L 1240.5 854.5 Z M 1176.5 824.5 L 1206.5 824.5 L 1206.5 854.5 L 1176.5 854.5 Z M 730.5 824.5 L 760.5 824.5 L 760.5 854.5 L 730.5 854.5 Z M 666.5 824.5 L 696.5 824.5 L 696.5 854.5 L 666.5 854.5 Z M 516.5 824.5 L 547.5 824.5 L 547.5 854.5 L 516.5 854.5 Z M 452.5 824.5 L 483.5 824.5 L 483.5 854.5 L 452.5 854.5 Z M 260.5 909.5 L 291.5 909.5 L 291.5 939.5 L 260.5 939.5 Z M 1626.5 909.5 L 1657.5 909.5 L 1657.5 939.5 L 1626.5 939.5 Z M 1541.5 909.5 L 1571.5 909.5 L 1571.5 939.5 L 1541.5 939.5 Z M 1456.5 909.5 L 1486.5 909.5 L 1486.5 939.5 L 1456.5 939.5 Z M 1370.5 909.5 L 1401.5 909.5 L 1401.5 939.5 L 1370.5 939.5 Z M 1285.5 909.5 L 1315.5 909.5 L 1315.5 939.5 L 1285.5 939.5 Z M 1200.5 909.5 L 1230.5 909.5 L 1230.5 939.5 L 1200.5 939.5 Z M 1114.5 909.5 L 1144.5 909.5 L 1144.5 939.5 L 1114.5 939.5 Z M 1029.5 909.5 L 1059.5 909.5 L 1059.5 939.5 L 1029.5 939.5 Z M 943.5 909.5 L 974.5 909.5 L 974.5 939.5 L 943.5 939.5 Z M 858.5 909.5 L 888.5 909.5 L 888.5 939.5 L 858.5 939.5 Z M 773.5 909.5 L 803.5 909.5 L 803.5 939.5 L 773.5 939.5 Z M 687.5 909.5 L 717.5 909.5 L 717.5 939.5 L 687.5 939.5 Z M 602.5 909.5 L 632.5 909.5 L 632.5 939.5 L 602.5 939.5 Z M 516.5 909.5 L 547.5 909.5 L 547.5 939.5 L 516.5 939.5 Z M 431.5 909.5 L 461.5 909.5 L 461.5 939.5 L 431.5 939.5 Z M 346.5 909.5 L 376.5 909.5 L 376.5 939.5 L 346.5 939.5 Z M 346.5 909.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface339">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -186,6 +186,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1661.539062 581.488281 L 1659.097656 584.5 L 1653.648438 579.984375 L 1652.09375 580.816406 L 1650.535156 581.4375 L 1648.929688 581.957031 L 1647.214844 582.320312 L 1645.503906 582.527344 L 1643.738281 582.632812 L 1641.351562 582.476562 L 1639.121094 582.113281 L 1637.042969 581.488281 L 1635.070312 580.660156 L 1633.203125 579.570312 L 1631.542969 578.167969 L 1630.039062 576.664062 L 1628.742188 574.953125 L 1627.703125 573.082031 L 1626.820312 571.058594 L 1626.148438 568.878906 L 1625.730469 566.492188 L 1625.628906 565.921875 L 1625.574219 565.300781 L 1625.523438 564.730469 L 1625.472656 564.105469 L 1625.472656 562.808594 L 1625.574219 560.214844 L 1625.9375 557.722656 L 1626.511719 555.441406 L 1627.339844 553.261719 L 1628.378906 551.234375 L 1629.726562 549.367188 L 1631.078125 547.863281 L 1632.632812 546.515625 L 1634.347656 545.371094 L 1636.160156 544.488281 L 1638.132812 543.765625 L 1640.3125 543.246094 L 1640.832031 543.191406 L 1642.542969 543.039062 L 1643.117188 543.039062 L 1643.738281 542.984375 L 1646.074219 543.140625 L 1648.304688 543.503906 L 1650.378906 544.125 L 1652.351562 544.957031 L 1654.222656 546.046875 L 1655.933594 547.394531 L 1657.386719 548.953125 L 1658.683594 550.613281 L 1659.722656 552.429688 L 1660.605469 554.453125 L 1661.277344 556.632812 L 1661.746094 558.917969 L 1661.796875 559.589844 L 1661.847656 560.214844 L 1661.902344 560.835938 L 1661.953125 561.460938 L 1661.953125 562.082031 L 1662.003906 562.703125 L 1661.847656 565.609375 L 1661.382812 568.359375 L 1660.65625 570.902344 L 1659.617188 573.292969 L 1658.269531 575.46875 L 1656.660156 577.496094 Z M 1648.460938 570.800781 L 1653.078125 574.589844 L 1654.324219 573.03125 L 1655.363281 571.265625 L 1656.140625 569.347656 L 1656.710938 567.324219 L 1657.023438 565.144531 L 1657.179688 562.757812 L 1657.074219 560.578125 L 1656.765625 558.5 L 1656.246094 556.582031 L 1655.570312 554.816406 L 1654.6875 553.15625 L 1653.597656 551.652344 L 1652.351562 550.40625 L 1651.054688 549.367188 L 1649.601562 548.539062 L 1648.046875 547.914062 L 1646.332031 547.5 L 1644.570312 547.242188 L 1643.738281 547.242188 L 1641.871094 547.394531 L 1640.105469 547.707031 L 1638.445312 548.226562 L 1636.941406 549.003906 L 1635.539062 549.992188 L 1634.292969 551.183594 L 1633.101562 552.585938 L 1632.167969 554.140625 L 1631.386719 555.855469 L 1630.816406 557.722656 L 1630.453125 559.746094 L 1630.296875 561.925781 L 1630.296875 562.808594 L 1630.351562 565.09375 L 1630.660156 567.167969 L 1631.179688 569.085938 L 1631.855469 570.902344 L 1632.789062 572.566406 L 1633.929688 574.015625 L 1635.125 575.316406 L 1636.472656 576.351562 L 1637.925781 577.183594 L 1639.484375 577.753906 L 1641.195312 578.167969 L 1643.011719 578.324219 L 1643.117188 578.375 L 1644.621094 578.375 L 1645.605469 578.273438 L 1646.59375 578.066406 L 1647.527344 577.859375 L 1648.460938 577.546875 L 1649.445312 577.132812 L 1649.5 577.132812 L 1649.601562 577.078125 L 1649.652344 577.027344 L 1649.757812 577.027344 L 1649.808594 576.976562 L 1649.914062 576.921875 L 1646.074219 573.707031 Z M 1648.460938 570.800781 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1626 532 L 1657 532 M 1626 502 L 1657 502 M 1626 502 L 1626 532 M 1657 502 L 1657 532 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1626 532 L 1657 532 M 1626 502 L 1657 502 M 1657 532 L 1657 502 M 1626 532 L 1626 502 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 233 150 L 233 159 M 228 155 L 237 155 M 232 156 L 234 156 M 232 154 L 234 154 M 232 154 L 232 156 M 234 154 L 234 156 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hvl__einvn_1.svg b/cells/einvn/sky130_fd_sc_hvl__einvn_1.svg
index 15dcfdf..f55ff01 100644
--- a/cells/einvn/sky130_fd_sc_hvl__einvn_1.svg
+++ b/cells/einvn/sky130_fd_sc_hvl__einvn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 672.5 707.5 L 1248.5 707.5 L 1248.5 731.5 L 672.5 731.5 Z M 672.5 731.5 L 1248.5 731.5 L 1248.5 763.5 L 672.5 763.5 Z M 672.5 763.5 L 1248.5 763.5 L 1248.5 787.5 L 672.5 787.5 Z M 845.5 787.5 L 1248.5 787.5 L 1248.5 810.5 L 845.5 810.5 Z M 845.5 810.5 L 1248.5 810.5 L 1248.5 842.5 L 845.5 842.5 Z M 845.5 842.5 L 1248.5 842.5 L 1248.5 850.5 L 845.5 850.5 Z M 845.5 842.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 877.5 245.5 L 941.5 245.5 L 941.5 252.5 L 877.5 252.5 Z M 1194.5 245.5 L 1248.5 245.5 L 1248.5 252.5 L 1194.5 252.5 Z M 877.5 252.5 L 941.5 252.5 L 941.5 285.5 L 877.5 285.5 Z M 1194.5 252.5 L 1248.5 252.5 L 1248.5 285.5 L 1194.5 285.5 Z M 877.5 285.5 L 941.5 285.5 L 941.5 328.5 L 877.5 328.5 Z M 1194.5 285.5 L 1248.5 285.5 L 1248.5 331.5 L 1194.5 331.5 Z M 877.5 328.5 L 941.5 328.5 L 941.5 361.5 L 877.5 361.5 Z M 1194.5 331.5 L 1248.5 331.5 L 1248.5 364.5 L 1194.5 364.5 Z M 877.5 361.5 L 941.5 361.5 L 941.5 384.5 L 877.5 384.5 Z M 686.5 384.5 L 740.5 384.5 L 740.5 391.5 L 686.5 391.5 Z M 835.5 384.5 L 941.5 384.5 L 941.5 405.5 L 835.5 405.5 Z M 1194.5 364.5 L 1248.5 364.5 L 1248.5 411.5 L 1194.5 411.5 Z M 686.5 391.5 L 740.5 391.5 L 740.5 424.5 L 686.5 424.5 Z M 835.5 405.5 L 941.5 405.5 L 941.5 438.5 L 835.5 438.5 Z M 1194.5 411.5 L 1248.5 411.5 L 1248.5 444.5 L 1194.5 444.5 Z M 835.5 438.5 L 941.5 438.5 L 941.5 482.5 L 835.5 482.5 Z M 686.5 424.5 L 740.5 424.5 L 740.5 486.5 L 686.5 486.5 Z M 1194.5 444.5 L 1248.5 444.5 L 1248.5 490.5 L 1194.5 490.5 Z M 835.5 482.5 L 941.5 482.5 L 941.5 514.5 L 835.5 514.5 Z M 686.5 486.5 L 740.5 486.5 L 740.5 519.5 L 686.5 519.5 Z M 1194.5 490.5 L 1248.5 490.5 L 1248.5 522.5 L 1194.5 522.5 Z M 835.5 514.5 L 941.5 514.5 L 941.5 526.5 L 835.5 526.5 Z M 686.5 519.5 L 740.5 519.5 L 740.5 526.5 L 686.5 526.5 Z M 1194.5 522.5 L 1248.5 522.5 L 1248.5 530.5 L 1194.5 530.5 Z M 1036.5 245.5 L 1099.5 245.5 L 1099.5 530.5 L 1036.5 530.5 Z M 893.5 526.5 L 941.5 526.5 L 941.5 530.5 L 893.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 722.5 707.5 L 817.5 707.5 L 817.5 787.5 L 722.5 787.5 Z M 1099.5 707.5 L 1194.5 707.5 L 1194.5 850.5 L 1099.5 850.5 Z M 964.5 707.5 L 1059.5 707.5 L 1059.5 850.5 L 964.5 850.5 Z M 964.5 707.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 740.5 384.5 L 835.5 384.5 L 835.5 526.5 L 740.5 526.5 Z M 1099.5 245.5 L 1194.5 245.5 L 1194.5 530.5 L 1099.5 530.5 Z M 941.5 245.5 L 1036.5 245.5 L 1036.5 530.5 L 941.5 530.5 Z M 941.5 245.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 790.5 252.5 L 822.5 252.5 L 822.5 285.5 L 790.5 285.5 Z M 1132.5 252.5 L 1164.5 252.5 L 1164.5 285.5 L 1132.5 285.5 Z M 1064.5 252.5 L 1096.5 252.5 L 1096.5 285.5 L 1064.5 285.5 Z M 995.5 252.5 L 1027.5 252.5 L 1027.5 285.5 L 995.5 285.5 Z M 927.5 252.5 L 959.5 252.5 L 959.5 285.5 L 927.5 285.5 Z M 858.5 252.5 L 890.5 252.5 L 890.5 285.5 L 858.5 285.5 Z M 727.5 844.5 L 759.5 844.5 L 759.5 876.5 L 727.5 876.5 Z M 1138.5 844.5 L 1170.5 844.5 L 1170.5 876.5 L 1138.5 876.5 Z M 1069.5 844.5 L 1102.5 844.5 L 1102.5 876.5 L 1069.5 876.5 Z M 1001.5 844.5 L 1033.5 844.5 L 1033.5 876.5 L 1001.5 876.5 Z M 932.5 844.5 L 965.5 844.5 L 965.5 876.5 L 932.5 876.5 Z M 864.5 844.5 L 896.5 844.5 L 896.5 876.5 L 864.5 876.5 Z M 795.5 844.5 L 828.5 844.5 L 828.5 876.5 L 795.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface359">
+<g id="surface386">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -222,6 +222,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1254.09375 332.601562 L 1254.09375 337.316406 L 1229.632812 368.898438 L 1254.207031 368.898438 L 1254.207031 373.5 L 1223.070312 373.5 L 1223.070312 368.898438 L 1247.644531 337.203125 L 1224.640625 337.203125 L 1224.640625 332.601562 Z M 1254.09375 332.601562 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1221 742 L 1253 742 M 1221 710 L 1253 710 M 1221 710 L 1221 742 M 1253 710 L 1253 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1221 742 L 1253 742 M 1221 710 L 1253 710 M 1253 742 L 1253 710 M 1221 742 L 1221 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hvl__einvp_1.svg b/cells/einvp/sky130_fd_sc_hvl__einvp_1.svg
index ecb030c..161baef 100644
--- a/cells/einvp/sky130_fd_sc_hvl__einvp_1.svg
+++ b/cells/einvp/sky130_fd_sc_hvl__einvp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 672.5 692.5 L 1254.5 692.5 L 1254.5 716.5 L 672.5 716.5 Z M 672.5 716.5 L 1254.5 716.5 L 1254.5 748.5 L 672.5 748.5 Z M 672.5 748.5 L 1254.5 748.5 L 1254.5 772.5 L 672.5 772.5 Z M 887.5 772.5 L 1254.5 772.5 L 1254.5 795.5 L 887.5 795.5 Z M 887.5 795.5 L 1254.5 795.5 L 1254.5 827.5 L 887.5 827.5 Z M 887.5 827.5 L 1254.5 827.5 L 1254.5 835.5 L 887.5 835.5 Z M 887.5 827.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 887.5 245.5 L 941.5 245.5 L 941.5 252.5 L 887.5 252.5 Z M 1200.5 245.5 L 1254.5 245.5 L 1254.5 252.5 L 1200.5 252.5 Z M 887.5 252.5 L 941.5 252.5 L 941.5 285.5 L 887.5 285.5 Z M 1200.5 252.5 L 1254.5 252.5 L 1254.5 285.5 L 1200.5 285.5 Z M 887.5 285.5 L 941.5 285.5 L 941.5 329.5 L 887.5 329.5 Z M 1200.5 285.5 L 1254.5 285.5 L 1254.5 331.5 L 1200.5 331.5 Z M 887.5 329.5 L 941.5 329.5 L 941.5 362.5 L 887.5 362.5 Z M 1200.5 331.5 L 1254.5 331.5 L 1254.5 364.5 L 1200.5 364.5 Z M 887.5 362.5 L 941.5 362.5 L 941.5 387.5 L 887.5 387.5 Z M 719.5 387.5 L 773.5 387.5 L 773.5 395.5 L 719.5 395.5 Z M 868.5 387.5 L 941.5 387.5 L 941.5 408.5 L 868.5 408.5 Z M 1200.5 364.5 L 1254.5 364.5 L 1254.5 411.5 L 1200.5 411.5 Z M 719.5 395.5 L 773.5 395.5 L 773.5 427.5 L 719.5 427.5 Z M 868.5 408.5 L 941.5 408.5 L 941.5 441.5 L 868.5 441.5 Z M 1200.5 411.5 L 1254.5 411.5 L 1254.5 444.5 L 1200.5 444.5 Z M 868.5 441.5 L 941.5 441.5 L 941.5 485.5 L 868.5 485.5 Z M 719.5 427.5 L 773.5 427.5 L 773.5 490.5 L 719.5 490.5 Z M 1200.5 444.5 L 1254.5 444.5 L 1254.5 490.5 L 1200.5 490.5 Z M 868.5 485.5 L 941.5 485.5 L 941.5 518.5 L 868.5 518.5 Z M 1200.5 490.5 L 1254.5 490.5 L 1254.5 522.5 L 1200.5 522.5 Z M 719.5 490.5 L 773.5 490.5 L 773.5 522.5 L 719.5 522.5 Z M 1200.5 522.5 L 1254.5 522.5 L 1254.5 530.5 L 1200.5 530.5 Z M 868.5 518.5 L 941.5 518.5 L 941.5 530.5 L 868.5 530.5 Z M 1036.5 245.5 L 1104.5 245.5 L 1104.5 530.5 L 1036.5 530.5 Z M 719.5 522.5 L 773.5 522.5 L 773.5 530.5 L 719.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 726.5 692.5 L 821.5 692.5 L 821.5 772.5 L 726.5 772.5 Z M 1104.5 692.5 L 1200.5 692.5 L 1200.5 835.5 L 1104.5 835.5 Z M 941.5 692.5 L 1036.5 692.5 L 1036.5 835.5 L 941.5 835.5 Z M 941.5 692.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image343"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1104.5 245.5 L 1200.5 245.5 L 1200.5 530.5 L 1104.5 530.5 Z M 773.5 387.5 L 868.5 387.5 L 868.5 530.5 L 773.5 530.5 Z M 941.5 245.5 L 1036.5 245.5 L 1036.5 530.5 L 941.5 530.5 Z M 941.5 245.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 801.5 252.5 L 833.5 252.5 L 833.5 285.5 L 801.5 285.5 Z M 1143.5 252.5 L 1176.5 252.5 L 1176.5 285.5 L 1143.5 285.5 Z M 1075.5 252.5 L 1107.5 252.5 L 1107.5 285.5 L 1075.5 285.5 Z M 1006.5 252.5 L 1039.5 252.5 L 1039.5 285.5 L 1006.5 285.5 Z M 938.5 252.5 L 970.5 252.5 L 970.5 285.5 L 938.5 285.5 Z M 869.5 252.5 L 902.5 252.5 L 902.5 285.5 L 869.5 285.5 Z M 732.5 844.5 L 765.5 844.5 L 765.5 876.5 L 732.5 876.5 Z M 1143.5 844.5 L 1176.5 844.5 L 1176.5 876.5 L 1143.5 876.5 Z M 1075.5 844.5 L 1107.5 844.5 L 1107.5 876.5 L 1075.5 876.5 Z M 1006.5 844.5 L 1039.5 844.5 L 1039.5 876.5 L 1006.5 876.5 Z M 938.5 844.5 L 970.5 844.5 L 970.5 876.5 L 938.5 876.5 Z M 869.5 844.5 L 902.5 844.5 L 902.5 876.5 L 869.5 876.5 Z M 801.5 844.5 L 833.5 844.5 L 833.5 876.5 L 801.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface363">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -212,6 +212,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1154.09375 502.214844 L 1138.328125 502.214844 L 1134.007812 514.5 L 1128.453125 514.5 L 1143.039062 473.601562 L 1149.773438 473.601562 L 1164.132812 514.5 L 1158.300781 514.5 Z M 1152.632812 497.839844 L 1146.351562 479.210938 L 1139.617188 497.839844 Z M 1152.632812 497.839844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1129 601 L 1162 601 M 1129 569 L 1162 569 M 1129 569 L 1129 601 M 1162 569 L 1162 601 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1129 601 L 1162 601 M 1129 569 L 1162 569 M 1162 601 L 1162 569 M 1129 601 L 1129 569 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hvl__fill_1.svg b/cells/fill/sky130_fd_sc_hvl__fill_1.svg
index 7908108..ffbb88e 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill_1.svg
+++ b/cells/fill/sky130_fd_sc_hvl__fill_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 857.5 98.5 L 1074.5 98.5 L 1074.5 593.5 L 857.5 593.5 Z M 857.5 98.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,16 +17,16 @@
 <clipPath id="clip3">
   <path d="M 920.5 161.5 L 1011.5 161.5 L 1011.5 193.5 L 920.5 193.5 Z M 920.5 161.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
 </mask>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -35,14 +35,14 @@
   <path d="M 920.5 935.5 L 1011.5 935.5 L 1011.5 968.5 L 920.5 968.5 Z M 920.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -56,15 +56,15 @@
 <clipPath id="clip7">
   <path d="M 949.5 161.5 L 982.5 161.5 L 982.5 193.5 L 949.5 193.5 Z M 949.5 935.5 L 982.5 935.5 L 982.5 968.5 L 949.5 968.5 Z M 949.5 935.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -125,6 +125,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1014.894531 888.210938 L 1014.894531 847.3125 L 1030.660156 847.3125 L 1033.128906 847.480469 L 1035.429688 847.929688 L 1037.558594 848.714844 L 1039.523438 849.722656 L 1041.261719 851.125 L 1042.890625 852.753906 L 1044.238281 854.71875 L 1045.359375 856.847656 L 1046.199219 859.261719 L 1046.816406 861.84375 L 1047.152344 864.703125 L 1047.320312 867.734375 L 1047.152344 870.929688 L 1046.761719 873.902344 L 1046.085938 876.597656 L 1045.191406 879.066406 L 1044.011719 881.253906 L 1042.554688 883.160156 L 1040.984375 884.730469 L 1039.242188 885.964844 L 1037.335938 886.976562 L 1035.261719 887.648438 L 1033.015625 888.097656 L 1030.660156 888.210938 Z M 1020.113281 883.609375 L 1029.761719 883.609375 L 1032.34375 883.441406 L 1034.644531 882.824219 L 1036.664062 881.757812 L 1038.347656 880.355469 L 1039.691406 878.449219 L 1040.8125 876.148438 L 1041.152344 874.96875 L 1041.488281 873.734375 L 1041.769531 872.390625 L 1041.9375 870.929688 L 1042.046875 869.414062 L 1042.105469 867.789062 L 1041.878906 864.140625 L 1041.320312 860.945312 L 1040.308594 858.195312 L 1038.960938 856.007812 L 1037.222656 854.210938 L 1035.09375 852.921875 L 1034.304688 852.640625 L 1033.464844 852.359375 L 1031.667969 852.023438 L 1029.761719 851.914062 L 1020.113281 851.914062 Z M 1020.113281 883.609375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 920 246 L 1011 246 M 920 176 L 1011 176 M 920 176 L 920 246 M 1011 176 L 1011 246 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 920 246 L 1011 246 M 920 176 L 1011 176 M 1011 246 L 1011 176 M 920 246 L 920 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 920 122 L 920 131 M 915 127 L 924 127 M 919 128 L 921 128 M 919 126 L 921 126 M 919 126 L 919 128 M 921 126 L 921 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hvl__fill_2.svg b/cells/fill/sky130_fd_sc_hvl__fill_2.svg
index 6d1acca..1cd02e1 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill_2.svg
+++ b/cells/fill/sky130_fd_sc_hvl__fill_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 811.5 98.5 L 1120.5 98.5 L 1120.5 593.5 L 811.5 593.5 Z M 811.5 98.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,16 +17,16 @@
 <clipPath id="clip3">
   <path d="M 874.5 161.5 L 1057.5 161.5 L 1057.5 193.5 L 874.5 193.5 Z M 874.5 161.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
 </mask>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -35,14 +35,14 @@
   <path d="M 874.5 935.5 L 1057.5 935.5 L 1057.5 968.5 L 874.5 968.5 Z M 874.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -56,15 +56,15 @@
 <clipPath id="clip7">
   <path d="M 904.5 161.5 L 936.5 161.5 L 936.5 193.5 L 904.5 193.5 Z M 995.5 161.5 L 1027.5 161.5 L 1027.5 193.5 L 995.5 193.5 Z M 904.5 935.5 L 936.5 935.5 L 936.5 968.5 L 904.5 968.5 Z M 995.5 935.5 L 1027.5 935.5 L 1027.5 968.5 L 995.5 968.5 Z M 995.5 935.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -125,6 +125,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1021.175781 197.832031 L 1021.066406 199.625 L 1020.785156 201.253906 L 1020.28125 202.769531 L 1019.605469 204.113281 L 1018.707031 205.40625 L 1017.644531 206.527344 L 1016.464844 207.480469 L 1015.230469 208.210938 L 1013.828125 208.769531 L 1012.371094 209.21875 L 1010.796875 209.445312 L 1009.117188 209.5 L 990.660156 209.5 L 990.660156 168.601562 L 1007.265625 168.601562 L 1009.675781 168.769531 L 1011.808594 169.164062 L 1013.714844 169.835938 L 1015.34375 170.789062 L 1016.746094 172.023438 L 1017.867188 173.539062 L 1018.316406 174.378906 L 1018.707031 175.277344 L 1018.988281 176.121094 L 1019.214844 177.074219 L 1019.324219 178.027344 L 1019.382812 178.980469 L 1019.214844 181 L 1018.707031 182.738281 L 1017.921875 184.367188 L 1016.800781 185.714844 L 1015.398438 186.949219 L 1013.714844 187.902344 L 1015.34375 188.628906 L 1016.746094 189.414062 L 1017.980469 190.3125 L 1018.988281 191.324219 L 1019.773438 192.390625 L 1020.390625 193.511719 L 1020.617188 194.183594 L 1020.785156 194.859375 L 1020.953125 195.53125 L 1021.066406 196.316406 L 1021.121094 197.046875 Z M 1014.164062 179.710938 L 1013.996094 178.027344 L 1013.492188 176.625 L 1012.707031 175.390625 L 1011.585938 174.492188 L 1010.179688 173.820312 L 1008.441406 173.371094 L 1008.050781 173.371094 L 1007.65625 173.316406 L 1007.265625 173.257812 L 1006.367188 173.257812 L 1005.972656 173.203125 L 995.875 173.203125 L 995.875 186.21875 L 1005.972656 186.21875 L 1008.050781 186.105469 L 1009.84375 185.769531 L 1011.359375 185.152344 L 1012.480469 184.3125 L 1013.378906 183.1875 L 1013.941406 181.84375 L 1013.996094 181.5625 L 1014.050781 181.226562 L 1014.109375 180.886719 L 1014.109375 180.101562 Z M 1008.609375 204.898438 L 1010.179688 204.84375 L 1011.585938 204.507812 L 1012.820312 203.945312 L 1013.828125 203.214844 L 1014.667969 202.261719 L 1015.34375 201.085938 L 1015.511719 200.636719 L 1015.625 200.132812 L 1015.792969 199.570312 L 1015.847656 199.066406 L 1015.902344 198.503906 L 1015.960938 197.886719 L 1015.847656 196.652344 L 1015.625 195.476562 L 1015.230469 194.464844 L 1014.667969 193.511719 L 1013.941406 192.726562 L 1013.097656 191.996094 L 1012.480469 191.660156 L 1011.808594 191.378906 L 1011.078125 191.15625 L 1010.292969 190.988281 L 1009.453125 190.875 L 1008.609375 190.820312 L 995.875 190.820312 L 995.875 204.898438 Z M 1008.609375 204.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 966 886 L 966 893 M 962 890 L 969 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 966 890 L 966 890 M 966 890 L 966 890 M 966 890 L 966 890 M 966 890 L 966 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 874 122 L 874 131 M 869 127 L 878 127 M 873 128 L 875 128 M 873 126 L 875 126 M 873 126 L 873 128 M 875 126 L 875 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hvl__fill_4.svg b/cells/fill/sky130_fd_sc_hvl__fill_4.svg
index a654b5c..3c2698b 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill_4.svg
+++ b/cells/fill/sky130_fd_sc_hvl__fill_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 719.5 98.5 L 1210.5 98.5 L 1210.5 593.5 L 719.5 593.5 Z M 719.5 98.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,16 +17,16 @@
 <clipPath id="clip3">
   <path d="M 782.5 161.5 L 1147.5 161.5 L 1147.5 193.5 L 782.5 193.5 Z M 782.5 161.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
 </mask>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -35,14 +35,14 @@
   <path d="M 782.5 935.5 L 1147.5 935.5 L 1147.5 968.5 L 782.5 968.5 Z M 782.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -56,15 +56,15 @@
 <clipPath id="clip7">
   <path d="M 811.5 161.5 L 844.5 161.5 L 844.5 193.5 L 811.5 193.5 Z M 1085.5 161.5 L 1118.5 161.5 L 1118.5 193.5 L 1085.5 193.5 Z M 994.5 161.5 L 1026.5 161.5 L 1026.5 193.5 L 994.5 193.5 Z M 903.5 161.5 L 935.5 161.5 L 935.5 193.5 L 903.5 193.5 Z M 811.5 935.5 L 844.5 935.5 L 844.5 968.5 L 811.5 968.5 Z M 1085.5 935.5 L 1118.5 935.5 L 1118.5 968.5 L 1085.5 968.5 Z M 994.5 935.5 L 1026.5 935.5 L 1026.5 968.5 L 994.5 968.5 Z M 903.5 935.5 L 935.5 935.5 L 935.5 968.5 L 903.5 968.5 Z M 903.5 935.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -125,6 +125,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1020.175781 197.832031 L 1020.066406 199.625 L 1019.785156 201.253906 L 1019.28125 202.769531 L 1018.605469 204.113281 L 1017.707031 205.40625 L 1016.644531 206.527344 L 1015.464844 207.480469 L 1014.230469 208.210938 L 1012.828125 208.769531 L 1011.371094 209.21875 L 1009.796875 209.445312 L 1008.117188 209.5 L 989.660156 209.5 L 989.660156 168.601562 L 1006.265625 168.601562 L 1008.675781 168.769531 L 1010.808594 169.164062 L 1012.714844 169.835938 L 1014.34375 170.789062 L 1015.746094 172.023438 L 1016.867188 173.539062 L 1017.316406 174.378906 L 1017.707031 175.277344 L 1017.988281 176.121094 L 1018.214844 177.074219 L 1018.324219 178.027344 L 1018.382812 178.980469 L 1018.214844 181 L 1017.707031 182.738281 L 1016.921875 184.367188 L 1015.800781 185.714844 L 1014.398438 186.949219 L 1012.714844 187.902344 L 1014.34375 188.628906 L 1015.746094 189.414062 L 1016.980469 190.3125 L 1017.988281 191.324219 L 1018.773438 192.390625 L 1019.390625 193.511719 L 1019.617188 194.183594 L 1019.785156 194.859375 L 1019.953125 195.53125 L 1020.066406 196.316406 L 1020.121094 197.046875 Z M 1013.164062 179.710938 L 1012.996094 178.027344 L 1012.492188 176.625 L 1011.707031 175.390625 L 1010.585938 174.492188 L 1009.179688 173.820312 L 1007.441406 173.371094 L 1007.050781 173.371094 L 1006.65625 173.316406 L 1006.265625 173.257812 L 1005.367188 173.257812 L 1004.972656 173.203125 L 994.875 173.203125 L 994.875 186.21875 L 1004.972656 186.21875 L 1007.050781 186.105469 L 1008.84375 185.769531 L 1010.359375 185.152344 L 1011.480469 184.3125 L 1012.378906 183.1875 L 1012.941406 181.84375 L 1012.996094 181.5625 L 1013.050781 181.226562 L 1013.109375 180.886719 L 1013.109375 180.101562 Z M 1007.609375 204.898438 L 1009.179688 204.84375 L 1010.585938 204.507812 L 1011.820312 203.945312 L 1012.828125 203.214844 L 1013.667969 202.261719 L 1014.34375 201.085938 L 1014.511719 200.636719 L 1014.625 200.132812 L 1014.792969 199.570312 L 1014.847656 199.066406 L 1014.902344 198.503906 L 1014.960938 197.886719 L 1014.847656 196.652344 L 1014.625 195.476562 L 1014.230469 194.464844 L 1013.667969 193.511719 L 1012.941406 192.726562 L 1012.097656 191.996094 L 1011.480469 191.660156 L 1010.808594 191.378906 L 1010.078125 191.15625 L 1009.292969 190.988281 L 1008.453125 190.875 L 1007.609375 190.820312 L 994.875 190.820312 L 994.875 204.898438 Z M 1007.609375 204.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 965 886 L 965 893 M 961 890 L 968 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 965 890 L 965 890 M 965 890 L 965 890 M 965 890 L 965 890 M 965 890 L 965 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 782 122 L 782 131 M 777 127 L 786 127 M 781 128 L 783 128 M 781 126 L 783 126 M 781 126 L 781 128 M 783 126 L 783 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hvl__fill_8.svg b/cells/fill/sky130_fd_sc_hvl__fill_8.svg
index 5e66d97..a99e889 100644
--- a/cells/fill/sky130_fd_sc_hvl__fill_8.svg
+++ b/cells/fill/sky130_fd_sc_hvl__fill_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 535.5 98.5 L 1391.5 98.5 L 1391.5 593.5 L 535.5 593.5 Z M 535.5 98.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,16 +17,16 @@
 <clipPath id="clip3">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 597.5 161.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
 </mask>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -35,14 +35,14 @@
   <path d="M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -56,15 +56,15 @@
 <clipPath id="clip7">
   <path d="M 627.5 161.5 L 659.5 161.5 L 659.5 193.5 L 627.5 193.5 Z M 1266.5 161.5 L 1299.5 161.5 L 1299.5 193.5 L 1266.5 193.5 Z M 1175.5 161.5 L 1207.5 161.5 L 1207.5 193.5 L 1175.5 193.5 Z M 1084.5 161.5 L 1116.5 161.5 L 1116.5 193.5 L 1084.5 193.5 Z M 992.5 161.5 L 1025.5 161.5 L 1025.5 193.5 L 992.5 193.5 Z M 901.5 161.5 L 933.5 161.5 L 933.5 193.5 L 901.5 193.5 Z M 809.5 161.5 L 842.5 161.5 L 842.5 193.5 L 809.5 193.5 Z M 718.5 161.5 L 751.5 161.5 L 751.5 193.5 L 718.5 193.5 Z M 627.5 935.5 L 659.5 935.5 L 659.5 968.5 L 627.5 968.5 Z M 1266.5 935.5 L 1299.5 935.5 L 1299.5 968.5 L 1266.5 968.5 Z M 1175.5 935.5 L 1207.5 935.5 L 1207.5 968.5 L 1175.5 968.5 Z M 1084.5 935.5 L 1116.5 935.5 L 1116.5 968.5 L 1084.5 968.5 Z M 992.5 935.5 L 1025.5 935.5 L 1025.5 968.5 L 992.5 968.5 Z M 901.5 935.5 L 933.5 935.5 L 933.5 968.5 L 901.5 968.5 Z M 809.5 935.5 L 842.5 935.5 L 842.5 968.5 L 809.5 968.5 Z M 718.5 935.5 L 751.5 935.5 L 751.5 968.5 L 718.5 968.5 Z M 718.5 935.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -125,6 +125,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1019.175781 197.832031 L 1019.066406 199.625 L 1018.785156 201.253906 L 1018.28125 202.769531 L 1017.605469 204.113281 L 1016.707031 205.40625 L 1015.644531 206.527344 L 1014.464844 207.480469 L 1013.230469 208.210938 L 1011.828125 208.769531 L 1010.371094 209.21875 L 1008.796875 209.445312 L 1007.117188 209.5 L 988.660156 209.5 L 988.660156 168.601562 L 1005.265625 168.601562 L 1007.675781 168.769531 L 1009.808594 169.164062 L 1011.714844 169.835938 L 1013.34375 170.789062 L 1014.746094 172.023438 L 1015.867188 173.539062 L 1016.316406 174.378906 L 1016.707031 175.277344 L 1016.988281 176.121094 L 1017.214844 177.074219 L 1017.324219 178.027344 L 1017.382812 178.980469 L 1017.214844 181 L 1016.707031 182.738281 L 1015.921875 184.367188 L 1014.800781 185.714844 L 1013.398438 186.949219 L 1011.714844 187.902344 L 1013.34375 188.628906 L 1014.746094 189.414062 L 1015.980469 190.3125 L 1016.988281 191.324219 L 1017.773438 192.390625 L 1018.390625 193.511719 L 1018.617188 194.183594 L 1018.785156 194.859375 L 1018.953125 195.53125 L 1019.066406 196.316406 L 1019.121094 197.046875 Z M 1012.164062 179.710938 L 1011.996094 178.027344 L 1011.492188 176.625 L 1010.707031 175.390625 L 1009.585938 174.492188 L 1008.179688 173.820312 L 1006.441406 173.371094 L 1006.050781 173.371094 L 1005.65625 173.316406 L 1005.265625 173.257812 L 1004.367188 173.257812 L 1003.972656 173.203125 L 993.875 173.203125 L 993.875 186.21875 L 1003.972656 186.21875 L 1006.050781 186.105469 L 1007.84375 185.769531 L 1009.359375 185.152344 L 1010.480469 184.3125 L 1011.378906 183.1875 L 1011.941406 181.84375 L 1011.996094 181.5625 L 1012.050781 181.226562 L 1012.109375 180.886719 L 1012.109375 180.101562 Z M 1006.609375 204.898438 L 1008.179688 204.84375 L 1009.585938 204.507812 L 1010.820312 203.945312 L 1011.828125 203.214844 L 1012.667969 202.261719 L 1013.34375 201.085938 L 1013.511719 200.636719 L 1013.625 200.132812 L 1013.792969 199.570312 L 1013.847656 199.066406 L 1013.902344 198.503906 L 1013.960938 197.886719 L 1013.847656 196.652344 L 1013.625 195.476562 L 1013.230469 194.464844 L 1012.667969 193.511719 L 1011.941406 192.726562 L 1011.097656 191.996094 L 1010.480469 191.660156 L 1009.808594 191.378906 L 1009.078125 191.15625 L 1008.292969 190.988281 L 1007.453125 190.875 L 1006.609375 190.820312 L 993.875 190.820312 L 993.875 204.898438 Z M 1006.609375 204.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 963 886 L 963 893 M 959 890 L 966 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 963 890 L 963 890 M 963 890 L 963 890 M 963 890 L 963 890 M 963 890 L 963 890 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 597 122 L 597 131 M 592 127 L 601 127 M 596 128 L 598 128 M 596 126 L 598 126 M 596 126 L 596 128 M 598 126 L 598 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_1.svg b/cells/inv/sky130_fd_sc_hvl__inv_1.svg
index 991dbbf..62e408e 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_1.svg
+++ b/cells/inv/sky130_fd_sc_hvl__inv_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 765.5 98.5 L 1164.5 98.5 L 1164.5 593.5 L 765.5 593.5 Z M 765.5 98.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 828.5 161.5 L 1102.5 161.5 L 1102.5 193.5 L 828.5 193.5 Z M 828.5 161.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 828.5 161.5 L 1102.5 161.5 L 1102.5 193.5 L 828.5 193.5 Z M 869.5 707.5 L 1073.5 707.5 L 1073.5 715.5 L 869.5 715.5 Z M 869.5 715.5 L 1073.5 715.5 L 1073.5 747.5 L 869.5 747.5 Z M 869.5 747.5 L 1073.5 747.5 L 1073.5 810.5 L 869.5 810.5 Z M 869.5 810.5 L 1073.5 810.5 L 1073.5 842.5 L 869.5 842.5 Z M 869.5 842.5 L 1073.5 842.5 L 1073.5 850.5 L 869.5 850.5 Z M 869.5 842.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 828.5 935.5 L 1102.5 935.5 L 1102.5 968.5 L 828.5 968.5 Z M 828.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 866.5 245.5 L 920.5 245.5 L 920.5 252.5 L 866.5 252.5 Z M 1015.5 245.5 L 1069.5 245.5 L 1069.5 252.5 L 1015.5 252.5 Z M 1015.5 252.5 L 1069.5 252.5 L 1069.5 285.5 L 1015.5 285.5 Z M 866.5 252.5 L 920.5 252.5 L 920.5 285.5 L 866.5 285.5 Z M 866.5 285.5 L 920.5 285.5 L 920.5 331.5 L 866.5 331.5 Z M 1015.5 285.5 L 1069.5 285.5 L 1069.5 331.5 L 1015.5 331.5 Z M 866.5 331.5 L 920.5 331.5 L 920.5 364.5 L 866.5 364.5 Z M 1015.5 331.5 L 1069.5 331.5 L 1069.5 364.5 L 1015.5 364.5 Z M 866.5 364.5 L 920.5 364.5 L 920.5 411.5 L 866.5 411.5 Z M 1015.5 364.5 L 1069.5 364.5 L 1069.5 411.5 L 1015.5 411.5 Z M 866.5 411.5 L 920.5 411.5 L 920.5 444.5 L 866.5 444.5 Z M 1015.5 411.5 L 1069.5 411.5 L 1069.5 444.5 L 1015.5 444.5 Z M 866.5 444.5 L 920.5 444.5 L 920.5 490.5 L 866.5 490.5 Z M 1015.5 444.5 L 1069.5 444.5 L 1069.5 490.5 L 1015.5 490.5 Z M 1015.5 490.5 L 1069.5 490.5 L 1069.5 522.5 L 1015.5 522.5 Z M 866.5 490.5 L 920.5 490.5 L 920.5 522.5 L 866.5 522.5 Z M 1015.5 522.5 L 1069.5 522.5 L 1069.5 530.5 L 1015.5 530.5 Z M 866.5 522.5 L 920.5 522.5 L 920.5 530.5 L 866.5 530.5 Z M 828.5 935.5 L 1102.5 935.5 L 1102.5 968.5 L 828.5 968.5 Z M 828.5 935.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 924.5 707.5 L 1019.5 707.5 L 1019.5 850.5 L 924.5 850.5 Z M 924.5 707.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 920.5 245.5 L 1015.5 245.5 L 1015.5 530.5 L 920.5 530.5 Z M 920.5 245.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 857.5 161.5 L 889.5 161.5 L 889.5 193.5 L 857.5 193.5 Z M 1040.5 161.5 L 1072.5 161.5 L 1072.5 193.5 L 1040.5 193.5 Z M 948.5 161.5 L 981.5 161.5 L 981.5 193.5 L 948.5 193.5 Z M 850.5 252.5 L 883.5 252.5 L 883.5 285.5 L 850.5 285.5 Z M 919.5 252.5 L 951.5 252.5 L 951.5 285.5 L 919.5 285.5 Z M 850.5 844.5 L 883.5 844.5 L 883.5 876.5 L 850.5 876.5 Z M 919.5 844.5 L 951.5 844.5 L 951.5 876.5 L 919.5 876.5 Z M 857.5 935.5 L 889.5 935.5 L 889.5 968.5 L 857.5 968.5 Z M 1040.5 935.5 L 1072.5 935.5 L 1072.5 968.5 L 1040.5 968.5 Z M 948.5 935.5 L 981.5 935.5 L 981.5 968.5 L 948.5 968.5 Z M 948.5 935.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface316">
+<g id="surface358">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -198,6 +198,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1060.210938 357.457031 L 1060.210938 373.5 L 1054.992188 373.5 L 1054.992188 357.457031 L 1039.230469 332.601562 L 1045.679688 332.601562 L 1057.6875 352.519531 L 1069.355469 332.601562 L 1075.582031 332.601562 Z M 1060.210938 357.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1040 742 L 1072 742 M 1040 710 L 1072 710 M 1040 710 L 1040 742 M 1072 710 L 1072 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1040 742 L 1072 742 M 1040 710 L 1072 710 M 1072 742 L 1072 710 M 1040 742 L 1040 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 828 122 L 828 131 M 823 127 L 832 127 M 827 128 L 829 128 M 827 126 L 829 126 M 827 126 L 827 128 M 829 126 L 829 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_16.svg b/cells/inv/sky130_fd_sc_hvl__inv_16.svg
index 372b7cb..1155d88 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_16.svg
+++ b/cells/inv/sky130_fd_sc_hvl__inv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 278.5 L 1743.5 278.5 L 1743.5 568.5 L 174.5 568.5 Z M 174.5 278.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 211.5 315.5 L 1707.5 315.5 L 1707.5 334.5 L 211.5 334.5 Z M 211.5 315.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 211.5 315.5 L 1707.5 315.5 L 1707.5 334.5 L 211.5 334.5 Z M 229.5 615.5 L 1646.5 615.5 L 1646.5 622.5 L 229.5 622.5 Z M 229.5 622.5 L 1646.5 622.5 L 1646.5 641.5 L 229.5 641.5 Z M 229.5 641.5 L 1646.5 641.5 L 1646.5 663.5 L 229.5 663.5 Z M 229.5 663.5 L 1646.5 663.5 L 1646.5 682.5 L 229.5 682.5 Z M 229.5 682.5 L 1646.5 682.5 L 1646.5 699.5 L 229.5 699.5 Z M 229.5 682.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 211.5 768.5 L 1707.5 768.5 L 1707.5 787.5 L 211.5 787.5 Z M 211.5 768.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1182.5 364.5 L 1214.5 364.5 L 1214.5 368.5 L 1182.5 368.5 Z M 1009.5 364.5 L 1040.5 364.5 L 1040.5 368.5 L 1009.5 368.5 Z M 1530.5 364.5 L 1561.5 364.5 L 1561.5 368.5 L 1530.5 368.5 Z M 662.5 364.5 L 693.5 364.5 L 693.5 368.5 L 662.5 368.5 Z M 922.5 364.5 L 953.5 364.5 L 953.5 368.5 L 922.5 368.5 Z M 1269.5 364.5 L 1300.5 364.5 L 1300.5 368.5 L 1269.5 368.5 Z M 401.5 364.5 L 432.5 364.5 L 432.5 368.5 L 401.5 368.5 Z M 314.5 364.5 L 346.5 364.5 L 346.5 368.5 L 314.5 368.5 Z M 748.5 364.5 L 780.5 364.5 L 780.5 368.5 L 748.5 368.5 Z M 1356.5 364.5 L 1387.5 364.5 L 1387.5 368.5 L 1356.5 368.5 Z M 575.5 364.5 L 606.5 364.5 L 606.5 368.5 L 575.5 368.5 Z M 488.5 364.5 L 519.5 364.5 L 519.5 368.5 L 488.5 368.5 Z M 1443.5 364.5 L 1474.5 364.5 L 1474.5 368.5 L 1443.5 368.5 Z M 835.5 364.5 L 866.5 364.5 L 866.5 368.5 L 835.5 368.5 Z M 1096.5 364.5 L 1127.5 364.5 L 1127.5 368.5 L 1096.5 368.5 Z M 229.5 364.5 L 259.5 364.5 L 259.5 371.5 L 229.5 371.5 Z M 1616.5 364.5 L 1646.5 364.5 L 1646.5 371.5 L 1616.5 371.5 Z M 1443.5 368.5 L 1474.5 368.5 L 1474.5 387.5 L 1443.5 387.5 Z M 1269.5 368.5 L 1300.5 368.5 L 1300.5 387.5 L 1269.5 387.5 Z M 1182.5 368.5 L 1214.5 368.5 L 1214.5 387.5 L 1182.5 387.5 Z M 401.5 368.5 L 432.5 368.5 L 432.5 387.5 L 401.5 387.5 Z M 314.5 368.5 L 346.5 368.5 L 346.5 387.5 L 314.5 387.5 Z M 835.5 368.5 L 866.5 368.5 L 866.5 387.5 L 835.5 387.5 Z M 575.5 368.5 L 606.5 368.5 L 606.5 387.5 L 575.5 387.5 Z M 1096.5 368.5 L 1127.5 368.5 L 1127.5 387.5 L 1096.5 387.5 Z M 662.5 368.5 L 693.5 368.5 L 693.5 387.5 L 662.5 387.5 Z M 1009.5 368.5 L 1040.5 368.5 L 1040.5 387.5 L 1009.5 387.5 Z M 748.5 368.5 L 780.5 368.5 L 780.5 387.5 L 748.5 387.5 Z M 488.5 368.5 L 519.5 368.5 L 519.5 387.5 L 488.5 387.5 Z M 922.5 368.5 L 953.5 368.5 L 953.5 387.5 L 922.5 387.5 Z M 1530.5 368.5 L 1561.5 368.5 L 1561.5 387.5 L 1530.5 387.5 Z M 1356.5 368.5 L 1387.5 368.5 L 1387.5 387.5 L 1356.5 387.5 Z M 229.5 371.5 L 259.5 371.5 L 259.5 390.5 L 229.5 390.5 Z M 1616.5 371.5 L 1646.5 371.5 L 1646.5 390.5 L 1616.5 390.5 Z M 1530.5 387.5 L 1561.5 387.5 L 1561.5 406.5 L 1530.5 406.5 Z M 1443.5 387.5 L 1474.5 387.5 L 1474.5 406.5 L 1443.5 406.5 Z M 488.5 387.5 L 519.5 387.5 L 519.5 406.5 L 488.5 406.5 Z M 922.5 387.5 L 953.5 387.5 L 953.5 406.5 L 922.5 406.5 Z M 314.5 387.5 L 346.5 387.5 L 346.5 406.5 L 314.5 406.5 Z M 1096.5 387.5 L 1127.5 387.5 L 1127.5 406.5 L 1096.5 406.5 Z M 575.5 387.5 L 606.5 387.5 L 606.5 406.5 L 575.5 406.5 Z M 1269.5 387.5 L 1300.5 387.5 L 1300.5 406.5 L 1269.5 406.5 Z M 1356.5 387.5 L 1387.5 387.5 L 1387.5 406.5 L 1356.5 406.5 Z M 401.5 387.5 L 432.5 387.5 L 432.5 406.5 L 401.5 406.5 Z M 1009.5 387.5 L 1040.5 387.5 L 1040.5 406.5 L 1009.5 406.5 Z M 1182.5 387.5 L 1214.5 387.5 L 1214.5 406.5 L 1182.5 406.5 Z M 662.5 387.5 L 693.5 387.5 L 693.5 406.5 L 662.5 406.5 Z M 835.5 387.5 L 866.5 387.5 L 866.5 406.5 L 835.5 406.5 Z M 748.5 387.5 L 780.5 387.5 L 780.5 406.5 L 748.5 406.5 Z M 1616.5 390.5 L 1646.5 390.5 L 1646.5 408.5 L 1616.5 408.5 Z M 229.5 390.5 L 259.5 390.5 L 259.5 408.5 L 229.5 408.5 Z M 922.5 406.5 L 953.5 406.5 L 953.5 425.5 L 922.5 425.5 Z M 314.5 406.5 L 346.5 406.5 L 346.5 425.5 L 314.5 425.5 Z M 575.5 406.5 L 606.5 406.5 L 606.5 425.5 L 575.5 425.5 Z M 401.5 406.5 L 432.5 406.5 L 432.5 425.5 L 401.5 425.5 Z M 1530.5 406.5 L 1561.5 406.5 L 1561.5 425.5 L 1530.5 425.5 Z M 748.5 406.5 L 780.5 406.5 L 780.5 425.5 L 748.5 425.5 Z M 1443.5 406.5 L 1474.5 406.5 L 1474.5 425.5 L 1443.5 425.5 Z M 1096.5 406.5 L 1127.5 406.5 L 1127.5 425.5 L 1096.5 425.5 Z M 835.5 406.5 L 866.5 406.5 L 866.5 425.5 L 835.5 425.5 Z M 1269.5 406.5 L 1300.5 406.5 L 1300.5 425.5 L 1269.5 425.5 Z M 662.5 406.5 L 693.5 406.5 L 693.5 425.5 L 662.5 425.5 Z M 1182.5 406.5 L 1214.5 406.5 L 1214.5 425.5 L 1182.5 425.5 Z M 488.5 406.5 L 519.5 406.5 L 519.5 425.5 L 488.5 425.5 Z M 1356.5 406.5 L 1387.5 406.5 L 1387.5 425.5 L 1356.5 425.5 Z M 1009.5 406.5 L 1040.5 406.5 L 1040.5 425.5 L 1009.5 425.5 Z M 229.5 408.5 L 259.5 408.5 L 259.5 427.5 L 229.5 427.5 Z M 1616.5 408.5 L 1646.5 408.5 L 1646.5 427.5 L 1616.5 427.5 Z M 1616.5 427.5 L 1646.5 427.5 L 1646.5 467.5 L 1616.5 467.5 Z M 229.5 427.5 L 259.5 427.5 L 259.5 467.5 L 229.5 467.5 Z M 1443.5 425.5 L 1474.5 425.5 L 1474.5 470.5 L 1443.5 470.5 Z M 575.5 425.5 L 606.5 425.5 L 606.5 470.5 L 575.5 470.5 Z M 835.5 425.5 L 866.5 425.5 L 866.5 470.5 L 835.5 470.5 Z M 1356.5 425.5 L 1387.5 425.5 L 1387.5 470.5 L 1356.5 470.5 Z M 314.5 425.5 L 346.5 425.5 L 346.5 470.5 L 314.5 470.5 Z M 1182.5 425.5 L 1214.5 425.5 L 1214.5 470.5 L 1182.5 470.5 Z M 662.5 425.5 L 693.5 425.5 L 693.5 470.5 L 662.5 470.5 Z M 748.5 425.5 L 780.5 425.5 L 780.5 470.5 L 748.5 470.5 Z M 401.5 425.5 L 432.5 425.5 L 432.5 470.5 L 401.5 470.5 Z M 488.5 425.5 L 519.5 425.5 L 519.5 470.5 L 488.5 470.5 Z M 1096.5 425.5 L 1127.5 425.5 L 1127.5 470.5 L 1096.5 470.5 Z M 1009.5 425.5 L 1040.5 425.5 L 1040.5 470.5 L 1009.5 470.5 Z M 922.5 425.5 L 953.5 425.5 L 953.5 470.5 L 922.5 470.5 Z M 1530.5 425.5 L 1561.5 425.5 L 1561.5 470.5 L 1530.5 470.5 Z M 1269.5 425.5 L 1300.5 425.5 L 1300.5 470.5 L 1269.5 470.5 Z M 1616.5 467.5 L 1646.5 467.5 L 1646.5 486.5 L 1616.5 486.5 Z M 229.5 467.5 L 259.5 467.5 L 259.5 486.5 L 229.5 486.5 Z M 922.5 470.5 L 953.5 470.5 L 953.5 489.5 L 922.5 489.5 Z M 575.5 470.5 L 606.5 470.5 L 606.5 489.5 L 575.5 489.5 Z M 1530.5 470.5 L 1561.5 470.5 L 1561.5 489.5 L 1530.5 489.5 Z M 662.5 470.5 L 693.5 470.5 L 693.5 489.5 L 662.5 489.5 Z M 1096.5 470.5 L 1127.5 470.5 L 1127.5 489.5 L 1096.5 489.5 Z M 1356.5 470.5 L 1387.5 470.5 L 1387.5 489.5 L 1356.5 489.5 Z M 401.5 470.5 L 432.5 470.5 L 432.5 489.5 L 401.5 489.5 Z M 835.5 470.5 L 866.5 470.5 L 866.5 489.5 L 835.5 489.5 Z M 1443.5 470.5 L 1474.5 470.5 L 1474.5 489.5 L 1443.5 489.5 Z M 748.5 470.5 L 780.5 470.5 L 780.5 489.5 L 748.5 489.5 Z M 1182.5 470.5 L 1214.5 470.5 L 1214.5 489.5 L 1182.5 489.5 Z M 1009.5 470.5 L 1040.5 470.5 L 1040.5 489.5 L 1009.5 489.5 Z M 1269.5 470.5 L 1300.5 470.5 L 1300.5 489.5 L 1269.5 489.5 Z M 488.5 470.5 L 519.5 470.5 L 519.5 489.5 L 488.5 489.5 Z M 314.5 470.5 L 346.5 470.5 L 346.5 489.5 L 314.5 489.5 Z M 229.5 486.5 L 259.5 486.5 L 259.5 505.5 L 229.5 505.5 Z M 1616.5 486.5 L 1646.5 486.5 L 1646.5 505.5 L 1616.5 505.5 Z M 748.5 489.5 L 780.5 489.5 L 780.5 508.5 L 748.5 508.5 Z M 662.5 489.5 L 693.5 489.5 L 693.5 508.5 L 662.5 508.5 Z M 1530.5 489.5 L 1561.5 489.5 L 1561.5 508.5 L 1530.5 508.5 Z M 1182.5 489.5 L 1214.5 489.5 L 1214.5 508.5 L 1182.5 508.5 Z M 1356.5 489.5 L 1387.5 489.5 L 1387.5 508.5 L 1356.5 508.5 Z M 1443.5 489.5 L 1474.5 489.5 L 1474.5 508.5 L 1443.5 508.5 Z M 835.5 489.5 L 866.5 489.5 L 866.5 508.5 L 835.5 508.5 Z M 401.5 489.5 L 432.5 489.5 L 432.5 508.5 L 401.5 508.5 Z M 1269.5 489.5 L 1300.5 489.5 L 1300.5 508.5 L 1269.5 508.5 Z M 575.5 489.5 L 606.5 489.5 L 606.5 508.5 L 575.5 508.5 Z M 922.5 489.5 L 953.5 489.5 L 953.5 508.5 L 922.5 508.5 Z M 314.5 489.5 L 346.5 489.5 L 346.5 508.5 L 314.5 508.5 Z M 1009.5 489.5 L 1040.5 489.5 L 1040.5 508.5 L 1009.5 508.5 Z M 1096.5 489.5 L 1127.5 489.5 L 1127.5 508.5 L 1096.5 508.5 Z M 488.5 489.5 L 519.5 489.5 L 519.5 508.5 L 488.5 508.5 Z M 1616.5 505.5 L 1646.5 505.5 L 1646.5 524.5 L 1616.5 524.5 Z M 229.5 505.5 L 259.5 505.5 L 259.5 524.5 L 229.5 524.5 Z M 314.5 508.5 L 346.5 508.5 L 346.5 526.5 L 314.5 526.5 Z M 1096.5 508.5 L 1127.5 508.5 L 1127.5 526.5 L 1096.5 526.5 Z M 1269.5 508.5 L 1300.5 508.5 L 1300.5 526.5 L 1269.5 526.5 Z M 922.5 508.5 L 953.5 508.5 L 953.5 526.5 L 922.5 526.5 Z M 662.5 508.5 L 693.5 508.5 L 693.5 526.5 L 662.5 526.5 Z M 575.5 508.5 L 606.5 508.5 L 606.5 526.5 L 575.5 526.5 Z M 1443.5 508.5 L 1474.5 508.5 L 1474.5 526.5 L 1443.5 526.5 Z M 488.5 508.5 L 519.5 508.5 L 519.5 526.5 L 488.5 526.5 Z M 748.5 508.5 L 780.5 508.5 L 780.5 526.5 L 748.5 526.5 Z M 1530.5 508.5 L 1561.5 508.5 L 1561.5 526.5 L 1530.5 526.5 Z M 1182.5 508.5 L 1214.5 508.5 L 1214.5 526.5 L 1182.5 526.5 Z M 1009.5 508.5 L 1040.5 508.5 L 1040.5 526.5 L 1009.5 526.5 Z M 1356.5 508.5 L 1387.5 508.5 L 1387.5 526.5 L 1356.5 526.5 Z M 401.5 508.5 L 432.5 508.5 L 432.5 526.5 L 401.5 526.5 Z M 835.5 508.5 L 866.5 508.5 L 866.5 526.5 L 835.5 526.5 Z M 314.5 526.5 L 346.5 526.5 L 346.5 531.5 L 314.5 531.5 Z M 1443.5 526.5 L 1474.5 526.5 L 1474.5 531.5 L 1443.5 531.5 Z M 662.5 526.5 L 693.5 526.5 L 693.5 531.5 L 662.5 531.5 Z M 1009.5 526.5 L 1040.5 526.5 L 1040.5 531.5 L 1009.5 531.5 Z M 922.5 526.5 L 953.5 526.5 L 953.5 531.5 L 922.5 531.5 Z M 575.5 526.5 L 606.5 526.5 L 606.5 531.5 L 575.5 531.5 Z M 1616.5 524.5 L 1646.5 524.5 L 1646.5 531.5 L 1616.5 531.5 Z M 229.5 524.5 L 259.5 524.5 L 259.5 531.5 L 229.5 531.5 Z M 1182.5 526.5 L 1214.5 526.5 L 1214.5 531.5 L 1182.5 531.5 Z M 1356.5 526.5 L 1387.5 526.5 L 1387.5 531.5 L 1356.5 531.5 Z M 1269.5 526.5 L 1300.5 526.5 L 1300.5 531.5 L 1269.5 531.5 Z M 748.5 526.5 L 780.5 526.5 L 780.5 531.5 L 748.5 531.5 Z M 1530.5 526.5 L 1561.5 526.5 L 1561.5 531.5 L 1530.5 531.5 Z M 835.5 526.5 L 866.5 526.5 L 866.5 531.5 L 835.5 531.5 Z M 401.5 526.5 L 432.5 526.5 L 432.5 531.5 L 401.5 531.5 Z M 1096.5 526.5 L 1127.5 526.5 L 1127.5 531.5 L 1096.5 531.5 Z M 488.5 526.5 L 519.5 526.5 L 519.5 531.5 L 488.5 531.5 Z M 211.5 768.5 L 1707.5 768.5 L 1707.5 787.5 L 211.5 787.5 Z M 211.5 768.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1560.5 615.5 L 1616.5 615.5 L 1616.5 699.5 L 1560.5 699.5 Z M 258.5 615.5 L 314.5 615.5 L 314.5 699.5 L 258.5 699.5 Z M 345.5 615.5 L 401.5 615.5 L 401.5 699.5 L 345.5 699.5 Z M 432.5 615.5 L 487.5 615.5 L 487.5 699.5 L 432.5 699.5 Z M 519.5 615.5 L 574.5 615.5 L 574.5 699.5 L 519.5 699.5 Z M 605.5 615.5 L 661.5 615.5 L 661.5 699.5 L 605.5 699.5 Z M 692.5 615.5 L 748.5 615.5 L 748.5 699.5 L 692.5 699.5 Z M 779.5 615.5 L 835.5 615.5 L 835.5 699.5 L 779.5 699.5 Z M 866.5 615.5 L 921.5 615.5 L 921.5 699.5 L 866.5 699.5 Z M 953.5 615.5 L 1008.5 615.5 L 1008.5 699.5 L 953.5 699.5 Z M 1039.5 615.5 L 1095.5 615.5 L 1095.5 699.5 L 1039.5 699.5 Z M 1126.5 615.5 L 1182.5 615.5 L 1182.5 699.5 L 1126.5 699.5 Z M 1213.5 615.5 L 1269.5 615.5 L 1269.5 699.5 L 1213.5 699.5 Z M 1300.5 615.5 L 1355.5 615.5 L 1355.5 699.5 L 1300.5 699.5 Z M 1387.5 615.5 L 1442.5 615.5 L 1442.5 699.5 L 1387.5 699.5 Z M 1473.5 615.5 L 1529.5 615.5 L 1529.5 699.5 L 1473.5 699.5 Z M 1473.5 615.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1561.5 364.5 L 1616.5 364.5 L 1616.5 531.5 L 1561.5 531.5 Z M 259.5 364.5 L 314.5 364.5 L 314.5 531.5 L 259.5 531.5 Z M 346.5 364.5 L 401.5 364.5 L 401.5 531.5 L 346.5 531.5 Z M 432.5 364.5 L 488.5 364.5 L 488.5 531.5 L 432.5 531.5 Z M 519.5 364.5 L 575.5 364.5 L 575.5 531.5 L 519.5 531.5 Z M 606.5 364.5 L 662.5 364.5 L 662.5 531.5 L 606.5 531.5 Z M 693.5 364.5 L 748.5 364.5 L 748.5 531.5 L 693.5 531.5 Z M 780.5 364.5 L 835.5 364.5 L 835.5 531.5 L 780.5 531.5 Z M 866.5 364.5 L 922.5 364.5 L 922.5 531.5 L 866.5 531.5 Z M 953.5 364.5 L 1009.5 364.5 L 1009.5 531.5 L 953.5 531.5 Z M 1040.5 364.5 L 1096.5 364.5 L 1096.5 531.5 L 1040.5 531.5 Z M 1127.5 364.5 L 1182.5 364.5 L 1182.5 531.5 L 1127.5 531.5 Z M 1214.5 364.5 L 1269.5 364.5 L 1269.5 531.5 L 1214.5 531.5 Z M 1300.5 364.5 L 1356.5 364.5 L 1356.5 531.5 L 1300.5 531.5 Z M 1387.5 364.5 L 1443.5 364.5 L 1443.5 531.5 L 1387.5 531.5 Z M 1474.5 364.5 L 1530.5 364.5 L 1530.5 531.5 L 1474.5 531.5 Z M 1474.5 364.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 228.5 315.5 L 247.5 315.5 L 247.5 334.5 L 228.5 334.5 Z M 1670.5 315.5 L 1689.5 315.5 L 1689.5 334.5 L 1670.5 334.5 Z M 1617.5 315.5 L 1636.5 315.5 L 1636.5 334.5 L 1617.5 334.5 Z M 1564.5 315.5 L 1582.5 315.5 L 1582.5 334.5 L 1564.5 334.5 Z M 1510.5 315.5 L 1529.5 315.5 L 1529.5 334.5 L 1510.5 334.5 Z M 1457.5 315.5 L 1476.5 315.5 L 1476.5 334.5 L 1457.5 334.5 Z M 1403.5 315.5 L 1422.5 315.5 L 1422.5 334.5 L 1403.5 334.5 Z M 1350.5 315.5 L 1369.5 315.5 L 1369.5 334.5 L 1350.5 334.5 Z M 1296.5 315.5 L 1315.5 315.5 L 1315.5 334.5 L 1296.5 334.5 Z M 1243.5 315.5 L 1262.5 315.5 L 1262.5 334.5 L 1243.5 334.5 Z M 1190.5 315.5 L 1209.5 315.5 L 1209.5 334.5 L 1190.5 334.5 Z M 1136.5 315.5 L 1155.5 315.5 L 1155.5 334.5 L 1136.5 334.5 Z M 1083.5 315.5 L 1102.5 315.5 L 1102.5 334.5 L 1083.5 334.5 Z M 1029.5 315.5 L 1048.5 315.5 L 1048.5 334.5 L 1029.5 334.5 Z M 976.5 315.5 L 995.5 315.5 L 995.5 334.5 L 976.5 334.5 Z M 923.5 315.5 L 941.5 315.5 L 941.5 334.5 L 923.5 334.5 Z M 869.5 315.5 L 888.5 315.5 L 888.5 334.5 L 869.5 334.5 Z M 816.5 315.5 L 835.5 315.5 L 835.5 334.5 L 816.5 334.5 Z M 762.5 315.5 L 781.5 315.5 L 781.5 334.5 L 762.5 334.5 Z M 709.5 315.5 L 728.5 315.5 L 728.5 334.5 L 709.5 334.5 Z M 655.5 315.5 L 674.5 315.5 L 674.5 334.5 L 655.5 334.5 Z M 602.5 315.5 L 621.5 315.5 L 621.5 334.5 L 602.5 334.5 Z M 549.5 315.5 L 568.5 315.5 L 568.5 334.5 L 549.5 334.5 Z M 495.5 315.5 L 514.5 315.5 L 514.5 334.5 L 495.5 334.5 Z M 442.5 315.5 L 461.5 315.5 L 461.5 334.5 L 442.5 334.5 Z M 388.5 315.5 L 407.5 315.5 L 407.5 334.5 L 388.5 334.5 Z M 335.5 315.5 L 354.5 315.5 L 354.5 334.5 L 335.5 334.5 Z M 282.5 315.5 L 300.5 315.5 L 300.5 334.5 L 282.5 334.5 Z M 1101.5 372.5 L 1120.5 372.5 L 1120.5 387.5 L 1101.5 387.5 Z M 407.5 372.5 L 426.5 372.5 L 426.5 387.5 L 407.5 387.5 Z M 1448.5 372.5 L 1467.5 372.5 L 1467.5 387.5 L 1448.5 387.5 Z M 580.5 372.5 L 599.5 372.5 L 599.5 387.5 L 580.5 387.5 Z M 754.5 372.5 L 773.5 372.5 L 773.5 387.5 L 754.5 387.5 Z M 928.5 372.5 L 946.5 372.5 L 946.5 387.5 L 928.5 387.5 Z M 1275.5 372.5 L 1294.5 372.5 L 1294.5 387.5 L 1275.5 387.5 Z M 225.5 372.5 L 244.5 372.5 L 244.5 390.5 L 225.5 390.5 Z M 1627.5 372.5 L 1646.5 372.5 L 1646.5 390.5 L 1627.5 390.5 Z M 1488.5 372.5 L 1507.5 372.5 L 1507.5 391.5 L 1488.5 391.5 Z M 794.5 372.5 L 813.5 372.5 L 813.5 391.5 L 794.5 391.5 Z M 1587.5 372.5 L 1606.5 372.5 L 1606.5 391.5 L 1587.5 391.5 Z M 620.5 372.5 L 639.5 372.5 L 639.5 391.5 L 620.5 391.5 Z M 1235.5 372.5 L 1254.5 372.5 L 1254.5 391.5 L 1235.5 391.5 Z M 754.5 387.5 L 773.5 387.5 L 773.5 391.5 L 754.5 391.5 Z M 447.5 372.5 L 466.5 372.5 L 466.5 391.5 L 447.5 391.5 Z M 540.5 372.5 L 559.5 372.5 L 559.5 391.5 L 540.5 391.5 Z M 407.5 387.5 L 426.5 387.5 L 426.5 391.5 L 407.5 391.5 Z M 265.5 372.5 L 284.5 372.5 L 284.5 391.5 L 265.5 391.5 Z M 1408.5 372.5 L 1427.5 372.5 L 1427.5 391.5 L 1408.5 391.5 Z M 367.5 372.5 L 386.5 372.5 L 386.5 391.5 L 367.5 391.5 Z M 714.5 372.5 L 733.5 372.5 L 733.5 391.5 L 714.5 391.5 Z M 928.5 387.5 L 946.5 387.5 L 946.5 391.5 L 928.5 391.5 Z M 580.5 387.5 L 599.5 387.5 L 599.5 391.5 L 580.5 391.5 Z M 1627.5 390.5 L 1646.5 390.5 L 1646.5 391.5 L 1627.5 391.5 Z M 1275.5 387.5 L 1294.5 387.5 L 1294.5 391.5 L 1275.5 391.5 Z M 1101.5 387.5 L 1120.5 387.5 L 1120.5 391.5 L 1101.5 391.5 Z M 1448.5 387.5 L 1467.5 387.5 L 1467.5 391.5 L 1448.5 391.5 Z M 1061.5 372.5 L 1080.5 372.5 L 1080.5 391.5 L 1061.5 391.5 Z M 887.5 372.5 L 906.5 372.5 L 906.5 391.5 L 887.5 391.5 Z M 225.5 390.5 L 244.5 390.5 L 244.5 391.5 L 225.5 391.5 Z M 1141.5 372.5 L 1160.5 372.5 L 1160.5 391.5 L 1141.5 391.5 Z M 1315.5 372.5 L 1334.5 372.5 L 1334.5 391.5 L 1315.5 391.5 Z M 968.5 372.5 L 987.5 372.5 L 987.5 391.5 L 968.5 391.5 Z M 494.5 500.5 L 513.5 500.5 L 513.5 508.5 L 494.5 508.5 Z M 1536.5 500.5 L 1555.5 500.5 L 1555.5 508.5 L 1536.5 508.5 Z M 1189.5 500.5 L 1207.5 500.5 L 1207.5 508.5 L 1189.5 508.5 Z M 1015.5 500.5 L 1034.5 500.5 L 1034.5 508.5 L 1015.5 508.5 Z M 841.5 500.5 L 860.5 500.5 L 860.5 508.5 L 841.5 508.5 Z M 668.5 500.5 L 687.5 500.5 L 687.5 508.5 L 668.5 508.5 Z M 321.5 500.5 L 339.5 500.5 L 339.5 508.5 L 321.5 508.5 Z M 1362.5 500.5 L 1381.5 500.5 L 1381.5 508.5 L 1362.5 508.5 Z M 1015.5 508.5 L 1034.5 508.5 L 1034.5 519.5 L 1015.5 519.5 Z M 494.5 508.5 L 513.5 508.5 L 513.5 519.5 L 494.5 519.5 Z M 668.5 508.5 L 687.5 508.5 L 687.5 519.5 L 668.5 519.5 Z M 321.5 508.5 L 339.5 508.5 L 339.5 519.5 L 321.5 519.5 Z M 841.5 508.5 L 860.5 508.5 L 860.5 519.5 L 841.5 519.5 Z M 1362.5 508.5 L 1381.5 508.5 L 1381.5 519.5 L 1362.5 519.5 Z M 1536.5 508.5 L 1555.5 508.5 L 1555.5 519.5 L 1536.5 519.5 Z M 1189.5 508.5 L 1207.5 508.5 L 1207.5 519.5 L 1189.5 519.5 Z M 601.5 583.5 L 620.5 583.5 L 620.5 594.5 L 601.5 594.5 Z M 908.5 583.5 L 927.5 583.5 L 927.5 594.5 L 908.5 594.5 Z M 1082.5 583.5 L 1101.5 583.5 L 1101.5 594.5 L 1082.5 594.5 Z M 388.5 583.5 L 407.5 583.5 L 407.5 594.5 L 388.5 594.5 Z M 1122.5 583.5 L 1141.5 583.5 L 1141.5 594.5 L 1122.5 594.5 Z M 428.5 583.5 L 447.5 583.5 L 447.5 594.5 L 428.5 594.5 Z M 734.5 583.5 L 753.5 583.5 L 753.5 594.5 L 734.5 594.5 Z M 1429.5 583.5 L 1448.5 583.5 L 1448.5 594.5 L 1429.5 594.5 Z M 561.5 583.5 L 580.5 583.5 L 580.5 594.5 L 561.5 594.5 Z M 1255.5 583.5 L 1274.5 583.5 L 1274.5 594.5 L 1255.5 594.5 Z M 1295.5 583.5 L 1314.5 583.5 L 1314.5 594.5 L 1295.5 594.5 Z M 1469.5 583.5 L 1488.5 583.5 L 1488.5 594.5 L 1469.5 594.5 Z M 948.5 583.5 L 967.5 583.5 L 967.5 594.5 L 948.5 594.5 Z M 775.5 583.5 L 793.5 583.5 L 793.5 594.5 L 775.5 594.5 Z M 561.5 594.5 L 580.5 594.5 L 580.5 602.5 L 561.5 602.5 Z M 1429.5 594.5 L 1448.5 594.5 L 1448.5 602.5 L 1429.5 602.5 Z M 1469.5 594.5 L 1488.5 594.5 L 1488.5 602.5 L 1469.5 602.5 Z M 908.5 594.5 L 927.5 594.5 L 927.5 602.5 L 908.5 602.5 Z M 734.5 594.5 L 753.5 594.5 L 753.5 602.5 L 734.5 602.5 Z M 1255.5 594.5 L 1274.5 594.5 L 1274.5 602.5 L 1255.5 602.5 Z M 601.5 594.5 L 620.5 594.5 L 620.5 602.5 L 601.5 602.5 Z M 948.5 594.5 L 967.5 594.5 L 967.5 602.5 L 948.5 602.5 Z M 775.5 594.5 L 793.5 594.5 L 793.5 602.5 L 775.5 602.5 Z M 1122.5 594.5 L 1141.5 594.5 L 1141.5 602.5 L 1122.5 602.5 Z M 428.5 594.5 L 447.5 594.5 L 447.5 602.5 L 428.5 602.5 Z M 1082.5 594.5 L 1101.5 594.5 L 1101.5 602.5 L 1082.5 602.5 Z M 388.5 594.5 L 407.5 594.5 L 407.5 602.5 L 388.5 602.5 Z M 1295.5 594.5 L 1314.5 594.5 L 1314.5 602.5 L 1295.5 602.5 Z M 540.5 711.5 L 559.5 711.5 L 559.5 730.5 L 540.5 730.5 Z M 1627.5 711.5 L 1646.5 711.5 L 1646.5 730.5 L 1627.5 730.5 Z M 1587.5 711.5 L 1606.5 711.5 L 1606.5 730.5 L 1587.5 730.5 Z M 1488.5 711.5 L 1507.5 711.5 L 1507.5 730.5 L 1488.5 730.5 Z M 1448.5 711.5 L 1467.5 711.5 L 1467.5 730.5 L 1448.5 730.5 Z M 1408.5 711.5 L 1427.5 711.5 L 1427.5 730.5 L 1408.5 730.5 Z M 1315.5 711.5 L 1334.5 711.5 L 1334.5 730.5 L 1315.5 730.5 Z M 1275.5 711.5 L 1294.5 711.5 L 1294.5 730.5 L 1275.5 730.5 Z M 1235.5 711.5 L 1254.5 711.5 L 1254.5 730.5 L 1235.5 730.5 Z M 794.5 711.5 L 813.5 711.5 L 813.5 730.5 L 794.5 730.5 Z M 754.5 711.5 L 773.5 711.5 L 773.5 730.5 L 754.5 730.5 Z M 262.5 711.5 L 280.5 711.5 L 280.5 730.5 L 262.5 730.5 Z M 221.5 711.5 L 240.5 711.5 L 240.5 730.5 L 221.5 730.5 Z M 1141.5 711.5 L 1160.5 711.5 L 1160.5 730.5 L 1141.5 730.5 Z M 1101.5 711.5 L 1120.5 711.5 L 1120.5 730.5 L 1101.5 730.5 Z M 1061.5 711.5 L 1080.5 711.5 L 1080.5 730.5 L 1061.5 730.5 Z M 367.5 711.5 L 386.5 711.5 L 386.5 730.5 L 367.5 730.5 Z M 620.5 711.5 L 639.5 711.5 L 639.5 730.5 L 620.5 730.5 Z M 968.5 711.5 L 987.5 711.5 L 987.5 730.5 L 968.5 730.5 Z M 928.5 711.5 L 946.5 711.5 L 946.5 730.5 L 928.5 730.5 Z M 714.5 711.5 L 733.5 711.5 L 733.5 730.5 L 714.5 730.5 Z M 407.5 711.5 L 426.5 711.5 L 426.5 730.5 L 407.5 730.5 Z M 580.5 711.5 L 599.5 711.5 L 599.5 730.5 L 580.5 730.5 Z M 887.5 711.5 L 906.5 711.5 L 906.5 730.5 L 887.5 730.5 Z M 447.5 711.5 L 466.5 711.5 L 466.5 730.5 L 447.5 730.5 Z M 228.5 768.5 L 247.5 768.5 L 247.5 787.5 L 228.5 787.5 Z M 1670.5 768.5 L 1689.5 768.5 L 1689.5 787.5 L 1670.5 787.5 Z M 1617.5 768.5 L 1636.5 768.5 L 1636.5 787.5 L 1617.5 787.5 Z M 1564.5 768.5 L 1582.5 768.5 L 1582.5 787.5 L 1564.5 787.5 Z M 1510.5 768.5 L 1529.5 768.5 L 1529.5 787.5 L 1510.5 787.5 Z M 1457.5 768.5 L 1476.5 768.5 L 1476.5 787.5 L 1457.5 787.5 Z M 1403.5 768.5 L 1422.5 768.5 L 1422.5 787.5 L 1403.5 787.5 Z M 1350.5 768.5 L 1369.5 768.5 L 1369.5 787.5 L 1350.5 787.5 Z M 1296.5 768.5 L 1315.5 768.5 L 1315.5 787.5 L 1296.5 787.5 Z M 1243.5 768.5 L 1262.5 768.5 L 1262.5 787.5 L 1243.5 787.5 Z M 1190.5 768.5 L 1209.5 768.5 L 1209.5 787.5 L 1190.5 787.5 Z M 1136.5 768.5 L 1155.5 768.5 L 1155.5 787.5 L 1136.5 787.5 Z M 1083.5 768.5 L 1102.5 768.5 L 1102.5 787.5 L 1083.5 787.5 Z M 1029.5 768.5 L 1048.5 768.5 L 1048.5 787.5 L 1029.5 787.5 Z M 976.5 768.5 L 995.5 768.5 L 995.5 787.5 L 976.5 787.5 Z M 923.5 768.5 L 941.5 768.5 L 941.5 787.5 L 923.5 787.5 Z M 869.5 768.5 L 888.5 768.5 L 888.5 787.5 L 869.5 787.5 Z M 816.5 768.5 L 835.5 768.5 L 835.5 787.5 L 816.5 787.5 Z M 762.5 768.5 L 781.5 768.5 L 781.5 787.5 L 762.5 787.5 Z M 709.5 768.5 L 728.5 768.5 L 728.5 787.5 L 709.5 787.5 Z M 655.5 768.5 L 674.5 768.5 L 674.5 787.5 L 655.5 787.5 Z M 602.5 768.5 L 621.5 768.5 L 621.5 787.5 L 602.5 787.5 Z M 549.5 768.5 L 568.5 768.5 L 568.5 787.5 L 549.5 787.5 Z M 495.5 768.5 L 514.5 768.5 L 514.5 787.5 L 495.5 787.5 Z M 442.5 768.5 L 461.5 768.5 L 461.5 787.5 L 442.5 787.5 Z M 388.5 768.5 L 407.5 768.5 L 407.5 787.5 L 388.5 787.5 Z M 335.5 768.5 L 354.5 768.5 L 354.5 787.5 L 335.5 787.5 Z M 282.5 768.5 L 300.5 768.5 L 300.5 787.5 L 282.5 787.5 Z M 282.5 768.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface314">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -187,6 +187,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 991.339844 776.789062 L 991.273438 777.824219 L 991.113281 778.757812 L 990.824219 779.628906 L 990.433594 780.402344 L 989.917969 781.144531 L 989.304688 781.789062 L 988.628906 782.339844 L 987.917969 782.757812 L 987.113281 783.082031 L 986.273438 783.339844 L 985.371094 783.46875 L 984.402344 783.5 L 973.789062 783.5 L 973.789062 759.984375 L 983.339844 759.984375 L 984.726562 760.082031 L 985.953125 760.304688 L 987.046875 760.695312 L 987.984375 761.242188 L 988.789062 761.953125 L 989.433594 762.824219 L 989.695312 763.304688 L 989.917969 763.824219 L 990.082031 764.304688 L 990.210938 764.855469 L 990.273438 765.402344 L 990.304688 765.953125 L 990.210938 767.113281 L 989.917969 768.113281 L 989.46875 769.046875 L 988.824219 769.824219 L 988.015625 770.53125 L 987.046875 771.082031 L 987.984375 771.5 L 988.789062 771.953125 L 989.5 772.46875 L 990.082031 773.046875 L 990.53125 773.660156 L 990.886719 774.304688 L 991.015625 774.695312 L 991.210938 775.46875 L 991.273438 775.917969 L 991.304688 776.339844 Z M 987.304688 766.371094 L 987.210938 765.402344 L 986.917969 764.597656 L 986.46875 763.886719 L 985.824219 763.371094 L 985.015625 762.984375 L 984.015625 762.726562 L 983.789062 762.726562 L 983.566406 762.695312 L 983.339844 762.660156 L 982.824219 762.660156 L 982.597656 762.628906 L 976.789062 762.628906 L 976.789062 770.113281 L 982.597656 770.113281 L 983.789062 770.046875 L 984.824219 769.855469 L 985.695312 769.5 L 986.339844 769.015625 L 986.855469 768.371094 L 987.175781 767.597656 L 987.210938 767.433594 L 987.242188 767.242188 L 987.273438 767.046875 L 987.273438 766.597656 Z M 984.113281 780.855469 L 985.015625 780.824219 L 985.824219 780.628906 L 986.53125 780.304688 L 987.113281 779.886719 L 987.597656 779.339844 L 987.984375 778.660156 L 988.082031 778.402344 L 988.144531 778.113281 L 988.242188 777.789062 L 988.273438 777.5 L 988.304688 777.175781 L 988.339844 776.824219 L 988.273438 776.113281 L 988.144531 775.433594 L 987.917969 774.855469 L 987.597656 774.304688 L 987.175781 773.855469 L 986.695312 773.433594 L 986.339844 773.242188 L 985.953125 773.082031 L 985.53125 772.953125 L 985.082031 772.855469 L 984.597656 772.789062 L 984.113281 772.757812 L 976.789062 772.757812 L 976.789062 780.855469 Z M 984.113281 780.855469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 959 304 L 959 311 M 955 308 L 962 308 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 959 308 L 959 308 M 959 308 L 959 308 M 959 308 L 959 308 M 959 308 L 959 308 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 211 297 L 211 306 M 206 302 L 215 302 M 210 303 L 212 303 M 210 301 L 212 301 M 210 301 L 210 303 M 212 301 L 212 303 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_2.svg b/cells/inv/sky130_fd_sc_hvl__inv_2.svg
index 2b60d12..b1959a4 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_2.svg
+++ b/cells/inv/sky130_fd_sc_hvl__inv_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 672.5 98.5 L 1255.5 98.5 L 1255.5 593.5 L 672.5 593.5 Z M 672.5 98.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 735.5 161.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 811.5 699.5 L 1163.5 699.5 L 1163.5 706.5 L 811.5 706.5 Z M 811.5 706.5 L 1163.5 706.5 L 1163.5 738.5 L 811.5 738.5 Z M 811.5 738.5 L 1163.5 738.5 L 1163.5 801.5 L 811.5 801.5 Z M 811.5 801.5 L 1163.5 801.5 L 1163.5 834.5 L 811.5 834.5 Z M 811.5 834.5 L 1163.5 834.5 L 1163.5 841.5 L 811.5 841.5 Z M 811.5 834.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 811.5 245.5 L 866.5 245.5 L 866.5 252.5 L 811.5 252.5 Z M 1109.5 245.5 L 1163.5 245.5 L 1163.5 252.5 L 1109.5 252.5 Z M 961.5 245.5 L 1014.5 245.5 L 1014.5 252.5 L 961.5 252.5 Z M 961.5 252.5 L 1014.5 252.5 L 1014.5 285.5 L 961.5 285.5 Z M 811.5 252.5 L 866.5 252.5 L 866.5 285.5 L 811.5 285.5 Z M 1109.5 252.5 L 1163.5 252.5 L 1163.5 285.5 L 1109.5 285.5 Z M 1109.5 285.5 L 1163.5 285.5 L 1163.5 331.5 L 1109.5 331.5 Z M 961.5 285.5 L 1014.5 285.5 L 1014.5 331.5 L 961.5 331.5 Z M 811.5 285.5 L 866.5 285.5 L 866.5 331.5 L 811.5 331.5 Z M 811.5 331.5 L 866.5 331.5 L 866.5 364.5 L 811.5 364.5 Z M 1109.5 331.5 L 1163.5 331.5 L 1163.5 364.5 L 1109.5 364.5 Z M 961.5 331.5 L 1014.5 331.5 L 1014.5 364.5 L 961.5 364.5 Z M 811.5 364.5 L 866.5 364.5 L 866.5 411.5 L 811.5 411.5 Z M 1109.5 364.5 L 1163.5 364.5 L 1163.5 411.5 L 1109.5 411.5 Z M 961.5 364.5 L 1014.5 364.5 L 1014.5 411.5 L 961.5 411.5 Z M 811.5 411.5 L 866.5 411.5 L 866.5 444.5 L 811.5 444.5 Z M 1109.5 411.5 L 1163.5 411.5 L 1163.5 444.5 L 1109.5 444.5 Z M 961.5 411.5 L 1014.5 411.5 L 1014.5 444.5 L 961.5 444.5 Z M 961.5 444.5 L 1014.5 444.5 L 1014.5 490.5 L 961.5 490.5 Z M 811.5 444.5 L 866.5 444.5 L 866.5 490.5 L 811.5 490.5 Z M 1109.5 444.5 L 1163.5 444.5 L 1163.5 490.5 L 1109.5 490.5 Z M 961.5 490.5 L 1014.5 490.5 L 1014.5 522.5 L 961.5 522.5 Z M 1109.5 490.5 L 1163.5 490.5 L 1163.5 522.5 L 1109.5 522.5 Z M 811.5 490.5 L 866.5 490.5 L 866.5 522.5 L 811.5 522.5 Z M 961.5 522.5 L 1014.5 522.5 L 1014.5 530.5 L 961.5 530.5 Z M 811.5 522.5 L 866.5 522.5 L 866.5 530.5 L 811.5 530.5 Z M 1109.5 522.5 L 1163.5 522.5 L 1163.5 530.5 L 1109.5 530.5 Z M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1014.5 699.5 L 1109.5 699.5 L 1109.5 841.5 L 1014.5 841.5 Z M 866.5 699.5 L 961.5 699.5 L 961.5 841.5 L 866.5 841.5 Z M 866.5 699.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1014.5 245.5 L 1109.5 245.5 L 1109.5 530.5 L 1014.5 530.5 Z M 866.5 245.5 L 961.5 245.5 L 961.5 530.5 L 866.5 530.5 Z M 866.5 245.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 765.5 161.5 L 797.5 161.5 L 797.5 193.5 L 765.5 193.5 Z M 1130.5 161.5 L 1163.5 161.5 L 1163.5 193.5 L 1130.5 193.5 Z M 1039.5 161.5 L 1071.5 161.5 L 1071.5 193.5 L 1039.5 193.5 Z M 947.5 161.5 L 980.5 161.5 L 980.5 193.5 L 947.5 193.5 Z M 856.5 161.5 L 888.5 161.5 L 888.5 193.5 L 856.5 193.5 Z M 762.5 252.5 L 794.5 252.5 L 794.5 285.5 L 762.5 285.5 Z M 1129.5 252.5 L 1162.5 252.5 L 1162.5 285.5 L 1129.5 285.5 Z M 1061.5 252.5 L 1093.5 252.5 L 1093.5 285.5 L 1061.5 285.5 Z M 899.5 252.5 L 931.5 252.5 L 931.5 285.5 L 899.5 285.5 Z M 830.5 252.5 L 863.5 252.5 L 863.5 285.5 L 830.5 285.5 Z M 756.5 844.5 L 789.5 844.5 L 789.5 876.5 L 756.5 876.5 Z M 1118.5 844.5 L 1150.5 844.5 L 1150.5 876.5 L 1118.5 876.5 Z M 893.5 844.5 L 926.5 844.5 L 926.5 876.5 L 893.5 876.5 Z M 825.5 844.5 L 857.5 844.5 L 857.5 876.5 L 825.5 876.5 Z M 765.5 935.5 L 797.5 935.5 L 797.5 968.5 L 765.5 968.5 Z M 1130.5 935.5 L 1163.5 935.5 L 1163.5 968.5 L 1130.5 968.5 Z M 1039.5 935.5 L 1071.5 935.5 L 1071.5 968.5 L 1039.5 968.5 Z M 947.5 935.5 L 980.5 935.5 L 980.5 968.5 L 947.5 968.5 Z M 856.5 935.5 L 888.5 935.5 L 888.5 968.5 L 856.5 968.5 Z M 856.5 935.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface305">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -186,6 +186,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1059.210938 639.457031 L 1059.210938 655.5 L 1053.992188 655.5 L 1053.992188 639.457031 L 1038.230469 614.601562 L 1044.679688 614.601562 L 1056.6875 634.519531 L 1068.355469 614.601562 L 1074.582031 614.601562 Z M 1059.210938 639.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1039 460 L 1071 460 M 1039 428 L 1071 428 M 1039 428 L 1039 460 M 1071 428 L 1071 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1039 460 L 1071 460 M 1039 428 L 1071 428 M 1071 460 L 1071 428 M 1039 460 L 1039 428 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 735 122 L 735 131 M 730 127 L 739 127 M 734 128 L 736 128 M 734 126 L 736 126 M 734 126 L 734 128 M 736 126 L 736 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_4.svg b/cells/inv/sky130_fd_sc_hvl__inv_4.svg
index dcd0ae6..edea500 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_4.svg
+++ b/cells/inv/sky130_fd_sc_hvl__inv_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 535.5 98.5 L 1391.5 98.5 L 1391.5 593.5 L 535.5 593.5 Z M 535.5 98.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 597.5 161.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 651.5 707.5 L 1300.5 707.5 L 1300.5 715.5 L 651.5 715.5 Z M 651.5 715.5 L 1300.5 715.5 L 1300.5 747.5 L 651.5 747.5 Z M 651.5 747.5 L 1300.5 747.5 L 1300.5 810.5 L 651.5 810.5 Z M 651.5 810.5 L 1300.5 810.5 L 1300.5 842.5 L 651.5 842.5 Z M 651.5 842.5 L 1300.5 842.5 L 1300.5 850.5 L 651.5 850.5 Z M 651.5 842.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 651.5 245.5 L 705.5 245.5 L 705.5 252.5 L 651.5 252.5 Z M 1097.5 245.5 L 1150.5 245.5 L 1150.5 252.5 L 1097.5 252.5 Z M 948.5 245.5 L 1002.5 245.5 L 1002.5 252.5 L 948.5 252.5 Z M 1245.5 245.5 L 1300.5 245.5 L 1300.5 252.5 L 1245.5 252.5 Z M 800.5 245.5 L 853.5 245.5 L 853.5 252.5 L 800.5 252.5 Z M 948.5 252.5 L 1002.5 252.5 L 1002.5 285.5 L 948.5 285.5 Z M 800.5 252.5 L 853.5 252.5 L 853.5 285.5 L 800.5 285.5 Z M 1245.5 252.5 L 1300.5 252.5 L 1300.5 285.5 L 1245.5 285.5 Z M 651.5 252.5 L 705.5 252.5 L 705.5 285.5 L 651.5 285.5 Z M 1097.5 252.5 L 1150.5 252.5 L 1150.5 285.5 L 1097.5 285.5 Z M 1245.5 285.5 L 1300.5 285.5 L 1300.5 329.5 L 1245.5 329.5 Z M 948.5 285.5 L 1002.5 285.5 L 1002.5 329.5 L 948.5 329.5 Z M 800.5 285.5 L 853.5 285.5 L 853.5 331.5 L 800.5 331.5 Z M 1097.5 285.5 L 1150.5 285.5 L 1150.5 331.5 L 1097.5 331.5 Z M 651.5 285.5 L 705.5 285.5 L 705.5 331.5 L 651.5 331.5 Z M 1245.5 329.5 L 1300.5 329.5 L 1300.5 362.5 L 1245.5 362.5 Z M 948.5 329.5 L 1002.5 329.5 L 1002.5 362.5 L 948.5 362.5 Z M 651.5 331.5 L 705.5 331.5 L 705.5 364.5 L 651.5 364.5 Z M 800.5 331.5 L 853.5 331.5 L 853.5 364.5 L 800.5 364.5 Z M 1097.5 331.5 L 1150.5 331.5 L 1150.5 364.5 L 1097.5 364.5 Z M 948.5 362.5 L 1002.5 362.5 L 1002.5 408.5 L 948.5 408.5 Z M 1245.5 362.5 L 1300.5 362.5 L 1300.5 408.5 L 1245.5 408.5 Z M 651.5 364.5 L 705.5 364.5 L 705.5 411.5 L 651.5 411.5 Z M 1097.5 364.5 L 1150.5 364.5 L 1150.5 411.5 L 1097.5 411.5 Z M 800.5 364.5 L 853.5 364.5 L 853.5 411.5 L 800.5 411.5 Z M 948.5 408.5 L 1002.5 408.5 L 1002.5 441.5 L 948.5 441.5 Z M 1245.5 408.5 L 1300.5 408.5 L 1300.5 441.5 L 1245.5 441.5 Z M 651.5 411.5 L 705.5 411.5 L 705.5 444.5 L 651.5 444.5 Z M 1097.5 411.5 L 1150.5 411.5 L 1150.5 444.5 L 1097.5 444.5 Z M 800.5 411.5 L 853.5 411.5 L 853.5 444.5 L 800.5 444.5 Z M 1245.5 441.5 L 1300.5 441.5 L 1300.5 485.5 L 1245.5 485.5 Z M 948.5 441.5 L 1002.5 441.5 L 1002.5 485.5 L 948.5 485.5 Z M 800.5 444.5 L 853.5 444.5 L 853.5 490.5 L 800.5 490.5 Z M 651.5 444.5 L 705.5 444.5 L 705.5 490.5 L 651.5 490.5 Z M 1097.5 444.5 L 1150.5 444.5 L 1150.5 490.5 L 1097.5 490.5 Z M 948.5 485.5 L 1002.5 485.5 L 1002.5 518.5 L 948.5 518.5 Z M 1245.5 485.5 L 1300.5 485.5 L 1300.5 518.5 L 1245.5 518.5 Z M 651.5 490.5 L 705.5 490.5 L 705.5 522.5 L 651.5 522.5 Z M 1097.5 490.5 L 1150.5 490.5 L 1150.5 522.5 L 1097.5 522.5 Z M 800.5 490.5 L 853.5 490.5 L 853.5 522.5 L 800.5 522.5 Z M 651.5 522.5 L 705.5 522.5 L 705.5 530.5 L 651.5 530.5 Z M 1097.5 522.5 L 1150.5 522.5 L 1150.5 530.5 L 1097.5 530.5 Z M 800.5 522.5 L 853.5 522.5 L 853.5 530.5 L 800.5 530.5 Z M 948.5 518.5 L 1002.5 518.5 L 1002.5 530.5 L 948.5 530.5 Z M 1245.5 518.5 L 1300.5 518.5 L 1300.5 530.5 L 1245.5 530.5 Z M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1150.5 707.5 L 1245.5 707.5 L 1245.5 850.5 L 1150.5 850.5 Z M 705.5 707.5 L 800.5 707.5 L 800.5 850.5 L 705.5 850.5 Z M 853.5 707.5 L 948.5 707.5 L 948.5 850.5 L 853.5 850.5 Z M 1002.5 707.5 L 1097.5 707.5 L 1097.5 850.5 L 1002.5 850.5 Z M 1002.5 707.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1150.5 245.5 L 1245.5 245.5 L 1245.5 530.5 L 1150.5 530.5 Z M 705.5 245.5 L 800.5 245.5 L 800.5 530.5 L 705.5 530.5 Z M 853.5 245.5 L 948.5 245.5 L 948.5 530.5 L 853.5 530.5 Z M 1002.5 245.5 L 1097.5 245.5 L 1097.5 530.5 L 1002.5 530.5 Z M 1002.5 245.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 627.5 161.5 L 659.5 161.5 L 659.5 193.5 L 627.5 193.5 Z M 1266.5 161.5 L 1299.5 161.5 L 1299.5 193.5 L 1266.5 193.5 Z M 1175.5 161.5 L 1207.5 161.5 L 1207.5 193.5 L 1175.5 193.5 Z M 1084.5 161.5 L 1116.5 161.5 L 1116.5 193.5 L 1084.5 193.5 Z M 992.5 161.5 L 1025.5 161.5 L 1025.5 193.5 L 992.5 193.5 Z M 901.5 161.5 L 933.5 161.5 L 933.5 193.5 L 901.5 193.5 Z M 809.5 161.5 L 842.5 161.5 L 842.5 193.5 L 809.5 193.5 Z M 718.5 161.5 L 751.5 161.5 L 751.5 193.5 L 718.5 193.5 Z M 620.5 252.5 L 652.5 252.5 L 652.5 285.5 L 620.5 285.5 Z M 1265.5 252.5 L 1298.5 252.5 L 1298.5 285.5 L 1265.5 285.5 Z M 1197.5 252.5 L 1229.5 252.5 L 1229.5 285.5 L 1197.5 285.5 Z M 1035.5 252.5 L 1067.5 252.5 L 1067.5 285.5 L 1035.5 285.5 Z M 967.5 252.5 L 999.5 252.5 L 999.5 285.5 L 967.5 285.5 Z M 898.5 252.5 L 930.5 252.5 L 930.5 285.5 L 898.5 285.5 Z M 689.5 252.5 L 721.5 252.5 L 721.5 285.5 L 689.5 285.5 Z M 620.5 844.5 L 652.5 844.5 L 652.5 876.5 L 620.5 876.5 Z M 1246.5 844.5 L 1279.5 844.5 L 1279.5 876.5 L 1246.5 876.5 Z M 1020.5 844.5 L 1052.5 844.5 L 1052.5 876.5 L 1020.5 876.5 Z M 951.5 844.5 L 984.5 844.5 L 984.5 876.5 L 951.5 876.5 Z M 883.5 844.5 L 915.5 844.5 L 915.5 876.5 L 883.5 876.5 Z M 689.5 844.5 L 721.5 844.5 L 721.5 876.5 L 689.5 876.5 Z M 627.5 935.5 L 659.5 935.5 L 659.5 968.5 L 627.5 968.5 Z M 1266.5 935.5 L 1299.5 935.5 L 1299.5 968.5 L 1266.5 968.5 Z M 1175.5 935.5 L 1207.5 935.5 L 1207.5 968.5 L 1175.5 968.5 Z M 1084.5 935.5 L 1116.5 935.5 L 1116.5 968.5 L 1084.5 968.5 Z M 992.5 935.5 L 1025.5 935.5 L 1025.5 968.5 L 992.5 968.5 Z M 901.5 935.5 L 933.5 935.5 L 933.5 968.5 L 901.5 968.5 Z M 809.5 935.5 L 842.5 935.5 L 842.5 968.5 L 809.5 968.5 Z M 718.5 935.5 L 751.5 935.5 L 751.5 968.5 L 718.5 968.5 Z M 718.5 935.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface314">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1109.09375 643.214844 L 1093.328125 643.214844 L 1089.007812 655.5 L 1083.453125 655.5 L 1098.039062 614.601562 L 1104.773438 614.601562 L 1119.132812 655.5 L 1113.300781 655.5 Z M 1107.632812 638.839844 L 1101.351562 620.210938 L 1094.617188 638.839844 Z M 1107.632812 638.839844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1084 460 L 1116 460 M 1084 428 L 1116 428 M 1084 428 L 1084 460 M 1116 428 L 1116 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1084 460 L 1116 460 M 1084 428 L 1116 428 M 1116 460 L 1116 428 M 1084 460 L 1084 428 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 597 122 L 597 131 M 592 127 L 601 127 M 596 128 L 598 128 M 596 126 L 598 126 M 596 126 L 596 128 M 598 126 L 598 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hvl__inv_8.svg b/cells/inv/sky130_fd_sc_hvl__inv_8.svg
index 01504d8..926c07d 100644
--- a/cells/inv/sky130_fd_sc_hvl__inv_8.svg
+++ b/cells/inv/sky130_fd_sc_hvl__inv_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 211.5 98.5 L 1707.5 98.5 L 1707.5 593.5 L 211.5 593.5 Z M 211.5 98.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 274.5 161.5 L 1644.5 161.5 L 1644.5 193.5 L 274.5 193.5 Z M 274.5 161.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 274.5 161.5 L 1644.5 161.5 L 1644.5 193.5 L 274.5 193.5 Z M 349.5 675.5 L 1613.5 675.5 L 1613.5 692.5 L 349.5 692.5 Z M 349.5 692.5 L 1613.5 692.5 L 1613.5 724.5 L 349.5 724.5 Z M 349.5 724.5 L 1613.5 724.5 L 1613.5 757.5 L 349.5 757.5 Z M 349.5 757.5 L 1613.5 757.5 L 1613.5 789.5 L 349.5 789.5 Z M 349.5 789.5 L 1613.5 789.5 L 1613.5 817.5 L 349.5 817.5 Z M 349.5 789.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 274.5 935.5 L 1644.5 935.5 L 1644.5 968.5 L 274.5 968.5 Z M 274.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 376.5 245.5 L 426.5 245.5 L 426.5 256.5 L 376.5 256.5 Z M 1560.5 245.5 L 1611.5 245.5 L 1611.5 256.5 L 1560.5 256.5 Z M 670.5 245.5 L 723.5 245.5 L 723.5 256.5 L 670.5 256.5 Z M 1263.5 245.5 L 1317.5 245.5 L 1317.5 256.5 L 1263.5 256.5 Z M 967.5 245.5 L 1020.5 245.5 L 1020.5 256.5 L 967.5 256.5 Z M 670.5 256.5 L 723.5 256.5 L 723.5 288.5 L 670.5 288.5 Z M 967.5 256.5 L 1020.5 256.5 L 1020.5 288.5 L 967.5 288.5 Z M 1560.5 256.5 L 1611.5 256.5 L 1611.5 288.5 L 1560.5 288.5 Z M 1263.5 256.5 L 1317.5 256.5 L 1317.5 288.5 L 1263.5 288.5 Z M 376.5 256.5 L 426.5 256.5 L 426.5 288.5 L 376.5 288.5 Z M 818.5 245.5 L 871.5 245.5 L 871.5 296.5 L 818.5 296.5 Z M 1115.5 245.5 L 1168.5 245.5 L 1168.5 296.5 L 1115.5 296.5 Z M 1412.5 245.5 L 1465.5 245.5 L 1465.5 296.5 L 1412.5 296.5 Z M 521.5 245.5 L 574.5 245.5 L 574.5 296.5 L 521.5 296.5 Z M 376.5 288.5 L 426.5 288.5 L 426.5 321.5 L 376.5 321.5 Z M 1560.5 288.5 L 1611.5 288.5 L 1611.5 321.5 L 1560.5 321.5 Z M 1263.5 288.5 L 1317.5 288.5 L 1317.5 321.5 L 1263.5 321.5 Z M 967.5 288.5 L 1020.5 288.5 L 1020.5 321.5 L 967.5 321.5 Z M 670.5 288.5 L 723.5 288.5 L 723.5 321.5 L 670.5 321.5 Z M 1115.5 296.5 L 1168.5 296.5 L 1168.5 328.5 L 1115.5 328.5 Z M 818.5 296.5 L 871.5 296.5 L 871.5 328.5 L 818.5 328.5 Z M 521.5 296.5 L 574.5 296.5 L 574.5 328.5 L 521.5 328.5 Z M 1412.5 296.5 L 1465.5 296.5 L 1465.5 328.5 L 1412.5 328.5 Z M 1560.5 321.5 L 1611.5 321.5 L 1611.5 353.5 L 1560.5 353.5 Z M 1263.5 321.5 L 1317.5 321.5 L 1317.5 353.5 L 1263.5 353.5 Z M 967.5 321.5 L 1020.5 321.5 L 1020.5 353.5 L 967.5 353.5 Z M 670.5 321.5 L 723.5 321.5 L 723.5 353.5 L 670.5 353.5 Z M 376.5 321.5 L 426.5 321.5 L 426.5 353.5 L 376.5 353.5 Z M 818.5 328.5 L 871.5 328.5 L 871.5 361.5 L 818.5 361.5 Z M 1412.5 328.5 L 1465.5 328.5 L 1465.5 361.5 L 1412.5 361.5 Z M 1115.5 328.5 L 1168.5 328.5 L 1168.5 361.5 L 1115.5 361.5 Z M 521.5 328.5 L 574.5 328.5 L 574.5 361.5 L 521.5 361.5 Z M 1263.5 353.5 L 1317.5 353.5 L 1317.5 385.5 L 1263.5 385.5 Z M 1560.5 353.5 L 1611.5 353.5 L 1611.5 385.5 L 1560.5 385.5 Z M 670.5 353.5 L 723.5 353.5 L 723.5 385.5 L 670.5 385.5 Z M 376.5 353.5 L 426.5 353.5 L 426.5 385.5 L 376.5 385.5 Z M 967.5 353.5 L 1020.5 353.5 L 1020.5 385.5 L 967.5 385.5 Z M 1412.5 361.5 L 1465.5 361.5 L 1465.5 393.5 L 1412.5 393.5 Z M 521.5 361.5 L 574.5 361.5 L 574.5 393.5 L 521.5 393.5 Z M 818.5 361.5 L 871.5 361.5 L 871.5 393.5 L 818.5 393.5 Z M 1115.5 361.5 L 1168.5 361.5 L 1168.5 393.5 L 1115.5 393.5 Z M 1263.5 385.5 L 1317.5 385.5 L 1317.5 418.5 L 1263.5 418.5 Z M 1560.5 385.5 L 1611.5 385.5 L 1611.5 418.5 L 1560.5 418.5 Z M 376.5 385.5 L 426.5 385.5 L 426.5 418.5 L 376.5 418.5 Z M 670.5 385.5 L 723.5 385.5 L 723.5 418.5 L 670.5 418.5 Z M 967.5 385.5 L 1020.5 385.5 L 1020.5 418.5 L 967.5 418.5 Z M 818.5 393.5 L 871.5 393.5 L 871.5 425.5 L 818.5 425.5 Z M 1115.5 393.5 L 1168.5 393.5 L 1168.5 425.5 L 1115.5 425.5 Z M 521.5 393.5 L 574.5 393.5 L 574.5 425.5 L 521.5 425.5 Z M 1412.5 393.5 L 1465.5 393.5 L 1465.5 425.5 L 1412.5 425.5 Z M 1560.5 418.5 L 1611.5 418.5 L 1611.5 450.5 L 1560.5 450.5 Z M 967.5 418.5 L 1020.5 418.5 L 1020.5 450.5 L 967.5 450.5 Z M 1263.5 418.5 L 1317.5 418.5 L 1317.5 450.5 L 1263.5 450.5 Z M 670.5 418.5 L 723.5 418.5 L 723.5 450.5 L 670.5 450.5 Z M 376.5 418.5 L 426.5 418.5 L 426.5 450.5 L 376.5 450.5 Z M 521.5 425.5 L 574.5 425.5 L 574.5 458.5 L 521.5 458.5 Z M 818.5 425.5 L 871.5 425.5 L 871.5 458.5 L 818.5 458.5 Z M 1115.5 425.5 L 1168.5 425.5 L 1168.5 458.5 L 1115.5 458.5 Z M 1412.5 425.5 L 1465.5 425.5 L 1465.5 458.5 L 1412.5 458.5 Z M 376.5 450.5 L 426.5 450.5 L 426.5 483.5 L 376.5 483.5 Z M 1263.5 450.5 L 1317.5 450.5 L 1317.5 483.5 L 1263.5 483.5 Z M 1560.5 450.5 L 1611.5 450.5 L 1611.5 483.5 L 1560.5 483.5 Z M 670.5 450.5 L 723.5 450.5 L 723.5 483.5 L 670.5 483.5 Z M 967.5 450.5 L 1020.5 450.5 L 1020.5 483.5 L 967.5 483.5 Z M 1412.5 458.5 L 1465.5 458.5 L 1465.5 490.5 L 1412.5 490.5 Z M 1115.5 458.5 L 1168.5 458.5 L 1168.5 490.5 L 1115.5 490.5 Z M 818.5 458.5 L 871.5 458.5 L 871.5 490.5 L 818.5 490.5 Z M 521.5 458.5 L 574.5 458.5 L 574.5 490.5 L 521.5 490.5 Z M 1115.5 490.5 L 1168.5 490.5 L 1168.5 522.5 L 1115.5 522.5 Z M 818.5 490.5 L 871.5 490.5 L 871.5 522.5 L 818.5 522.5 Z M 521.5 490.5 L 574.5 490.5 L 574.5 522.5 L 521.5 522.5 Z M 1412.5 490.5 L 1465.5 490.5 L 1465.5 522.5 L 1412.5 522.5 Z M 818.5 522.5 L 871.5 522.5 L 871.5 530.5 L 818.5 530.5 Z M 521.5 522.5 L 574.5 522.5 L 574.5 530.5 L 521.5 530.5 Z M 1560.5 483.5 L 1611.5 483.5 L 1611.5 530.5 L 1560.5 530.5 Z M 670.5 483.5 L 723.5 483.5 L 723.5 530.5 L 670.5 530.5 Z M 376.5 483.5 L 426.5 483.5 L 426.5 530.5 L 376.5 530.5 Z M 967.5 483.5 L 1020.5 483.5 L 1020.5 530.5 L 967.5 530.5 Z M 1115.5 522.5 L 1168.5 522.5 L 1168.5 530.5 L 1115.5 530.5 Z M 1412.5 522.5 L 1465.5 522.5 L 1465.5 530.5 L 1412.5 530.5 Z M 1263.5 483.5 L 1317.5 483.5 L 1317.5 530.5 L 1263.5 530.5 Z M 274.5 935.5 L 1644.5 935.5 L 1644.5 968.5 L 274.5 968.5 Z M 274.5 935.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1465.5 675.5 L 1560.5 675.5 L 1560.5 817.5 L 1465.5 817.5 Z M 399.5 675.5 L 495.5 675.5 L 495.5 817.5 L 399.5 817.5 Z M 548.5 675.5 L 643.5 675.5 L 643.5 817.5 L 548.5 817.5 Z M 696.5 675.5 L 791.5 675.5 L 791.5 817.5 L 696.5 817.5 Z M 845.5 675.5 L 940.5 675.5 L 940.5 817.5 L 845.5 817.5 Z M 993.5 675.5 L 1088.5 675.5 L 1088.5 817.5 L 993.5 817.5 Z M 1142.5 675.5 L 1237.5 675.5 L 1237.5 817.5 L 1142.5 817.5 Z M 1317.5 675.5 L 1412.5 675.5 L 1412.5 817.5 L 1317.5 817.5 Z M 1317.5 675.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1465.5 245.5 L 1560.5 245.5 L 1560.5 530.5 L 1465.5 530.5 Z M 426.5 245.5 L 521.5 245.5 L 521.5 530.5 L 426.5 530.5 Z M 574.5 245.5 L 670.5 245.5 L 670.5 530.5 L 574.5 530.5 Z M 723.5 245.5 L 818.5 245.5 L 818.5 530.5 L 723.5 530.5 Z M 871.5 245.5 L 967.5 245.5 L 967.5 530.5 L 871.5 530.5 Z M 1020.5 245.5 L 1115.5 245.5 L 1115.5 530.5 L 1020.5 530.5 Z M 1168.5 245.5 L 1263.5 245.5 L 1263.5 530.5 L 1168.5 530.5 Z M 1317.5 245.5 L 1412.5 245.5 L 1412.5 530.5 L 1317.5 530.5 Z M 1317.5 245.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image343"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 303.5 161.5 L 336.5 161.5 L 336.5 193.5 L 303.5 193.5 Z M 1582.5 161.5 L 1614.5 161.5 L 1614.5 193.5 L 1582.5 193.5 Z M 1491.5 161.5 L 1523.5 161.5 L 1523.5 193.5 L 1491.5 193.5 Z M 1399.5 161.5 L 1432.5 161.5 L 1432.5 193.5 L 1399.5 193.5 Z M 1308.5 161.5 L 1340.5 161.5 L 1340.5 193.5 L 1308.5 193.5 Z M 1217.5 161.5 L 1249.5 161.5 L 1249.5 193.5 L 1217.5 193.5 Z M 1125.5 161.5 L 1158.5 161.5 L 1158.5 193.5 L 1125.5 193.5 Z M 1034.5 161.5 L 1066.5 161.5 L 1066.5 193.5 L 1034.5 193.5 Z M 943.5 161.5 L 975.5 161.5 L 975.5 193.5 L 943.5 193.5 Z M 851.5 161.5 L 884.5 161.5 L 884.5 193.5 L 851.5 193.5 Z M 760.5 161.5 L 792.5 161.5 L 792.5 193.5 L 760.5 193.5 Z M 669.5 161.5 L 701.5 161.5 L 701.5 193.5 L 669.5 193.5 Z M 577.5 161.5 L 610.5 161.5 L 610.5 193.5 L 577.5 193.5 Z M 486.5 161.5 L 518.5 161.5 L 518.5 193.5 L 486.5 193.5 Z M 395.5 161.5 L 427.5 161.5 L 427.5 193.5 L 395.5 193.5 Z M 360.5 258.5 L 393.5 258.5 L 393.5 288.5 L 360.5 288.5 Z M 1578.5 258.5 L 1611.5 258.5 L 1611.5 288.5 L 1578.5 288.5 Z M 977.5 258.5 L 1009.5 258.5 L 1009.5 288.5 L 977.5 288.5 Z M 680.5 258.5 L 712.5 258.5 L 712.5 288.5 L 680.5 288.5 Z M 1274.5 258.5 L 1306.5 258.5 L 1306.5 288.5 L 1274.5 288.5 Z M 1274.5 288.5 L 1306.5 288.5 L 1306.5 290.5 L 1274.5 290.5 Z M 1205.5 258.5 L 1238.5 258.5 L 1238.5 290.5 L 1205.5 290.5 Z M 1045.5 258.5 L 1078.5 258.5 L 1078.5 290.5 L 1045.5 290.5 Z M 612.5 258.5 L 644.5 258.5 L 644.5 290.5 L 612.5 290.5 Z M 429.5 258.5 L 461.5 258.5 L 461.5 290.5 L 429.5 290.5 Z M 908.5 258.5 L 941.5 258.5 L 941.5 290.5 L 908.5 290.5 Z M 749.5 258.5 L 781.5 258.5 L 781.5 290.5 L 749.5 290.5 Z M 1342.5 258.5 L 1375.5 258.5 L 1375.5 290.5 L 1342.5 290.5 Z M 360.5 288.5 L 393.5 288.5 L 393.5 290.5 L 360.5 290.5 Z M 680.5 288.5 L 712.5 288.5 L 712.5 290.5 L 680.5 290.5 Z M 1578.5 288.5 L 1611.5 288.5 L 1611.5 290.5 L 1578.5 290.5 Z M 292.5 258.5 L 324.5 258.5 L 324.5 290.5 L 292.5 290.5 Z M 1502.5 258.5 L 1535.5 258.5 L 1535.5 290.5 L 1502.5 290.5 Z M 977.5 288.5 L 1009.5 288.5 L 1009.5 290.5 L 977.5 290.5 Z M 292.5 847.5 L 324.5 847.5 L 324.5 879.5 L 292.5 879.5 Z M 1594.5 847.5 L 1626.5 847.5 L 1626.5 879.5 L 1594.5 879.5 Z M 1525.5 847.5 L 1557.5 847.5 L 1557.5 879.5 L 1525.5 879.5 Z M 1457.5 847.5 L 1489.5 847.5 L 1489.5 879.5 L 1457.5 879.5 Z M 1388.5 847.5 L 1420.5 847.5 L 1420.5 879.5 L 1388.5 879.5 Z M 1320.5 847.5 L 1352.5 847.5 L 1352.5 879.5 L 1320.5 879.5 Z M 1251.5 847.5 L 1283.5 847.5 L 1283.5 879.5 L 1251.5 879.5 Z M 1182.5 847.5 L 1215.5 847.5 L 1215.5 879.5 L 1182.5 879.5 Z M 1114.5 847.5 L 1146.5 847.5 L 1146.5 879.5 L 1114.5 879.5 Z M 1045.5 847.5 L 1078.5 847.5 L 1078.5 879.5 L 1045.5 879.5 Z M 977.5 847.5 L 1009.5 847.5 L 1009.5 879.5 L 977.5 879.5 Z M 908.5 847.5 L 941.5 847.5 L 941.5 879.5 L 908.5 879.5 Z M 840.5 847.5 L 872.5 847.5 L 872.5 879.5 L 840.5 879.5 Z M 771.5 847.5 L 804.5 847.5 L 804.5 879.5 L 771.5 879.5 Z M 703.5 847.5 L 735.5 847.5 L 735.5 879.5 L 703.5 879.5 Z M 634.5 847.5 L 667.5 847.5 L 667.5 879.5 L 634.5 879.5 Z M 566.5 847.5 L 598.5 847.5 L 598.5 879.5 L 566.5 879.5 Z M 497.5 847.5 L 530.5 847.5 L 530.5 879.5 L 497.5 879.5 Z M 429.5 847.5 L 461.5 847.5 L 461.5 879.5 L 429.5 879.5 Z M 360.5 847.5 L 393.5 847.5 L 393.5 879.5 L 360.5 879.5 Z M 303.5 935.5 L 336.5 935.5 L 336.5 968.5 L 303.5 968.5 Z M 1582.5 935.5 L 1614.5 935.5 L 1614.5 968.5 L 1582.5 968.5 Z M 1491.5 935.5 L 1523.5 935.5 L 1523.5 968.5 L 1491.5 968.5 Z M 1399.5 935.5 L 1432.5 935.5 L 1432.5 968.5 L 1399.5 968.5 Z M 1308.5 935.5 L 1340.5 935.5 L 1340.5 968.5 L 1308.5 968.5 Z M 1217.5 935.5 L 1249.5 935.5 L 1249.5 968.5 L 1217.5 968.5 Z M 1125.5 935.5 L 1158.5 935.5 L 1158.5 968.5 L 1125.5 968.5 Z M 1034.5 935.5 L 1066.5 935.5 L 1066.5 968.5 L 1034.5 968.5 Z M 943.5 935.5 L 975.5 935.5 L 975.5 968.5 L 943.5 968.5 Z M 851.5 935.5 L 884.5 935.5 L 884.5 968.5 L 851.5 968.5 Z M 760.5 935.5 L 792.5 935.5 L 792.5 968.5 L 760.5 968.5 Z M 669.5 935.5 L 701.5 935.5 L 701.5 968.5 L 669.5 968.5 Z M 577.5 935.5 L 610.5 935.5 L 610.5 968.5 L 577.5 968.5 Z M 486.5 935.5 L 518.5 935.5 L 518.5 968.5 L 486.5 968.5 Z M 395.5 935.5 L 427.5 935.5 L 427.5 968.5 L 395.5 968.5 Z M 395.5 935.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface335">
+<g id="surface363">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -208,6 +208,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1151.09375 643.214844 L 1135.328125 643.214844 L 1131.007812 655.5 L 1125.453125 655.5 L 1140.039062 614.601562 L 1146.773438 614.601562 L 1161.132812 655.5 L 1155.300781 655.5 Z M 1149.632812 638.839844 L 1143.351562 620.210938 L 1136.617188 638.839844 Z M 1149.632812 638.839844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1125 460 L 1158 460 M 1125 428 L 1158 428 M 1125 428 L 1125 460 M 1158 428 L 1158 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1125 460 L 1158 460 M 1125 428 L 1158 428 M 1158 460 L 1158 428 M 1125 460 L 1125 428 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 274 122 L 274 131 M 269 127 L 278 127 M 273 128 L 275 128 M 273 126 L 275 126 M 273 126 L 273 128 M 275 126 L 275 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.svg b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.svg
index 5c805e3..e04db18 100644
--- a/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.svg
+++ b/cells/lsbufhv2hv_hl/sky130_fd_sc_hvl__lsbufhv2hv_hl_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 475.5 308.5 L 593.5 308.5 L 593.5 765.5 L 475.5 765.5 Z M 803.5 425.5 L 1077.5 425.5 L 1077.5 765.5 L 803.5 765.5 Z M 1287.5 308.5 L 1448.5 308.5 L 1448.5 765.5 L 1287.5 765.5 Z M 1287.5 308.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 837.5 459.5 L 1043.5 459.5 L 1043.5 513.5 L 837.5 513.5 Z M 510.5 527.5 L 559.5 527.5 L 559.5 545.5 L 510.5 545.5 Z M 1321.5 527.5 L 1414.5 527.5 L 1414.5 545.5 L 1321.5 545.5 Z M 1321.5 527.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 837.5 459.5 L 1043.5 459.5 L 1043.5 513.5 L 837.5 513.5 Z M 510.5 527.5 L 559.5 527.5 L 559.5 545.5 L 510.5 545.5 Z M 1321.5 527.5 L 1414.5 527.5 L 1414.5 545.5 L 1321.5 545.5 Z M 828.5 828.5 L 938.5 828.5 L 938.5 834.5 L 828.5 834.5 Z M 828.5 834.5 L 938.5 834.5 L 938.5 852.5 L 828.5 852.5 Z M 828.5 852.5 L 938.5 852.5 L 938.5 862.5 L 828.5 862.5 Z M 828.5 862.5 L 1043.5 862.5 L 1043.5 882.5 L 828.5 882.5 Z M 828.5 882.5 L 1043.5 882.5 L 1043.5 900.5 L 828.5 900.5 Z M 828.5 900.5 L 1043.5 900.5 L 1043.5 906.5 L 828.5 906.5 Z M 828.5 900.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 510.5 101.5 L 1414.5 101.5 L 1414.5 119.5 L 510.5 119.5 Z M 510.5 953.5 L 1414.5 953.5 L 1414.5 971.5 L 510.5 971.5 Z M 510.5 953.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 510.5 101.5 L 1414.5 101.5 L 1414.5 119.5 L 510.5 119.5 Z M 837.5 541.5 L 867.5 541.5 L 867.5 545.5 L 837.5 545.5 Z M 919.5 541.5 L 949.5 541.5 L 949.5 545.5 L 919.5 545.5 Z M 919.5 545.5 L 949.5 545.5 L 949.5 563.5 L 919.5 563.5 Z M 837.5 545.5 L 867.5 545.5 L 867.5 563.5 L 837.5 563.5 Z M 837.5 563.5 L 867.5 563.5 L 867.5 589.5 L 837.5 589.5 Z M 919.5 563.5 L 949.5 563.5 L 949.5 589.5 L 919.5 589.5 Z M 837.5 589.5 L 867.5 589.5 L 867.5 606.5 L 837.5 606.5 Z M 919.5 589.5 L 949.5 589.5 L 949.5 606.5 L 919.5 606.5 Z M 919.5 606.5 L 949.5 606.5 L 949.5 619.5 L 919.5 619.5 Z M 1013.5 619.5 L 1043.5 619.5 L 1043.5 624.5 L 1013.5 624.5 Z M 837.5 606.5 L 867.5 606.5 L 867.5 632.5 L 837.5 632.5 Z M 919.5 619.5 L 961.5 619.5 L 961.5 632.5 L 919.5 632.5 Z M 1013.5 624.5 L 1043.5 624.5 L 1043.5 641.5 L 1013.5 641.5 Z M 837.5 632.5 L 867.5 632.5 L 867.5 650.5 L 837.5 650.5 Z M 919.5 632.5 L 961.5 632.5 L 961.5 650.5 L 919.5 650.5 Z M 837.5 650.5 L 867.5 650.5 L 867.5 676.5 L 837.5 676.5 Z M 919.5 650.5 L 961.5 650.5 L 961.5 676.5 L 919.5 676.5 Z M 1013.5 641.5 L 1043.5 641.5 L 1043.5 676.5 L 1013.5 676.5 Z M 1013.5 676.5 L 1043.5 676.5 L 1043.5 694.5 L 1013.5 694.5 Z M 837.5 676.5 L 867.5 676.5 L 867.5 694.5 L 837.5 694.5 Z M 919.5 676.5 L 961.5 676.5 L 961.5 694.5 L 919.5 694.5 Z M 837.5 694.5 L 867.5 694.5 L 867.5 698.5 L 837.5 698.5 Z M 919.5 694.5 L 961.5 694.5 L 961.5 698.5 L 919.5 698.5 Z M 1013.5 694.5 L 1043.5 694.5 L 1043.5 698.5 L 1013.5 698.5 Z M 510.5 953.5 L 1414.5 953.5 L 1414.5 971.5 L 510.5 971.5 Z M 510.5 953.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 856.5 828.5 L 908.5 828.5 L 908.5 906.5 L 856.5 906.5 Z M 961.5 862.5 L 1013.5 862.5 L 1013.5 906.5 L 961.5 906.5 Z M 961.5 862.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image414"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 867.5 541.5 L 919.5 541.5 L 919.5 698.5 L 867.5 698.5 Z M 961.5 619.5 L 1013.5 619.5 L 1013.5 698.5 L 961.5 698.5 Z M 961.5 619.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 526.5 101.5 L 544.5 101.5 L 544.5 119.5 L 526.5 119.5 Z M 1380.5 101.5 L 1398.5 101.5 L 1398.5 119.5 L 1380.5 119.5 Z M 1330.5 101.5 L 1347.5 101.5 L 1347.5 119.5 L 1330.5 119.5 Z M 1279.5 101.5 L 1297.5 101.5 L 1297.5 119.5 L 1279.5 119.5 Z M 1229.5 101.5 L 1247.5 101.5 L 1247.5 119.5 L 1229.5 119.5 Z M 1179.5 101.5 L 1197.5 101.5 L 1197.5 119.5 L 1179.5 119.5 Z M 1129.5 101.5 L 1146.5 101.5 L 1146.5 119.5 L 1129.5 119.5 Z M 1078.5 101.5 L 1096.5 101.5 L 1096.5 119.5 L 1078.5 119.5 Z M 1028.5 101.5 L 1046.5 101.5 L 1046.5 119.5 L 1028.5 119.5 Z M 978.5 101.5 L 996.5 101.5 L 996.5 119.5 L 978.5 119.5 Z M 928.5 101.5 L 946.5 101.5 L 946.5 119.5 L 928.5 119.5 Z M 878.5 101.5 L 895.5 101.5 L 895.5 119.5 L 878.5 119.5 Z M 827.5 101.5 L 845.5 101.5 L 845.5 119.5 L 827.5 119.5 Z M 777.5 101.5 L 795.5 101.5 L 795.5 119.5 L 777.5 119.5 Z M 727.5 101.5 L 745.5 101.5 L 745.5 119.5 L 727.5 119.5 Z M 677.5 101.5 L 694.5 101.5 L 694.5 119.5 L 677.5 119.5 Z M 626.5 101.5 L 644.5 101.5 L 644.5 119.5 L 626.5 119.5 Z M 576.5 101.5 L 594.5 101.5 L 594.5 119.5 L 576.5 119.5 Z M 526.5 527.5 L 544.5 527.5 L 544.5 545.5 L 526.5 545.5 Z M 1380.5 527.5 L 1398.5 527.5 L 1398.5 545.5 L 1380.5 545.5 Z M 1330.5 527.5 L 1347.5 527.5 L 1347.5 545.5 L 1330.5 545.5 Z M 927.5 623.5 L 945.5 623.5 L 945.5 632.5 L 927.5 632.5 Z M 927.5 632.5 L 945.5 632.5 L 945.5 640.5 L 927.5 640.5 Z M 890.5 623.5 L 907.5 623.5 L 907.5 640.5 L 890.5 640.5 Z M 886.5 903.5 L 904.5 903.5 L 904.5 921.5 L 886.5 921.5 Z M 961.5 903.5 L 979.5 903.5 L 979.5 921.5 L 961.5 921.5 Z M 924.5 903.5 L 941.5 903.5 L 941.5 921.5 L 924.5 921.5 Z M 526.5 953.5 L 544.5 953.5 L 544.5 971.5 L 526.5 971.5 Z M 1380.5 953.5 L 1398.5 953.5 L 1398.5 971.5 L 1380.5 971.5 Z M 1330.5 953.5 L 1347.5 953.5 L 1347.5 971.5 L 1330.5 971.5 Z M 1279.5 953.5 L 1297.5 953.5 L 1297.5 971.5 L 1279.5 971.5 Z M 1229.5 953.5 L 1247.5 953.5 L 1247.5 971.5 L 1229.5 971.5 Z M 1179.5 953.5 L 1197.5 953.5 L 1197.5 971.5 L 1179.5 971.5 Z M 1129.5 953.5 L 1146.5 953.5 L 1146.5 971.5 L 1129.5 971.5 Z M 1078.5 953.5 L 1096.5 953.5 L 1096.5 971.5 L 1078.5 971.5 Z M 1028.5 953.5 L 1046.5 953.5 L 1046.5 971.5 L 1028.5 971.5 Z M 978.5 953.5 L 996.5 953.5 L 996.5 971.5 L 978.5 971.5 Z M 928.5 953.5 L 946.5 953.5 L 946.5 971.5 L 928.5 971.5 Z M 878.5 953.5 L 895.5 953.5 L 895.5 971.5 L 878.5 971.5 Z M 827.5 953.5 L 845.5 953.5 L 845.5 971.5 L 827.5 971.5 Z M 777.5 953.5 L 795.5 953.5 L 795.5 971.5 L 777.5 971.5 Z M 727.5 953.5 L 745.5 953.5 L 745.5 971.5 L 727.5 971.5 Z M 677.5 953.5 L 694.5 953.5 L 694.5 971.5 L 677.5 971.5 Z M 626.5 953.5 L 644.5 953.5 L 644.5 971.5 L 626.5 971.5 Z M 576.5 953.5 L 594.5 953.5 L 594.5 971.5 L 576.5 971.5 Z M 576.5 953.5 "/>
 </clipPath>
-<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image386"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface377">
+<g id="surface407">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -228,6 +228,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 993.519531 121.082031 L 993.457031 122.070312 L 993.304688 122.964844 L 993.027344 123.796875 L 992.65625 124.539062 L 992.160156 125.246094 L 991.574219 125.863281 L 990.929688 126.390625 L 990.25 126.789062 L 989.476562 127.097656 L 988.675781 127.347656 L 987.8125 127.46875 L 986.886719 127.5 L 976.734375 127.5 L 976.734375 105.007812 L 985.867188 105.007812 L 987.195312 105.097656 L 988.367188 105.316406 L 989.414062 105.683594 L 990.3125 106.210938 L 991.082031 106.886719 L 991.699219 107.722656 L 991.945312 108.183594 L 992.160156 108.679688 L 992.316406 109.140625 L 992.441406 109.664062 L 992.5 110.191406 L 992.53125 110.714844 L 992.441406 111.824219 L 992.160156 112.78125 L 991.730469 113.675781 L 991.113281 114.417969 L 990.339844 115.097656 L 989.414062 115.621094 L 990.3125 116.023438 L 991.082031 116.453125 L 991.761719 116.949219 L 992.316406 117.503906 L 992.75 118.089844 L 993.085938 118.707031 L 993.210938 119.078125 L 993.304688 119.445312 L 993.394531 119.816406 L 993.457031 120.25 L 993.488281 120.648438 Z M 989.664062 111.117188 L 989.570312 110.191406 L 989.292969 109.417969 L 988.859375 108.738281 L 988.242188 108.246094 L 987.472656 107.875 L 986.515625 107.628906 L 986.300781 107.628906 L 986.082031 107.597656 L 985.867188 107.566406 L 985.375 107.566406 L 985.15625 107.535156 L 979.605469 107.535156 L 979.605469 114.695312 L 985.15625 114.695312 L 986.300781 114.632812 L 987.285156 114.449219 L 988.121094 114.109375 L 988.738281 113.644531 L 989.230469 113.027344 L 989.539062 112.289062 L 989.570312 112.132812 L 989.632812 111.765625 L 989.632812 111.332031 Z M 986.609375 124.96875 L 987.472656 124.9375 L 988.242188 124.753906 L 988.921875 124.445312 L 989.476562 124.042969 L 989.941406 123.519531 L 990.3125 122.871094 L 990.402344 122.625 L 990.464844 122.347656 L 990.558594 122.039062 L 990.589844 121.761719 L 990.621094 121.453125 L 990.648438 121.113281 L 990.589844 120.433594 L 990.464844 119.785156 L 990.25 119.230469 L 989.941406 118.707031 L 989.539062 118.273438 L 989.078125 117.875 L 988.738281 117.6875 L 988.367188 117.535156 L 987.964844 117.410156 L 987.535156 117.316406 L 987.070312 117.257812 L 986.609375 117.226562 L 979.605469 117.226562 L 979.605469 124.96875 Z M 986.609375 124.96875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 510 969 L 1414 969 M 510 957 L 1414 957 M 510 957 L 510 969 M 1414 957 L 1414 969 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 510 969 L 1414 969 M 510 957 L 1414 957 M 1414 969 L 1414 957 M 510 969 L 510 957 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 510 112 L 510 121 M 505 117 L 514 117 M 509 118 L 511 118 M 509 116 L 511 116 M 509 116 L 509 118 M 511 116 L 511 118 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.svg b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.svg
index 692842c..92d739d 100644
--- a/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.svg
+++ b/cells/lsbufhv2hv_lh/sky130_fd_sc_hvl__lsbufhv2hv_lh_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1169.5 308.5 L 1548.5 308.5 L 1548.5 704.5 L 1169.5 704.5 Z M 701.5 511.5 L 960.5 511.5 L 960.5 751.5 L 701.5 751.5 Z M 1434.5 704.5 L 1548.5 704.5 L 1548.5 765.5 L 1434.5 765.5 Z M 374.5 308.5 L 492.5 308.5 L 492.5 765.5 L 374.5 765.5 Z M 374.5 308.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 408.5 527.5 L 457.5 527.5 L 457.5 545.5 L 408.5 545.5 Z M 1316.5 527.5 L 1513.5 527.5 L 1513.5 545.5 L 1316.5 545.5 Z M 736.5 545.5 L 925.5 545.5 L 925.5 549.5 L 736.5 549.5 Z M 736.5 549.5 L 925.5 549.5 L 925.5 603.5 L 736.5 603.5 Z M 736.5 603.5 L 925.5 603.5 L 925.5 607.5 L 736.5 607.5 Z M 736.5 603.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 771.5 166.5 L 1124.5 166.5 L 1124.5 173.5 L 771.5 173.5 Z M 1390.5 166.5 L 1498.5 166.5 L 1498.5 173.5 L 1390.5 173.5 Z M 771.5 173.5 L 1124.5 173.5 L 1124.5 190.5 L 771.5 190.5 Z M 1390.5 173.5 L 1498.5 173.5 L 1498.5 190.5 L 1390.5 190.5 Z M 771.5 190.5 L 1124.5 190.5 L 1124.5 214.5 L 771.5 214.5 Z M 1390.5 190.5 L 1498.5 190.5 L 1498.5 221.5 L 1390.5 221.5 Z M 771.5 214.5 L 1124.5 214.5 L 1124.5 232.5 L 771.5 232.5 Z M 1390.5 221.5 L 1498.5 221.5 L 1498.5 238.5 L 1390.5 238.5 Z M 1390.5 238.5 L 1498.5 238.5 L 1498.5 245.5 L 1390.5 245.5 Z M 771.5 232.5 L 1124.5 232.5 L 1124.5 257.5 L 771.5 257.5 Z M 771.5 257.5 L 1124.5 257.5 L 1124.5 275.5 L 771.5 275.5 Z M 771.5 275.5 L 1124.5 275.5 L 1124.5 299.5 L 771.5 299.5 Z M 771.5 299.5 L 1124.5 299.5 L 1124.5 317.5 L 771.5 317.5 Z M 771.5 317.5 L 1124.5 317.5 L 1124.5 323.5 L 771.5 323.5 Z M 408.5 527.5 L 457.5 527.5 L 457.5 545.5 L 408.5 545.5 Z M 1316.5 527.5 L 1513.5 527.5 L 1513.5 545.5 L 1316.5 545.5 Z M 736.5 545.5 L 925.5 545.5 L 925.5 549.5 L 736.5 549.5 Z M 736.5 549.5 L 925.5 549.5 L 925.5 603.5 L 736.5 603.5 Z M 736.5 603.5 L 925.5 603.5 L 925.5 607.5 L 736.5 607.5 Z M 1036.5 749.5 L 1389.5 749.5 L 1389.5 755.5 L 1036.5 755.5 Z M 1036.5 755.5 L 1389.5 755.5 L 1389.5 773.5 L 1036.5 773.5 Z M 1036.5 773.5 L 1389.5 773.5 L 1389.5 797.5 L 1036.5 797.5 Z M 1036.5 797.5 L 1389.5 797.5 L 1389.5 815.5 L 1036.5 815.5 Z M 736.5 810.5 L 925.5 810.5 L 925.5 816.5 L 736.5 816.5 Z M 736.5 816.5 L 925.5 816.5 L 925.5 834.5 L 736.5 834.5 Z M 1036.5 815.5 L 1389.5 815.5 L 1389.5 840.5 L 1036.5 840.5 Z M 1036.5 840.5 L 1389.5 840.5 L 1389.5 858.5 L 1036.5 858.5 Z M 736.5 834.5 L 925.5 834.5 L 925.5 864.5 L 736.5 864.5 Z M 1036.5 858.5 L 1389.5 858.5 L 1389.5 882.5 L 1036.5 882.5 Z M 736.5 864.5 L 925.5 864.5 L 925.5 882.5 L 736.5 882.5 Z M 736.5 882.5 L 925.5 882.5 L 925.5 888.5 L 736.5 888.5 Z M 1036.5 882.5 L 1389.5 882.5 L 1389.5 900.5 L 1036.5 900.5 Z M 1036.5 900.5 L 1389.5 900.5 L 1389.5 906.5 L 1036.5 906.5 Z M 1036.5 900.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 408.5 101.5 L 1513.5 101.5 L 1513.5 119.5 L 408.5 119.5 Z M 408.5 953.5 L 1513.5 953.5 L 1513.5 971.5 L 408.5 971.5 Z M 408.5 953.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 408.5 101.5 L 1513.5 101.5 L 1513.5 119.5 L 408.5 119.5 Z M 1470.5 342.5 L 1498.5 342.5 L 1498.5 348.5 L 1470.5 348.5 Z M 1390.5 342.5 L 1417.5 342.5 L 1417.5 348.5 L 1390.5 348.5 Z M 1470.5 348.5 L 1498.5 348.5 L 1498.5 366.5 L 1470.5 366.5 Z M 1390.5 348.5 L 1417.5 348.5 L 1417.5 366.5 L 1390.5 366.5 Z M 1470.5 366.5 L 1498.5 366.5 L 1498.5 390.5 L 1470.5 390.5 Z M 1390.5 366.5 L 1417.5 366.5 L 1417.5 390.5 L 1390.5 390.5 Z M 1390.5 390.5 L 1417.5 390.5 L 1417.5 408.5 L 1390.5 408.5 Z M 1470.5 390.5 L 1498.5 390.5 L 1498.5 408.5 L 1470.5 408.5 Z M 1390.5 408.5 L 1417.5 408.5 L 1417.5 433.5 L 1390.5 433.5 Z M 1470.5 408.5 L 1498.5 408.5 L 1498.5 433.5 L 1470.5 433.5 Z M 1204.5 433.5 L 1234.5 433.5 L 1234.5 439.5 L 1204.5 439.5 Z M 1470.5 433.5 L 1498.5 433.5 L 1498.5 451.5 L 1470.5 451.5 Z M 1390.5 433.5 L 1417.5 433.5 L 1417.5 451.5 L 1390.5 451.5 Z M 1390.5 451.5 L 1417.5 451.5 L 1417.5 455.5 L 1390.5 455.5 Z M 1204.5 439.5 L 1234.5 439.5 L 1234.5 455.5 L 1204.5 455.5 Z M 1204.5 455.5 L 1242.5 455.5 L 1242.5 457.5 L 1204.5 457.5 Z M 1346.5 455.5 L 1417.5 455.5 L 1417.5 468.5 L 1346.5 468.5 Z M 1204.5 457.5 L 1242.5 457.5 L 1242.5 475.5 L 1204.5 475.5 Z M 1470.5 451.5 L 1498.5 451.5 L 1498.5 475.5 L 1470.5 475.5 Z M 1346.5 468.5 L 1417.5 468.5 L 1417.5 486.5 L 1346.5 486.5 Z M 1204.5 475.5 L 1242.5 475.5 L 1242.5 493.5 L 1204.5 493.5 Z M 1470.5 475.5 L 1498.5 475.5 L 1498.5 493.5 L 1470.5 493.5 Z M 1346.5 486.5 L 1417.5 486.5 L 1417.5 493.5 L 1346.5 493.5 Z M 1204.5 493.5 L 1242.5 493.5 L 1242.5 499.5 L 1204.5 499.5 Z M 1346.5 493.5 L 1417.5 493.5 L 1417.5 499.5 L 1346.5 499.5 Z M 1470.5 493.5 L 1498.5 493.5 L 1498.5 499.5 L 1470.5 499.5 Z M 1204.5 602.5 L 1234.5 602.5 L 1234.5 608.5 L 1204.5 608.5 Z M 1354.5 602.5 L 1385.5 602.5 L 1385.5 608.5 L 1354.5 608.5 Z M 1354.5 608.5 L 1385.5 608.5 L 1385.5 624.5 L 1354.5 624.5 Z M 1204.5 608.5 L 1234.5 608.5 L 1234.5 624.5 L 1204.5 624.5 Z M 1346.5 624.5 L 1385.5 624.5 L 1385.5 626.5 L 1346.5 626.5 Z M 1204.5 624.5 L 1242.5 624.5 L 1242.5 626.5 L 1204.5 626.5 Z M 1204.5 626.5 L 1242.5 626.5 L 1242.5 643.5 L 1204.5 643.5 Z M 1346.5 626.5 L 1385.5 626.5 L 1385.5 643.5 L 1346.5 643.5 Z M 897.5 638.5 L 925.5 638.5 L 925.5 644.5 L 897.5 644.5 Z M 816.5 638.5 L 845.5 638.5 L 845.5 644.5 L 816.5 644.5 Z M 736.5 638.5 L 764.5 638.5 L 764.5 644.5 L 736.5 644.5 Z M 1204.5 643.5 L 1242.5 643.5 L 1242.5 661.5 L 1204.5 661.5 Z M 1346.5 643.5 L 1385.5 643.5 L 1385.5 661.5 L 1346.5 661.5 Z M 736.5 644.5 L 764.5 644.5 L 764.5 662.5 L 736.5 662.5 Z M 897.5 644.5 L 925.5 644.5 L 925.5 662.5 L 897.5 662.5 Z M 816.5 644.5 L 845.5 644.5 L 845.5 662.5 L 816.5 662.5 Z M 1346.5 661.5 L 1385.5 661.5 L 1385.5 668.5 L 1346.5 668.5 Z M 1204.5 661.5 L 1242.5 661.5 L 1242.5 668.5 L 1204.5 668.5 Z M 816.5 662.5 L 845.5 662.5 L 845.5 693.5 L 816.5 693.5 Z M 736.5 662.5 L 764.5 662.5 L 764.5 693.5 L 736.5 693.5 Z M 897.5 662.5 L 925.5 662.5 L 925.5 693.5 L 897.5 693.5 Z M 736.5 693.5 L 764.5 693.5 L 764.5 710.5 L 736.5 710.5 Z M 897.5 693.5 L 925.5 693.5 L 925.5 710.5 L 897.5 710.5 Z M 816.5 693.5 L 845.5 693.5 L 845.5 710.5 L 816.5 710.5 Z M 736.5 710.5 L 764.5 710.5 L 764.5 717.5 L 736.5 717.5 Z M 816.5 710.5 L 845.5 710.5 L 845.5 717.5 L 816.5 717.5 Z M 897.5 710.5 L 925.5 710.5 L 925.5 717.5 L 897.5 717.5 Z M 408.5 953.5 L 1513.5 953.5 L 1513.5 971.5 L 408.5 971.5 Z M 408.5 953.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1417.5 166.5 L 1470.5 166.5 L 1470.5 245.5 L 1417.5 245.5 Z M 881.5 166.5 L 933.5 166.5 L 933.5 323.5 L 881.5 323.5 Z M 1044.5 166.5 L 1096.5 166.5 L 1096.5 323.5 L 1044.5 323.5 Z M 962.5 166.5 L 1015.5 166.5 L 1015.5 323.5 L 962.5 323.5 Z M 799.5 166.5 L 851.5 166.5 L 851.5 323.5 L 799.5 323.5 Z M 764.5 810.5 L 816.5 810.5 L 816.5 888.5 L 764.5 888.5 Z M 845.5 810.5 L 897.5 810.5 L 897.5 888.5 L 845.5 888.5 Z M 1309.5 749.5 L 1361.5 749.5 L 1361.5 906.5 L 1309.5 906.5 Z M 1145.5 749.5 L 1198.5 749.5 L 1198.5 906.5 L 1145.5 906.5 Z M 1064.5 749.5 L 1116.5 749.5 L 1116.5 906.5 L 1064.5 906.5 Z M 1227.5 749.5 L 1279.5 749.5 L 1279.5 906.5 L 1227.5 906.5 Z M 1227.5 749.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1417.5 342.5 L 1470.5 342.5 L 1470.5 499.5 L 1417.5 499.5 Z M 1242.5 455.5 L 1346.5 455.5 L 1346.5 499.5 L 1242.5 499.5 Z M 1242.5 624.5 L 1346.5 624.5 L 1346.5 668.5 L 1242.5 668.5 Z M 764.5 638.5 L 816.5 638.5 L 816.5 717.5 L 764.5 717.5 Z M 845.5 638.5 L 897.5 638.5 L 897.5 717.5 L 845.5 717.5 Z M 845.5 638.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 424.5 101.5 L 442.5 101.5 L 442.5 119.5 L 424.5 119.5 Z M 1479.5 101.5 L 1497.5 101.5 L 1497.5 119.5 L 1479.5 119.5 Z M 1429.5 101.5 L 1447.5 101.5 L 1447.5 119.5 L 1429.5 119.5 Z M 1379.5 101.5 L 1397.5 101.5 L 1397.5 119.5 L 1379.5 119.5 Z M 1329.5 101.5 L 1346.5 101.5 L 1346.5 119.5 L 1329.5 119.5 Z M 1278.5 101.5 L 1296.5 101.5 L 1296.5 119.5 L 1278.5 119.5 Z M 1228.5 101.5 L 1246.5 101.5 L 1246.5 119.5 L 1228.5 119.5 Z M 1178.5 101.5 L 1196.5 101.5 L 1196.5 119.5 L 1178.5 119.5 Z M 1128.5 101.5 L 1145.5 101.5 L 1145.5 119.5 L 1128.5 119.5 Z M 1077.5 101.5 L 1095.5 101.5 L 1095.5 119.5 L 1077.5 119.5 Z M 1027.5 101.5 L 1045.5 101.5 L 1045.5 119.5 L 1027.5 119.5 Z M 977.5 101.5 L 995.5 101.5 L 995.5 119.5 L 977.5 119.5 Z M 927.5 101.5 L 945.5 101.5 L 945.5 119.5 L 927.5 119.5 Z M 877.5 101.5 L 894.5 101.5 L 894.5 119.5 L 877.5 119.5 Z M 826.5 101.5 L 844.5 101.5 L 844.5 119.5 L 826.5 119.5 Z M 776.5 101.5 L 794.5 101.5 L 794.5 119.5 L 776.5 119.5 Z M 726.5 101.5 L 744.5 101.5 L 744.5 119.5 L 726.5 119.5 Z M 676.5 101.5 L 693.5 101.5 L 693.5 119.5 L 676.5 119.5 Z M 625.5 101.5 L 643.5 101.5 L 643.5 119.5 L 625.5 119.5 Z M 575.5 101.5 L 593.5 101.5 L 593.5 119.5 L 575.5 119.5 Z M 525.5 101.5 L 543.5 101.5 L 543.5 119.5 L 525.5 119.5 Z M 475.5 101.5 L 492.5 101.5 L 492.5 119.5 L 475.5 119.5 Z M 757.5 155.5 L 774.5 155.5 L 774.5 173.5 L 757.5 173.5 Z M 1413.5 155.5 L 1431.5 155.5 L 1431.5 173.5 L 1413.5 173.5 Z M 1375.5 155.5 L 1393.5 155.5 L 1393.5 173.5 L 1375.5 173.5 Z M 1121.5 155.5 L 1139.5 155.5 L 1139.5 173.5 L 1121.5 173.5 Z M 1083.5 155.5 L 1101.5 155.5 L 1101.5 173.5 L 1083.5 173.5 Z M 958.5 155.5 L 975.5 155.5 L 975.5 173.5 L 958.5 173.5 Z M 920.5 155.5 L 938.5 155.5 L 938.5 173.5 L 920.5 173.5 Z M 794.5 155.5 L 812.5 155.5 L 812.5 173.5 L 794.5 173.5 Z M 1337.5 474.5 L 1355.5 474.5 L 1355.5 486.5 L 1337.5 486.5 Z M 1413.5 474.5 L 1431.5 474.5 L 1431.5 492.5 L 1413.5 492.5 Z M 1375.5 474.5 L 1393.5 474.5 L 1393.5 492.5 L 1375.5 492.5 Z M 1337.5 486.5 L 1355.5 486.5 L 1355.5 492.5 L 1337.5 492.5 Z M 1429.5 527.5 L 1447.5 527.5 L 1447.5 545.5 L 1429.5 545.5 Z M 1479.5 527.5 L 1497.5 527.5 L 1497.5 545.5 L 1479.5 545.5 Z M 1329.5 527.5 L 1346.5 527.5 L 1346.5 545.5 L 1329.5 545.5 Z M 1379.5 527.5 L 1397.5 527.5 L 1397.5 545.5 L 1379.5 545.5 Z M 424.5 527.5 L 442.5 527.5 L 442.5 545.5 L 424.5 545.5 Z M 1385.5 581.5 L 1402.5 581.5 L 1402.5 598.5 L 1385.5 598.5 Z M 1347.5 581.5 L 1365.5 581.5 L 1365.5 598.5 L 1347.5 598.5 Z M 803.5 625.5 L 821.5 625.5 L 821.5 643.5 L 803.5 643.5 Z M 840.5 625.5 L 858.5 625.5 L 858.5 643.5 L 840.5 643.5 Z M 803.5 900.5 L 821.5 900.5 L 821.5 918.5 L 803.5 918.5 Z M 1386.5 900.5 L 1403.5 900.5 L 1403.5 918.5 L 1386.5 918.5 Z M 1348.5 900.5 L 1366.5 900.5 L 1366.5 918.5 L 1348.5 918.5 Z M 1222.5 900.5 L 1240.5 900.5 L 1240.5 918.5 L 1222.5 918.5 Z M 1185.5 900.5 L 1202.5 900.5 L 1202.5 918.5 L 1185.5 918.5 Z M 1059.5 900.5 L 1077.5 900.5 L 1077.5 918.5 L 1059.5 918.5 Z M 1021.5 900.5 L 1039.5 900.5 L 1039.5 918.5 L 1021.5 918.5 Z M 840.5 900.5 L 858.5 900.5 L 858.5 918.5 L 840.5 918.5 Z M 424.5 953.5 L 442.5 953.5 L 442.5 971.5 L 424.5 971.5 Z M 1479.5 953.5 L 1497.5 953.5 L 1497.5 971.5 L 1479.5 971.5 Z M 1429.5 953.5 L 1447.5 953.5 L 1447.5 971.5 L 1429.5 971.5 Z M 1379.5 953.5 L 1397.5 953.5 L 1397.5 971.5 L 1379.5 971.5 Z M 1329.5 953.5 L 1346.5 953.5 L 1346.5 971.5 L 1329.5 971.5 Z M 1278.5 953.5 L 1296.5 953.5 L 1296.5 971.5 L 1278.5 971.5 Z M 1228.5 953.5 L 1246.5 953.5 L 1246.5 971.5 L 1228.5 971.5 Z M 1178.5 953.5 L 1196.5 953.5 L 1196.5 971.5 L 1178.5 971.5 Z M 1128.5 953.5 L 1145.5 953.5 L 1145.5 971.5 L 1128.5 971.5 Z M 1077.5 953.5 L 1095.5 953.5 L 1095.5 971.5 L 1077.5 971.5 Z M 1027.5 953.5 L 1045.5 953.5 L 1045.5 971.5 L 1027.5 971.5 Z M 977.5 953.5 L 995.5 953.5 L 995.5 971.5 L 977.5 971.5 Z M 927.5 953.5 L 945.5 953.5 L 945.5 971.5 L 927.5 971.5 Z M 877.5 953.5 L 894.5 953.5 L 894.5 971.5 L 877.5 971.5 Z M 826.5 953.5 L 844.5 953.5 L 844.5 971.5 L 826.5 971.5 Z M 776.5 953.5 L 794.5 953.5 L 794.5 971.5 L 776.5 971.5 Z M 726.5 953.5 L 744.5 953.5 L 744.5 971.5 L 726.5 971.5 Z M 676.5 953.5 L 693.5 953.5 L 693.5 971.5 L 676.5 971.5 Z M 625.5 953.5 L 643.5 953.5 L 643.5 971.5 L 625.5 971.5 Z M 575.5 953.5 L 593.5 953.5 L 593.5 971.5 L 575.5 971.5 Z M 525.5 953.5 L 543.5 953.5 L 543.5 971.5 L 525.5 971.5 Z M 475.5 953.5 L 492.5 953.5 L 492.5 971.5 L 475.5 971.5 Z M 475.5 953.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface368">
+<g id="surface398">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -219,6 +219,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1490.566406 245.960938 L 1498.523438 257.5 L 1494.976562 257.5 L 1488.835938 248.121094 L 1482.664062 257.5 L 1479.179688 257.5 L 1487.140625 245.960938 L 1479.671875 235.007812 L 1483.160156 235.007812 L 1488.929688 243.832031 L 1494.730469 235.007812 L 1498.15625 235.007812 Z M 1490.566406 245.960938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1479 842 L 1497 842 M 1479 824 L 1497 824 M 1479 824 L 1479 842 M 1497 824 L 1497 842 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1479 842 L 1497 842 M 1479 824 L 1497 824 M 1497 842 L 1497 824 M 1479 842 L 1479 824 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 408 112 L 408 121 M 403 117 L 412 117 M 407 118 L 409 118 M 407 116 L 409 116 M 407 116 L 407 118 M 409 116 L 409 118 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.svg b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.svg
index b6a020d..865f7cb 100644
--- a/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.svg
+++ b/cells/lsbufhv2lv/sky130_fd_sc_hvl__lsbufhv2lv_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 904.5 379.5 L 1058.5 379.5 L 1058.5 761.5 L 904.5 761.5 Z M 500.5 308.5 L 695.5 308.5 L 695.5 765.5 L 500.5 765.5 Z M 1267.5 308.5 L 1423.5 308.5 L 1423.5 765.5 L 1267.5 765.5 Z M 1267.5 308.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image393"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 535.5 527.5 L 660.5 527.5 L 660.5 545.5 L 535.5 545.5 Z M 1302.5 527.5 L 1389.5 527.5 L 1389.5 545.5 L 1302.5 545.5 Z M 923.5 543.5 L 1039.5 543.5 L 1039.5 561.5 L 923.5 561.5 Z M 923.5 561.5 L 1039.5 561.5 L 1039.5 579.5 L 923.5 579.5 Z M 923.5 579.5 L 1039.5 579.5 L 1039.5 596.5 L 923.5 596.5 Z M 923.5 579.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image394"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 641.5 184.5 L 929.5 184.5 L 929.5 190.5 L 641.5 190.5 Z M 641.5 190.5 L 929.5 190.5 L 929.5 208.5 L 641.5 208.5 Z M 641.5 208.5 L 929.5 208.5 L 929.5 219.5 L 641.5 219.5 Z M 551.5 219.5 L 929.5 219.5 L 929.5 232.5 L 551.5 232.5 Z M 551.5 232.5 L 929.5 232.5 L 929.5 249.5 L 551.5 249.5 Z M 551.5 249.5 L 929.5 249.5 L 929.5 263.5 L 551.5 263.5 Z M 740.5 294.5 L 848.5 294.5 L 848.5 300.5 L 740.5 300.5 Z M 740.5 300.5 L 848.5 300.5 L 848.5 318.5 L 740.5 318.5 Z M 740.5 318.5 L 848.5 318.5 L 848.5 348.5 L 740.5 348.5 Z M 740.5 348.5 L 848.5 348.5 L 848.5 366.5 L 740.5 366.5 Z M 740.5 366.5 L 848.5 366.5 L 848.5 372.5 L 740.5 372.5 Z M 535.5 527.5 L 660.5 527.5 L 660.5 545.5 L 535.5 545.5 Z M 1302.5 527.5 L 1389.5 527.5 L 1389.5 545.5 L 1302.5 545.5 Z M 740.5 551.5 L 848.5 551.5 L 848.5 560.5 L 740.5 560.5 Z M 740.5 560.5 L 848.5 560.5 L 848.5 578.5 L 740.5 578.5 Z M 740.5 578.5 L 848.5 578.5 L 848.5 606.5 L 740.5 606.5 Z M 740.5 606.5 L 848.5 606.5 L 848.5 624.5 L 740.5 624.5 Z M 740.5 624.5 L 848.5 624.5 L 848.5 630.5 L 740.5 630.5 Z M 740.5 661.5 L 848.5 661.5 L 848.5 670.5 L 740.5 670.5 Z M 740.5 670.5 L 848.5 670.5 L 848.5 687.5 L 740.5 687.5 Z M 740.5 687.5 L 848.5 687.5 L 848.5 716.5 L 740.5 716.5 Z M 740.5 716.5 L 848.5 716.5 L 848.5 733.5 L 740.5 733.5 Z M 740.5 733.5 L 848.5 733.5 L 848.5 740.5 L 740.5 740.5 Z M 551.5 810.5 L 848.5 810.5 L 848.5 823.5 L 551.5 823.5 Z M 551.5 823.5 L 848.5 823.5 L 848.5 841.5 L 551.5 841.5 Z M 551.5 841.5 L 848.5 841.5 L 848.5 854.5 L 551.5 854.5 Z M 641.5 854.5 L 848.5 854.5 L 848.5 864.5 L 641.5 864.5 Z M 641.5 864.5 L 848.5 864.5 L 848.5 882.5 L 641.5 882.5 Z M 641.5 882.5 L 848.5 882.5 L 848.5 888.5 L 641.5 888.5 Z M 641.5 882.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 535.5 101.5 L 1389.5 101.5 L 1389.5 119.5 L 535.5 119.5 Z M 535.5 953.5 L 1389.5 953.5 L 1389.5 971.5 L 535.5 971.5 Z M 535.5 953.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image394"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 535.5 101.5 L 1389.5 101.5 L 1389.5 119.5 L 535.5 119.5 Z M 551.5 342.5 L 580.5 342.5 L 580.5 355.5 L 551.5 355.5 Z M 633.5 342.5 L 660.5 342.5 L 660.5 355.5 L 633.5 355.5 Z M 633.5 355.5 L 660.5 355.5 L 660.5 373.5 L 633.5 373.5 Z M 551.5 355.5 L 580.5 355.5 L 580.5 373.5 L 551.5 373.5 Z M 633.5 373.5 L 660.5 373.5 L 660.5 386.5 L 633.5 386.5 Z M 551.5 373.5 L 580.5 373.5 L 580.5 386.5 L 551.5 386.5 Z M 551.5 686.5 L 580.5 686.5 L 580.5 699.5 L 551.5 699.5 Z M 633.5 686.5 L 660.5 686.5 L 660.5 699.5 L 633.5 699.5 Z M 633.5 699.5 L 660.5 699.5 L 660.5 717.5 L 633.5 717.5 Z M 551.5 699.5 L 580.5 699.5 L 580.5 717.5 L 551.5 717.5 Z M 633.5 717.5 L 660.5 717.5 L 660.5 730.5 L 633.5 730.5 Z M 551.5 717.5 L 580.5 717.5 L 580.5 730.5 L 551.5 730.5 Z M 535.5 953.5 L 1389.5 953.5 L 1389.5 971.5 L 535.5 971.5 Z M 535.5 953.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 849.5 184.5 L 902.5 184.5 L 902.5 263.5 L 849.5 263.5 Z M 580.5 219.5 L 633.5 219.5 L 633.5 263.5 L 580.5 263.5 Z M 768.5 184.5 L 820.5 184.5 L 820.5 263.5 L 768.5 263.5 Z M 686.5 184.5 L 738.5 184.5 L 738.5 263.5 L 686.5 263.5 Z M 768.5 294.5 L 820.5 294.5 L 820.5 372.5 L 768.5 372.5 Z M 768.5 551.5 L 820.5 551.5 L 820.5 630.5 L 768.5 630.5 Z M 768.5 661.5 L 820.5 661.5 L 820.5 740.5 L 768.5 740.5 Z M 580.5 810.5 L 633.5 810.5 L 633.5 854.5 L 580.5 854.5 Z M 951.5 806.5 L 967.5 806.5 L 967.5 883.5 L 951.5 883.5 Z M 768.5 810.5 L 820.5 810.5 L 820.5 888.5 L 768.5 888.5 Z M 686.5 810.5 L 738.5 810.5 L 738.5 888.5 L 686.5 888.5 Z M 686.5 810.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 580.5 342.5 L 633.5 342.5 L 633.5 386.5 L 580.5 386.5 Z M 951.5 398.5 L 967.5 398.5 L 967.5 515.5 L 951.5 515.5 Z M 580.5 686.5 L 633.5 686.5 L 633.5 730.5 L 580.5 730.5 Z M 996.5 625.5 L 1011.5 625.5 L 1011.5 742.5 L 996.5 742.5 Z M 951.5 625.5 L 967.5 625.5 L 967.5 742.5 L 951.5 742.5 Z M 951.5 625.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -94,15 +94,15 @@
 <clipPath id="clip15">
   <path d="M 551.5 101.5 L 569.5 101.5 L 569.5 119.5 L 551.5 119.5 Z M 1355.5 101.5 L 1372.5 101.5 L 1372.5 119.5 L 1355.5 119.5 Z M 1304.5 101.5 L 1322.5 101.5 L 1322.5 119.5 L 1304.5 119.5 Z M 1254.5 101.5 L 1272.5 101.5 L 1272.5 119.5 L 1254.5 119.5 Z M 1204.5 101.5 L 1222.5 101.5 L 1222.5 119.5 L 1204.5 119.5 Z M 1154.5 101.5 L 1172.5 101.5 L 1172.5 119.5 L 1154.5 119.5 Z M 1104.5 101.5 L 1121.5 101.5 L 1121.5 119.5 L 1104.5 119.5 Z M 1053.5 101.5 L 1071.5 101.5 L 1071.5 119.5 L 1053.5 119.5 Z M 1003.5 101.5 L 1021.5 101.5 L 1021.5 119.5 L 1003.5 119.5 Z M 953.5 101.5 L 971.5 101.5 L 971.5 119.5 L 953.5 119.5 Z M 903.5 101.5 L 920.5 101.5 L 920.5 119.5 L 903.5 119.5 Z M 852.5 101.5 L 870.5 101.5 L 870.5 119.5 L 852.5 119.5 Z M 802.5 101.5 L 820.5 101.5 L 820.5 119.5 L 802.5 119.5 Z M 752.5 101.5 L 770.5 101.5 L 770.5 119.5 L 752.5 119.5 Z M 702.5 101.5 L 720.5 101.5 L 720.5 119.5 L 702.5 119.5 Z M 652.5 101.5 L 669.5 101.5 L 669.5 119.5 L 652.5 119.5 Z M 601.5 101.5 L 619.5 101.5 L 619.5 119.5 L 601.5 119.5 Z M 632.5 155.5 L 649.5 155.5 L 649.5 173.5 L 632.5 173.5 Z M 840.5 155.5 L 858.5 155.5 L 858.5 173.5 L 840.5 173.5 Z M 803.5 155.5 L 821.5 155.5 L 821.5 173.5 L 803.5 173.5 Z M 669.5 155.5 L 687.5 155.5 L 687.5 173.5 L 669.5 173.5 Z M 552.5 474.5 L 569.5 474.5 L 569.5 492.5 L 552.5 492.5 Z M 589.5 474.5 L 607.5 474.5 L 607.5 492.5 L 589.5 492.5 Z M 551.5 527.5 L 569.5 527.5 L 569.5 545.5 L 551.5 545.5 Z M 1355.5 527.5 L 1372.5 527.5 L 1372.5 545.5 L 1355.5 545.5 Z M 1304.5 527.5 L 1322.5 527.5 L 1322.5 545.5 L 1304.5 545.5 Z M 601.5 527.5 L 619.5 527.5 L 619.5 545.5 L 601.5 545.5 Z M 589.5 581.5 L 607.5 581.5 L 607.5 598.5 L 589.5 598.5 Z M 552.5 581.5 L 569.5 581.5 L 569.5 598.5 L 552.5 598.5 Z M 970.5 619.5 L 988.5 619.5 L 988.5 631.5 L 970.5 631.5 Z M 970.5 631.5 L 988.5 631.5 L 988.5 637.5 L 970.5 637.5 Z M 1008.5 619.5 L 1026.5 619.5 L 1026.5 637.5 L 1008.5 637.5 Z M 669.5 900.5 L 687.5 900.5 L 687.5 918.5 L 669.5 918.5 Z M 1008.5 900.5 L 1026.5 900.5 L 1026.5 918.5 L 1008.5 918.5 Z M 970.5 900.5 L 988.5 900.5 L 988.5 918.5 L 970.5 918.5 Z M 845.5 900.5 L 862.5 900.5 L 862.5 918.5 L 845.5 918.5 Z M 807.5 900.5 L 825.5 900.5 L 825.5 918.5 L 807.5 918.5 Z M 632.5 900.5 L 649.5 900.5 L 649.5 918.5 L 632.5 918.5 Z M 551.5 953.5 L 569.5 953.5 L 569.5 971.5 L 551.5 971.5 Z M 1355.5 953.5 L 1372.5 953.5 L 1372.5 971.5 L 1355.5 971.5 Z M 1304.5 953.5 L 1322.5 953.5 L 1322.5 971.5 L 1304.5 971.5 Z M 1254.5 953.5 L 1272.5 953.5 L 1272.5 971.5 L 1254.5 971.5 Z M 1204.5 953.5 L 1222.5 953.5 L 1222.5 971.5 L 1204.5 971.5 Z M 1154.5 953.5 L 1172.5 953.5 L 1172.5 971.5 L 1154.5 971.5 Z M 1104.5 953.5 L 1121.5 953.5 L 1121.5 971.5 L 1104.5 971.5 Z M 1053.5 953.5 L 1071.5 953.5 L 1071.5 971.5 L 1053.5 971.5 Z M 1003.5 953.5 L 1021.5 953.5 L 1021.5 971.5 L 1003.5 971.5 Z M 953.5 953.5 L 971.5 953.5 L 971.5 971.5 L 953.5 971.5 Z M 903.5 953.5 L 920.5 953.5 L 920.5 971.5 L 903.5 971.5 Z M 852.5 953.5 L 870.5 953.5 L 870.5 971.5 L 852.5 971.5 Z M 802.5 953.5 L 820.5 953.5 L 820.5 971.5 L 802.5 971.5 Z M 752.5 953.5 L 770.5 953.5 L 770.5 971.5 L 752.5 971.5 Z M 702.5 953.5 L 720.5 953.5 L 720.5 971.5 L 702.5 971.5 Z M 652.5 953.5 L 669.5 953.5 L 669.5 971.5 L 652.5 971.5 Z M 601.5 953.5 L 619.5 953.5 L 619.5 971.5 L 601.5 971.5 Z M 601.5 953.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface390">
+<g id="surface420">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -231,6 +231,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 993.519531 121.082031 L 993.457031 122.070312 L 993.304688 122.964844 L 993.027344 123.796875 L 992.65625 124.539062 L 992.160156 125.246094 L 991.574219 125.863281 L 990.929688 126.390625 L 990.25 126.789062 L 989.476562 127.097656 L 988.675781 127.347656 L 987.8125 127.46875 L 986.886719 127.5 L 976.734375 127.5 L 976.734375 105.007812 L 985.867188 105.007812 L 987.195312 105.097656 L 988.367188 105.316406 L 989.414062 105.683594 L 990.3125 106.210938 L 991.082031 106.886719 L 991.699219 107.722656 L 991.945312 108.183594 L 992.160156 108.679688 L 992.316406 109.140625 L 992.441406 109.664062 L 992.5 110.191406 L 992.53125 110.714844 L 992.441406 111.824219 L 992.160156 112.78125 L 991.730469 113.675781 L 991.113281 114.417969 L 990.339844 115.097656 L 989.414062 115.621094 L 990.3125 116.023438 L 991.082031 116.453125 L 991.761719 116.949219 L 992.316406 117.503906 L 992.75 118.089844 L 993.085938 118.707031 L 993.210938 119.078125 L 993.304688 119.445312 L 993.394531 119.816406 L 993.457031 120.25 L 993.488281 120.648438 Z M 989.664062 111.117188 L 989.570312 110.191406 L 989.292969 109.417969 L 988.859375 108.738281 L 988.242188 108.246094 L 987.472656 107.875 L 986.515625 107.628906 L 986.300781 107.628906 L 986.082031 107.597656 L 985.867188 107.566406 L 985.375 107.566406 L 985.15625 107.535156 L 979.605469 107.535156 L 979.605469 114.695312 L 985.15625 114.695312 L 986.300781 114.632812 L 987.285156 114.449219 L 988.121094 114.109375 L 988.738281 113.644531 L 989.230469 113.027344 L 989.539062 112.289062 L 989.570312 112.132812 L 989.632812 111.765625 L 989.632812 111.332031 Z M 986.609375 124.96875 L 987.472656 124.9375 L 988.242188 124.753906 L 988.921875 124.445312 L 989.476562 124.042969 L 989.941406 123.519531 L 990.3125 122.871094 L 990.402344 122.625 L 990.464844 122.347656 L 990.558594 122.039062 L 990.589844 121.761719 L 990.621094 121.453125 L 990.648438 121.113281 L 990.589844 120.433594 L 990.464844 119.785156 L 990.25 119.230469 L 989.941406 118.707031 L 989.539062 118.273438 L 989.078125 117.875 L 988.738281 117.6875 L 988.367188 117.535156 L 987.964844 117.410156 L 987.535156 117.316406 L 987.070312 117.257812 L 986.609375 117.226562 L 979.605469 117.226562 L 979.605469 124.96875 Z M 986.609375 124.96875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 535 969 L 1389 969 M 535 957 L 1389 957 M 535 957 L 535 969 M 1389 957 L 1389 969 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 535 969 L 1389 969 M 535 957 L 1389 957 M 1389 969 L 1389 957 M 535 969 L 535 957 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 535 112 L 535 121 M 530 117 L 539 117 M 534 118 L 536 118 M 534 116 L 536 116 M 534 116 L 534 118 M 536 116 L 536 118 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.svg b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.svg
index b079e99..2dd5150 100644
--- a/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.svg
+++ b/cells/lsbufhv2lv_simple/sky130_fd_sc_hvl__lsbufhv2lv_simple_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 475.5 308.5 L 593.5 308.5 L 593.5 765.5 L 475.5 765.5 Z M 803.5 457.5 L 1077.5 457.5 L 1077.5 765.5 L 803.5 765.5 Z M 1287.5 308.5 L 1448.5 308.5 L 1448.5 765.5 L 1287.5 765.5 Z M 1287.5 308.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 1321.5 527.5 L 1414.5 527.5 L 1414.5 545.5 L 1321.5 545.5 Z M 510.5 527.5 L 559.5 527.5 L 559.5 545.5 L 510.5 545.5 Z M 837.5 492.5 L 1043.5 492.5 L 1043.5 545.5 L 837.5 545.5 Z M 837.5 492.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 1321.5 527.5 L 1414.5 527.5 L 1414.5 545.5 L 1321.5 545.5 Z M 510.5 527.5 L 559.5 527.5 L 559.5 545.5 L 510.5 545.5 Z M 837.5 492.5 L 1043.5 492.5 L 1043.5 545.5 L 837.5 545.5 Z M 828.5 828.5 L 938.5 828.5 L 938.5 834.5 L 828.5 834.5 Z M 828.5 834.5 L 938.5 834.5 L 938.5 852.5 L 828.5 852.5 Z M 828.5 852.5 L 938.5 852.5 L 938.5 862.5 L 828.5 862.5 Z M 828.5 862.5 L 1043.5 862.5 L 1043.5 882.5 L 828.5 882.5 Z M 828.5 882.5 L 1043.5 882.5 L 1043.5 900.5 L 828.5 900.5 Z M 828.5 900.5 L 1043.5 900.5 L 1043.5 906.5 L 828.5 906.5 Z M 828.5 900.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 510.5 101.5 L 1414.5 101.5 L 1414.5 119.5 L 510.5 119.5 Z M 510.5 953.5 L 1414.5 953.5 L 1414.5 971.5 L 510.5 971.5 Z M 510.5 953.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 510.5 101.5 L 1414.5 101.5 L 1414.5 119.5 L 510.5 119.5 Z M 837.5 573.5 L 867.5 573.5 L 867.5 578.5 L 837.5 578.5 Z M 919.5 573.5 L 949.5 573.5 L 949.5 578.5 L 919.5 578.5 Z M 919.5 578.5 L 949.5 578.5 L 949.5 595.5 L 919.5 595.5 Z M 837.5 578.5 L 867.5 578.5 L 867.5 595.5 L 837.5 595.5 Z M 837.5 595.5 L 867.5 595.5 L 867.5 621.5 L 837.5 621.5 Z M 919.5 595.5 L 949.5 595.5 L 949.5 621.5 L 919.5 621.5 Z M 837.5 621.5 L 867.5 621.5 L 867.5 639.5 L 837.5 639.5 Z M 919.5 621.5 L 949.5 621.5 L 949.5 639.5 L 919.5 639.5 Z M 919.5 639.5 L 949.5 639.5 L 949.5 652.5 L 919.5 652.5 Z M 1013.5 652.5 L 1043.5 652.5 L 1043.5 656.5 L 1013.5 656.5 Z M 837.5 639.5 L 867.5 639.5 L 867.5 665.5 L 837.5 665.5 Z M 919.5 652.5 L 961.5 652.5 L 961.5 665.5 L 919.5 665.5 Z M 1013.5 656.5 L 1043.5 656.5 L 1043.5 674.5 L 1013.5 674.5 Z M 837.5 665.5 L 867.5 665.5 L 867.5 683.5 L 837.5 683.5 Z M 919.5 665.5 L 961.5 665.5 L 961.5 683.5 L 919.5 683.5 Z M 837.5 683.5 L 867.5 683.5 L 867.5 708.5 L 837.5 708.5 Z M 919.5 683.5 L 961.5 683.5 L 961.5 708.5 L 919.5 708.5 Z M 1013.5 674.5 L 1043.5 674.5 L 1043.5 708.5 L 1013.5 708.5 Z M 1013.5 708.5 L 1043.5 708.5 L 1043.5 726.5 L 1013.5 726.5 Z M 837.5 708.5 L 867.5 708.5 L 867.5 726.5 L 837.5 726.5 Z M 919.5 708.5 L 961.5 708.5 L 961.5 726.5 L 919.5 726.5 Z M 837.5 726.5 L 867.5 726.5 L 867.5 730.5 L 837.5 730.5 Z M 919.5 726.5 L 961.5 726.5 L 961.5 730.5 L 919.5 730.5 Z M 1013.5 726.5 L 1043.5 726.5 L 1043.5 730.5 L 1013.5 730.5 Z M 510.5 953.5 L 1414.5 953.5 L 1414.5 971.5 L 510.5 971.5 Z M 510.5 953.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 856.5 828.5 L 908.5 828.5 L 908.5 906.5 L 856.5 906.5 Z M 961.5 862.5 L 1013.5 862.5 L 1013.5 906.5 L 961.5 906.5 Z M 961.5 862.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 867.5 573.5 L 919.5 573.5 L 919.5 730.5 L 867.5 730.5 Z M 961.5 652.5 L 1013.5 652.5 L 1013.5 730.5 L 961.5 730.5 Z M 961.5 652.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image434"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 526.5 101.5 L 544.5 101.5 L 544.5 119.5 L 526.5 119.5 Z M 1380.5 101.5 L 1398.5 101.5 L 1398.5 119.5 L 1380.5 119.5 Z M 1330.5 101.5 L 1347.5 101.5 L 1347.5 119.5 L 1330.5 119.5 Z M 1279.5 101.5 L 1297.5 101.5 L 1297.5 119.5 L 1279.5 119.5 Z M 1229.5 101.5 L 1247.5 101.5 L 1247.5 119.5 L 1229.5 119.5 Z M 1179.5 101.5 L 1197.5 101.5 L 1197.5 119.5 L 1179.5 119.5 Z M 1129.5 101.5 L 1146.5 101.5 L 1146.5 119.5 L 1129.5 119.5 Z M 1078.5 101.5 L 1096.5 101.5 L 1096.5 119.5 L 1078.5 119.5 Z M 1028.5 101.5 L 1046.5 101.5 L 1046.5 119.5 L 1028.5 119.5 Z M 978.5 101.5 L 996.5 101.5 L 996.5 119.5 L 978.5 119.5 Z M 928.5 101.5 L 946.5 101.5 L 946.5 119.5 L 928.5 119.5 Z M 878.5 101.5 L 895.5 101.5 L 895.5 119.5 L 878.5 119.5 Z M 827.5 101.5 L 845.5 101.5 L 845.5 119.5 L 827.5 119.5 Z M 777.5 101.5 L 795.5 101.5 L 795.5 119.5 L 777.5 119.5 Z M 727.5 101.5 L 745.5 101.5 L 745.5 119.5 L 727.5 119.5 Z M 677.5 101.5 L 694.5 101.5 L 694.5 119.5 L 677.5 119.5 Z M 626.5 101.5 L 644.5 101.5 L 644.5 119.5 L 626.5 119.5 Z M 576.5 101.5 L 594.5 101.5 L 594.5 119.5 L 576.5 119.5 Z M 526.5 527.5 L 544.5 527.5 L 544.5 545.5 L 526.5 545.5 Z M 1380.5 527.5 L 1398.5 527.5 L 1398.5 545.5 L 1380.5 545.5 Z M 1330.5 527.5 L 1347.5 527.5 L 1347.5 545.5 L 1330.5 545.5 Z M 927.5 623.5 L 945.5 623.5 L 945.5 639.5 L 927.5 639.5 Z M 927.5 639.5 L 945.5 639.5 L 945.5 640.5 L 927.5 640.5 Z M 890.5 623.5 L 907.5 623.5 L 907.5 640.5 L 890.5 640.5 Z M 869.5 903.5 L 887.5 903.5 L 887.5 921.5 L 869.5 921.5 Z M 982.5 903.5 L 1000.5 903.5 L 1000.5 921.5 L 982.5 921.5 Z M 945.5 903.5 L 962.5 903.5 L 962.5 921.5 L 945.5 921.5 Z M 907.5 903.5 L 925.5 903.5 L 925.5 921.5 L 907.5 921.5 Z M 526.5 953.5 L 544.5 953.5 L 544.5 971.5 L 526.5 971.5 Z M 1380.5 953.5 L 1398.5 953.5 L 1398.5 971.5 L 1380.5 971.5 Z M 1330.5 953.5 L 1347.5 953.5 L 1347.5 971.5 L 1330.5 971.5 Z M 1279.5 953.5 L 1297.5 953.5 L 1297.5 971.5 L 1279.5 971.5 Z M 1229.5 953.5 L 1247.5 953.5 L 1247.5 971.5 L 1229.5 971.5 Z M 1179.5 953.5 L 1197.5 953.5 L 1197.5 971.5 L 1179.5 971.5 Z M 1129.5 953.5 L 1146.5 953.5 L 1146.5 971.5 L 1129.5 971.5 Z M 1078.5 953.5 L 1096.5 953.5 L 1096.5 971.5 L 1078.5 971.5 Z M 1028.5 953.5 L 1046.5 953.5 L 1046.5 971.5 L 1028.5 971.5 Z M 978.5 953.5 L 996.5 953.5 L 996.5 971.5 L 978.5 971.5 Z M 928.5 953.5 L 946.5 953.5 L 946.5 971.5 L 928.5 971.5 Z M 878.5 953.5 L 895.5 953.5 L 895.5 971.5 L 878.5 971.5 Z M 827.5 953.5 L 845.5 953.5 L 845.5 971.5 L 827.5 971.5 Z M 777.5 953.5 L 795.5 953.5 L 795.5 971.5 L 777.5 971.5 Z M 727.5 953.5 L 745.5 953.5 L 745.5 971.5 L 727.5 971.5 Z M 677.5 953.5 L 694.5 953.5 L 694.5 971.5 L 677.5 971.5 Z M 626.5 953.5 L 644.5 953.5 L 644.5 971.5 L 626.5 971.5 Z M 576.5 953.5 L 594.5 953.5 L 594.5 971.5 L 576.5 971.5 Z M 576.5 953.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image435"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface396">
+<g id="surface426">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -237,6 +237,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 993.519531 121.082031 L 993.457031 122.070312 L 993.304688 122.964844 L 993.027344 123.796875 L 992.65625 124.539062 L 992.160156 125.246094 L 991.574219 125.863281 L 990.929688 126.390625 L 990.25 126.789062 L 989.476562 127.097656 L 988.675781 127.347656 L 987.8125 127.46875 L 986.886719 127.5 L 976.734375 127.5 L 976.734375 105.007812 L 985.867188 105.007812 L 987.195312 105.097656 L 988.367188 105.316406 L 989.414062 105.683594 L 990.3125 106.210938 L 991.082031 106.886719 L 991.699219 107.722656 L 991.945312 108.183594 L 992.160156 108.679688 L 992.316406 109.140625 L 992.441406 109.664062 L 992.5 110.191406 L 992.53125 110.714844 L 992.441406 111.824219 L 992.160156 112.78125 L 991.730469 113.675781 L 991.113281 114.417969 L 990.339844 115.097656 L 989.414062 115.621094 L 990.3125 116.023438 L 991.082031 116.453125 L 991.761719 116.949219 L 992.316406 117.503906 L 992.75 118.089844 L 993.085938 118.707031 L 993.210938 119.078125 L 993.304688 119.445312 L 993.394531 119.816406 L 993.457031 120.25 L 993.488281 120.648438 Z M 989.664062 111.117188 L 989.570312 110.191406 L 989.292969 109.417969 L 988.859375 108.738281 L 988.242188 108.246094 L 987.472656 107.875 L 986.515625 107.628906 L 986.300781 107.628906 L 986.082031 107.597656 L 985.867188 107.566406 L 985.375 107.566406 L 985.15625 107.535156 L 979.605469 107.535156 L 979.605469 114.695312 L 985.15625 114.695312 L 986.300781 114.632812 L 987.285156 114.449219 L 988.121094 114.109375 L 988.738281 113.644531 L 989.230469 113.027344 L 989.539062 112.289062 L 989.570312 112.132812 L 989.632812 111.765625 L 989.632812 111.332031 Z M 986.609375 124.96875 L 987.472656 124.9375 L 988.242188 124.753906 L 988.921875 124.445312 L 989.476562 124.042969 L 989.941406 123.519531 L 990.3125 122.871094 L 990.402344 122.625 L 990.464844 122.347656 L 990.558594 122.039062 L 990.589844 121.761719 L 990.621094 121.453125 L 990.648438 121.113281 L 990.589844 120.433594 L 990.464844 119.785156 L 990.25 119.230469 L 989.941406 118.707031 L 989.539062 118.273438 L 989.078125 117.875 L 988.738281 117.6875 L 988.367188 117.535156 L 987.964844 117.410156 L 987.535156 117.316406 L 987.070312 117.257812 L 986.609375 117.226562 L 979.605469 117.226562 L 979.605469 124.96875 Z M 986.609375 124.96875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 510 969 L 1414 969 M 510 957 L 1414 957 M 510 957 L 510 969 M 1414 957 L 1414 969 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 510 969 L 1414 969 M 510 957 L 1414 957 M 1414 969 L 1414 957 M 510 969 L 510 957 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 510 112 L 510 121 M 505 117 L 514 117 M 509 118 L 511 118 M 509 116 L 511 116 M 509 116 L 509 118 M 511 116 L 511 118 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.svg b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.svg
index e938358..5e8a761 100644
--- a/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.svg
+++ b/cells/lsbuflv2hv/sky130_fd_sc_hvl__lsbuflv2hv_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1071.5 308.5 L 1548.5 308.5 L 1548.5 704.5 L 1071.5 704.5 Z M 701.5 510.5 L 862.5 510.5 L 862.5 751.5 L 701.5 751.5 Z M 1434.5 704.5 L 1548.5 704.5 L 1548.5 765.5 L 1434.5 765.5 Z M 374.5 308.5 L 492.5 308.5 L 492.5 765.5 L 374.5 765.5 Z M 374.5 308.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 750.5 528.5 L 843.5 528.5 L 843.5 531.5 L 750.5 531.5 Z M 408.5 527.5 L 457.5 527.5 L 457.5 545.5 L 408.5 545.5 Z M 1216.5 527.5 L 1513.5 527.5 L 1513.5 545.5 L 1216.5 545.5 Z M 750.5 531.5 L 843.5 531.5 L 843.5 549.5 L 750.5 549.5 Z M 750.5 549.5 L 843.5 549.5 L 843.5 589.5 L 750.5 589.5 Z M 750.5 589.5 L 843.5 589.5 L 843.5 606.5 L 750.5 606.5 Z M 750.5 606.5 L 843.5 606.5 L 843.5 616.5 L 750.5 616.5 Z M 750.5 606.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 592.5 166.5 L 1026.5 166.5 L 1026.5 173.5 L 592.5 173.5 Z M 1303.5 166.5 L 1498.5 166.5 L 1498.5 173.5 L 1303.5 173.5 Z M 1303.5 173.5 L 1498.5 173.5 L 1498.5 190.5 L 1303.5 190.5 Z M 592.5 173.5 L 1026.5 173.5 L 1026.5 190.5 L 592.5 190.5 Z M 592.5 190.5 L 1026.5 190.5 L 1026.5 214.5 L 592.5 214.5 Z M 1303.5 190.5 L 1498.5 190.5 L 1498.5 221.5 L 1303.5 221.5 Z M 592.5 214.5 L 1026.5 214.5 L 1026.5 232.5 L 592.5 232.5 Z M 1303.5 221.5 L 1498.5 221.5 L 1498.5 238.5 L 1303.5 238.5 Z M 1303.5 238.5 L 1498.5 238.5 L 1498.5 245.5 L 1303.5 245.5 Z M 592.5 232.5 L 1026.5 232.5 L 1026.5 257.5 L 592.5 257.5 Z M 592.5 257.5 L 1026.5 257.5 L 1026.5 275.5 L 592.5 275.5 Z M 592.5 275.5 L 1026.5 275.5 L 1026.5 299.5 L 592.5 299.5 Z M 592.5 299.5 L 1026.5 299.5 L 1026.5 317.5 L 592.5 317.5 Z M 592.5 317.5 L 1026.5 317.5 L 1026.5 323.5 L 592.5 323.5 Z M 408.5 527.5 L 457.5 527.5 L 457.5 545.5 L 408.5 545.5 Z M 1216.5 527.5 L 1513.5 527.5 L 1513.5 545.5 L 1216.5 545.5 Z M 954.5 749.5 L 1389.5 749.5 L 1389.5 755.5 L 954.5 755.5 Z M 954.5 755.5 L 1389.5 755.5 L 1389.5 773.5 L 954.5 773.5 Z M 954.5 773.5 L 1389.5 773.5 L 1389.5 797.5 L 954.5 797.5 Z M 954.5 797.5 L 1389.5 797.5 L 1389.5 815.5 L 954.5 815.5 Z M 954.5 815.5 L 1389.5 815.5 L 1389.5 840.5 L 954.5 840.5 Z M 954.5 840.5 L 1389.5 840.5 L 1389.5 858.5 L 954.5 858.5 Z M 954.5 858.5 L 1389.5 858.5 L 1389.5 882.5 L 954.5 882.5 Z M 954.5 882.5 L 1389.5 882.5 L 1389.5 900.5 L 954.5 900.5 Z M 954.5 900.5 L 1389.5 900.5 L 1389.5 906.5 L 954.5 906.5 Z M 954.5 900.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 408.5 101.5 L 1513.5 101.5 L 1513.5 119.5 L 408.5 119.5 Z M 408.5 953.5 L 1513.5 953.5 L 1513.5 971.5 L 408.5 971.5 Z M 408.5 953.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 408.5 101.5 L 1513.5 101.5 L 1513.5 119.5 L 408.5 119.5 Z M 1303.5 342.5 L 1331.5 342.5 L 1331.5 348.5 L 1303.5 348.5 Z M 1470.5 342.5 L 1498.5 342.5 L 1498.5 348.5 L 1470.5 348.5 Z M 1383.5 342.5 L 1417.5 342.5 L 1417.5 348.5 L 1383.5 348.5 Z M 1383.5 348.5 L 1417.5 348.5 L 1417.5 366.5 L 1383.5 366.5 Z M 1303.5 348.5 L 1331.5 348.5 L 1331.5 366.5 L 1303.5 366.5 Z M 1470.5 348.5 L 1498.5 348.5 L 1498.5 366.5 L 1470.5 366.5 Z M 1303.5 366.5 L 1331.5 366.5 L 1331.5 390.5 L 1303.5 390.5 Z M 1383.5 366.5 L 1417.5 366.5 L 1417.5 390.5 L 1383.5 390.5 Z M 1470.5 366.5 L 1498.5 366.5 L 1498.5 390.5 L 1470.5 390.5 Z M 1383.5 390.5 L 1417.5 390.5 L 1417.5 408.5 L 1383.5 408.5 Z M 1303.5 390.5 L 1331.5 390.5 L 1331.5 408.5 L 1303.5 408.5 Z M 1470.5 390.5 L 1498.5 390.5 L 1498.5 408.5 L 1470.5 408.5 Z M 1470.5 408.5 L 1498.5 408.5 L 1498.5 433.5 L 1470.5 433.5 Z M 1383.5 408.5 L 1417.5 408.5 L 1417.5 433.5 L 1383.5 433.5 Z M 1303.5 408.5 L 1331.5 408.5 L 1331.5 433.5 L 1303.5 433.5 Z M 1303.5 433.5 L 1331.5 433.5 L 1331.5 451.5 L 1303.5 451.5 Z M 1470.5 433.5 L 1498.5 433.5 L 1498.5 451.5 L 1470.5 451.5 Z M 1383.5 433.5 L 1417.5 433.5 L 1417.5 451.5 L 1383.5 451.5 Z M 1244.5 455.5 L 1272.5 455.5 L 1272.5 468.5 L 1244.5 468.5 Z M 1106.5 455.5 L 1140.5 455.5 L 1140.5 468.5 L 1106.5 468.5 Z M 1383.5 451.5 L 1417.5 451.5 L 1417.5 475.5 L 1383.5 475.5 Z M 1470.5 451.5 L 1498.5 451.5 L 1498.5 475.5 L 1470.5 475.5 Z M 1303.5 451.5 L 1331.5 451.5 L 1331.5 475.5 L 1303.5 475.5 Z M 1106.5 468.5 L 1140.5 468.5 L 1140.5 486.5 L 1106.5 486.5 Z M 1244.5 468.5 L 1272.5 468.5 L 1272.5 486.5 L 1244.5 486.5 Z M 1303.5 475.5 L 1331.5 475.5 L 1331.5 493.5 L 1303.5 493.5 Z M 1470.5 475.5 L 1498.5 475.5 L 1498.5 493.5 L 1470.5 493.5 Z M 1383.5 475.5 L 1417.5 475.5 L 1417.5 493.5 L 1383.5 493.5 Z M 1470.5 493.5 L 1498.5 493.5 L 1498.5 499.5 L 1470.5 499.5 Z M 1383.5 493.5 L 1417.5 493.5 L 1417.5 499.5 L 1383.5 499.5 Z M 1303.5 493.5 L 1331.5 493.5 L 1331.5 499.5 L 1303.5 499.5 Z M 1244.5 486.5 L 1272.5 486.5 L 1272.5 499.5 L 1244.5 499.5 Z M 1106.5 486.5 L 1140.5 486.5 L 1140.5 499.5 L 1106.5 499.5 Z M 1106.5 602.5 L 1136.5 602.5 L 1136.5 608.5 L 1106.5 608.5 Z M 1256.5 602.5 L 1287.5 602.5 L 1287.5 608.5 L 1256.5 608.5 Z M 1256.5 608.5 L 1287.5 608.5 L 1287.5 624.5 L 1256.5 624.5 Z M 1106.5 608.5 L 1136.5 608.5 L 1136.5 624.5 L 1106.5 624.5 Z M 1106.5 624.5 L 1144.5 624.5 L 1144.5 626.5 L 1106.5 626.5 Z M 1249.5 624.5 L 1287.5 624.5 L 1287.5 626.5 L 1249.5 626.5 Z M 1249.5 626.5 L 1287.5 626.5 L 1287.5 643.5 L 1249.5 643.5 Z M 1106.5 626.5 L 1144.5 626.5 L 1144.5 643.5 L 1106.5 643.5 Z M 1249.5 643.5 L 1287.5 643.5 L 1287.5 661.5 L 1249.5 661.5 Z M 1106.5 643.5 L 1144.5 643.5 L 1144.5 661.5 L 1106.5 661.5 Z M 1249.5 661.5 L 1287.5 661.5 L 1287.5 668.5 L 1249.5 668.5 Z M 1106.5 661.5 L 1144.5 661.5 L 1144.5 668.5 L 1106.5 668.5 Z M 408.5 953.5 L 1513.5 953.5 L 1513.5 971.5 L 408.5 971.5 Z M 408.5 953.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1331.5 166.5 L 1383.5 166.5 L 1383.5 245.5 L 1331.5 245.5 Z M 1417.5 166.5 L 1470.5 166.5 L 1470.5 245.5 L 1417.5 245.5 Z M 783.5 166.5 L 835.5 166.5 L 835.5 323.5 L 783.5 323.5 Z M 946.5 166.5 L 998.5 166.5 L 998.5 323.5 L 946.5 323.5 Z M 864.5 166.5 L 917.5 166.5 L 917.5 323.5 L 864.5 323.5 Z M 620.5 166.5 L 672.5 166.5 L 672.5 323.5 L 620.5 323.5 Z M 701.5 166.5 L 754.5 166.5 L 754.5 323.5 L 701.5 323.5 Z M 796.5 795.5 L 812.5 795.5 L 812.5 883.5 L 796.5 883.5 Z M 751.5 795.5 L 767.5 795.5 L 767.5 883.5 L 751.5 883.5 Z M 982.5 749.5 L 1035.5 749.5 L 1035.5 906.5 L 982.5 906.5 Z M 1145.5 749.5 L 1198.5 749.5 L 1198.5 906.5 L 1145.5 906.5 Z M 1064.5 749.5 L 1116.5 749.5 L 1116.5 906.5 L 1064.5 906.5 Z M 1309.5 749.5 L 1361.5 749.5 L 1361.5 906.5 L 1309.5 906.5 Z M 1227.5 749.5 L 1279.5 749.5 L 1279.5 906.5 L 1227.5 906.5 Z M 1227.5 749.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1417.5 342.5 L 1470.5 342.5 L 1470.5 499.5 L 1417.5 499.5 Z M 1140.5 455.5 L 1244.5 455.5 L 1244.5 499.5 L 1140.5 499.5 Z M 1331.5 342.5 L 1383.5 342.5 L 1383.5 499.5 L 1331.5 499.5 Z M 1144.5 624.5 L 1249.5 624.5 L 1249.5 668.5 L 1144.5 668.5 Z M 751.5 644.5 L 767.5 644.5 L 767.5 732.5 L 751.5 732.5 Z M 796.5 644.5 L 812.5 644.5 L 812.5 732.5 L 796.5 732.5 Z M 796.5 644.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -94,15 +94,15 @@
 <clipPath id="clip15">
   <path d="M 424.5 101.5 L 442.5 101.5 L 442.5 119.5 L 424.5 119.5 Z M 1479.5 101.5 L 1497.5 101.5 L 1497.5 119.5 L 1479.5 119.5 Z M 1429.5 101.5 L 1447.5 101.5 L 1447.5 119.5 L 1429.5 119.5 Z M 1379.5 101.5 L 1397.5 101.5 L 1397.5 119.5 L 1379.5 119.5 Z M 1329.5 101.5 L 1346.5 101.5 L 1346.5 119.5 L 1329.5 119.5 Z M 1278.5 101.5 L 1296.5 101.5 L 1296.5 119.5 L 1278.5 119.5 Z M 1228.5 101.5 L 1246.5 101.5 L 1246.5 119.5 L 1228.5 119.5 Z M 1178.5 101.5 L 1196.5 101.5 L 1196.5 119.5 L 1178.5 119.5 Z M 1128.5 101.5 L 1145.5 101.5 L 1145.5 119.5 L 1128.5 119.5 Z M 1077.5 101.5 L 1095.5 101.5 L 1095.5 119.5 L 1077.5 119.5 Z M 1027.5 101.5 L 1045.5 101.5 L 1045.5 119.5 L 1027.5 119.5 Z M 977.5 101.5 L 995.5 101.5 L 995.5 119.5 L 977.5 119.5 Z M 927.5 101.5 L 945.5 101.5 L 945.5 119.5 L 927.5 119.5 Z M 877.5 101.5 L 894.5 101.5 L 894.5 119.5 L 877.5 119.5 Z M 826.5 101.5 L 844.5 101.5 L 844.5 119.5 L 826.5 119.5 Z M 776.5 101.5 L 794.5 101.5 L 794.5 119.5 L 776.5 119.5 Z M 726.5 101.5 L 744.5 101.5 L 744.5 119.5 L 726.5 119.5 Z M 676.5 101.5 L 693.5 101.5 L 693.5 119.5 L 676.5 119.5 Z M 625.5 101.5 L 643.5 101.5 L 643.5 119.5 L 625.5 119.5 Z M 575.5 101.5 L 593.5 101.5 L 593.5 119.5 L 575.5 119.5 Z M 525.5 101.5 L 543.5 101.5 L 543.5 119.5 L 525.5 119.5 Z M 475.5 101.5 L 492.5 101.5 L 492.5 119.5 L 475.5 119.5 Z M 577.5 155.5 L 595.5 155.5 L 595.5 173.5 L 577.5 173.5 Z M 1413.5 155.5 L 1431.5 155.5 L 1431.5 173.5 L 1413.5 173.5 Z M 1375.5 155.5 L 1393.5 155.5 L 1393.5 173.5 L 1375.5 173.5 Z M 941.5 155.5 L 959.5 155.5 L 959.5 173.5 L 941.5 173.5 Z M 904.5 155.5 L 922.5 155.5 L 922.5 173.5 L 904.5 173.5 Z M 778.5 155.5 L 796.5 155.5 L 796.5 173.5 L 778.5 173.5 Z M 740.5 155.5 L 758.5 155.5 L 758.5 173.5 L 740.5 173.5 Z M 615.5 155.5 L 633.5 155.5 L 633.5 173.5 L 615.5 173.5 Z M 1261.5 474.5 L 1278.5 474.5 L 1278.5 486.5 L 1261.5 486.5 Z M 1375.5 474.5 L 1393.5 474.5 L 1393.5 492.5 L 1375.5 492.5 Z M 1223.5 474.5 L 1241.5 474.5 L 1241.5 492.5 L 1223.5 492.5 Z M 1413.5 474.5 L 1431.5 474.5 L 1431.5 492.5 L 1413.5 492.5 Z M 1261.5 486.5 L 1278.5 486.5 L 1278.5 492.5 L 1261.5 492.5 Z M 1429.5 527.5 L 1447.5 527.5 L 1447.5 545.5 L 1429.5 545.5 Z M 1479.5 527.5 L 1497.5 527.5 L 1497.5 545.5 L 1479.5 545.5 Z M 1329.5 527.5 L 1346.5 527.5 L 1346.5 545.5 L 1329.5 545.5 Z M 1278.5 527.5 L 1296.5 527.5 L 1296.5 545.5 L 1278.5 545.5 Z M 1228.5 527.5 L 1246.5 527.5 L 1246.5 545.5 L 1228.5 545.5 Z M 424.5 527.5 L 442.5 527.5 L 442.5 545.5 L 424.5 545.5 Z M 1379.5 527.5 L 1397.5 527.5 L 1397.5 545.5 L 1379.5 545.5 Z M 1249.5 581.5 L 1267.5 581.5 L 1267.5 598.5 L 1249.5 598.5 Z M 1287.5 581.5 L 1304.5 581.5 L 1304.5 598.5 L 1287.5 598.5 Z M 811.5 619.5 L 828.5 619.5 L 828.5 637.5 L 811.5 637.5 Z M 773.5 625.5 L 791.5 625.5 L 791.5 643.5 L 773.5 643.5 Z M 1304.5 900.5 L 1322.5 900.5 L 1322.5 918.5 L 1304.5 918.5 Z M 773.5 900.5 L 791.5 900.5 L 791.5 918.5 L 773.5 918.5 Z M 940.5 900.5 L 958.5 900.5 L 958.5 918.5 L 940.5 918.5 Z M 1266.5 900.5 L 1284.5 900.5 L 1284.5 918.5 L 1266.5 918.5 Z M 1103.5 900.5 L 1121.5 900.5 L 1121.5 918.5 L 1103.5 918.5 Z M 977.5 900.5 L 995.5 900.5 L 995.5 918.5 L 977.5 918.5 Z M 1141.5 900.5 L 1159.5 900.5 L 1159.5 918.5 L 1141.5 918.5 Z M 735.5 906.5 L 753.5 906.5 L 753.5 924.5 L 735.5 924.5 Z M 811.5 906.5 L 828.5 906.5 L 828.5 924.5 L 811.5 924.5 Z M 424.5 953.5 L 442.5 953.5 L 442.5 971.5 L 424.5 971.5 Z M 1479.5 953.5 L 1497.5 953.5 L 1497.5 971.5 L 1479.5 971.5 Z M 1429.5 953.5 L 1447.5 953.5 L 1447.5 971.5 L 1429.5 971.5 Z M 1379.5 953.5 L 1397.5 953.5 L 1397.5 971.5 L 1379.5 971.5 Z M 1329.5 953.5 L 1346.5 953.5 L 1346.5 971.5 L 1329.5 971.5 Z M 1278.5 953.5 L 1296.5 953.5 L 1296.5 971.5 L 1278.5 971.5 Z M 1228.5 953.5 L 1246.5 953.5 L 1246.5 971.5 L 1228.5 971.5 Z M 1178.5 953.5 L 1196.5 953.5 L 1196.5 971.5 L 1178.5 971.5 Z M 1128.5 953.5 L 1145.5 953.5 L 1145.5 971.5 L 1128.5 971.5 Z M 1077.5 953.5 L 1095.5 953.5 L 1095.5 971.5 L 1077.5 971.5 Z M 1027.5 953.5 L 1045.5 953.5 L 1045.5 971.5 L 1027.5 971.5 Z M 977.5 953.5 L 995.5 953.5 L 995.5 971.5 L 977.5 971.5 Z M 927.5 953.5 L 945.5 953.5 L 945.5 971.5 L 927.5 971.5 Z M 877.5 953.5 L 894.5 953.5 L 894.5 971.5 L 877.5 971.5 Z M 826.5 953.5 L 844.5 953.5 L 844.5 971.5 L 826.5 971.5 Z M 776.5 953.5 L 794.5 953.5 L 794.5 971.5 L 776.5 971.5 Z M 726.5 953.5 L 744.5 953.5 L 744.5 971.5 L 726.5 971.5 Z M 676.5 953.5 L 693.5 953.5 L 693.5 971.5 L 676.5 971.5 Z M 625.5 953.5 L 643.5 953.5 L 643.5 971.5 L 625.5 971.5 Z M 575.5 953.5 L 593.5 953.5 L 593.5 971.5 L 575.5 971.5 Z M 525.5 953.5 L 543.5 953.5 L 543.5 971.5 L 525.5 971.5 Z M 475.5 953.5 L 492.5 953.5 L 492.5 971.5 L 475.5 971.5 Z M 475.5 953.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface360">
+<g id="surface390">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -222,6 +222,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1490.566406 245.960938 L 1498.523438 257.5 L 1494.976562 257.5 L 1488.835938 248.121094 L 1482.664062 257.5 L 1479.179688 257.5 L 1487.140625 245.960938 L 1479.671875 235.007812 L 1483.160156 235.007812 L 1488.929688 243.832031 L 1494.730469 235.007812 L 1498.15625 235.007812 Z M 1490.566406 245.960938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1479 842 L 1497 842 M 1479 824 L 1497 824 M 1479 824 L 1479 842 M 1497 824 L 1497 842 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1479 842 L 1497 842 M 1479 824 L 1497 824 M 1497 842 L 1497 824 M 1479 842 L 1479 824 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 408 112 L 408 121 M 403 117 L 412 117 M 407 118 L 409 118 M 407 116 L 409 116 M 407 116 L 407 118 M 409 116 L 409 118 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.svg b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.svg
index c3c2715..69c1540 100644
--- a/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.svg
+++ b/cells/lsbuflv2hv_clkiso_hlkg/sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 399.5 L 226.5 399.5 L 226.5 430.5 L 174.5 430.5 Z M 174.5 430.5 L 1150.5 430.5 L 1150.5 657.5 L 174.5 657.5 Z M 1274.5 409.5 L 1541.5 409.5 L 1541.5 660.5 L 1274.5 660.5 Z M 174.5 657.5 L 226.5 657.5 L 226.5 670.5 L 174.5 670.5 Z M 779.5 657.5 L 1150.5 657.5 L 1150.5 681.5 L 779.5 681.5 Z M 779.5 657.5 "/>
 </clipPath>
-<image id="image771" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image806" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image771"/>
+  <use xlink:href="#image806"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 358.5 339.5 L 414.5 339.5 L 414.5 401.5 L 358.5 401.5 Z M 871.5 339.5 L 927.5 339.5 L 927.5 401.5 L 871.5 401.5 Z M 798.5 339.5 L 854.5 339.5 L 854.5 401.5 L 798.5 401.5 Z M 724.5 339.5 L 780.5 339.5 L 780.5 401.5 L 724.5 401.5 Z M 651.5 339.5 L 707.5 339.5 L 707.5 401.5 L 651.5 401.5 Z M 578.5 339.5 L 634.5 339.5 L 634.5 401.5 L 578.5 401.5 Z M 505.5 339.5 L 561.5 339.5 L 561.5 401.5 L 505.5 401.5 Z M 432.5 339.5 L 487.5 339.5 L 487.5 401.5 L 432.5 401.5 Z M 217.5 466.5 L 227.5 466.5 L 227.5 479.5 L 217.5 479.5 Z M 217.5 479.5 L 227.5 479.5 L 227.5 490.5 L 217.5 490.5 Z M 217.5 490.5 L 227.5 490.5 L 227.5 529.5 L 217.5 529.5 Z M 1299.5 529.5 L 1351.5 529.5 L 1351.5 540.5 L 1299.5 540.5 Z M 761.5 529.5 L 810.5 529.5 L 810.5 540.5 L 761.5 540.5 Z M 195.5 529.5 L 237.5 529.5 L 237.5 540.5 L 195.5 540.5 Z M 195.5 529.5 "/>
 </clipPath>
-<image id="image772" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image807" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image772"/>
+  <use xlink:href="#image807"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 342.5 339.5 L 943.5 339.5 L 943.5 345.5 L 342.5 345.5 Z M 342.5 345.5 L 943.5 345.5 L 943.5 355.5 L 342.5 355.5 Z M 342.5 355.5 L 943.5 355.5 L 943.5 366.5 L 342.5 366.5 Z M 1055.5 355.5 L 1119.5 355.5 L 1119.5 366.5 L 1055.5 366.5 Z M 342.5 366.5 L 943.5 366.5 L 943.5 377.5 L 342.5 377.5 Z M 1055.5 366.5 L 1119.5 366.5 L 1119.5 377.5 L 1055.5 377.5 Z M 342.5 377.5 L 943.5 377.5 L 943.5 387.5 L 342.5 387.5 Z M 1055.5 377.5 L 1119.5 377.5 L 1119.5 387.5 L 1055.5 387.5 Z M 973.5 375.5 L 1037.5 375.5 L 1037.5 387.5 L 973.5 387.5 Z M 259.5 375.5 L 323.5 375.5 L 323.5 387.5 L 259.5 387.5 Z M 1055.5 387.5 L 1119.5 387.5 L 1119.5 398.5 L 1055.5 398.5 Z M 342.5 387.5 L 943.5 387.5 L 943.5 398.5 L 342.5 398.5 Z M 259.5 387.5 L 323.5 387.5 L 323.5 398.5 L 259.5 398.5 Z M 973.5 387.5 L 1037.5 387.5 L 1037.5 398.5 L 973.5 398.5 Z M 1055.5 398.5 L 1119.5 398.5 L 1119.5 401.5 L 1055.5 401.5 Z M 342.5 398.5 L 943.5 398.5 L 943.5 401.5 L 342.5 401.5 Z M 259.5 398.5 L 323.5 398.5 L 323.5 401.5 L 259.5 401.5 Z M 973.5 398.5 L 1037.5 398.5 L 1037.5 401.5 L 973.5 401.5 Z M 217.5 466.5 L 227.5 466.5 L 227.5 479.5 L 217.5 479.5 Z M 217.5 479.5 L 227.5 479.5 L 227.5 490.5 L 217.5 490.5 Z M 217.5 490.5 L 227.5 490.5 L 227.5 529.5 L 217.5 529.5 Z M 761.5 529.5 L 810.5 529.5 L 810.5 540.5 L 761.5 540.5 Z M 195.5 529.5 L 237.5 529.5 L 237.5 540.5 L 195.5 540.5 Z M 439.5 684.5 L 551.5 684.5 L 551.5 689.5 L 439.5 689.5 Z M 259.5 684.5 L 420.5 684.5 L 420.5 689.5 L 259.5 689.5 Z M 259.5 689.5 L 420.5 689.5 L 420.5 700.5 L 259.5 700.5 Z M 439.5 689.5 L 551.5 689.5 L 551.5 700.5 L 439.5 700.5 Z M 439.5 700.5 L 551.5 700.5 L 551.5 710.5 L 439.5 710.5 Z M 259.5 700.5 L 420.5 700.5 L 420.5 710.5 L 259.5 710.5 Z M 439.5 710.5 L 551.5 710.5 L 551.5 721.5 L 439.5 721.5 Z M 259.5 710.5 L 420.5 710.5 L 420.5 721.5 L 259.5 721.5 Z M 439.5 721.5 L 551.5 721.5 L 551.5 732.5 L 439.5 732.5 Z M 259.5 721.5 L 420.5 721.5 L 420.5 732.5 L 259.5 732.5 Z M 259.5 732.5 L 420.5 732.5 L 420.5 742.5 L 259.5 742.5 Z M 439.5 732.5 L 551.5 732.5 L 551.5 742.5 L 439.5 742.5 Z M 259.5 742.5 L 420.5 742.5 L 420.5 746.5 L 259.5 746.5 Z M 439.5 742.5 L 551.5 742.5 L 551.5 746.5 L 439.5 746.5 Z M 439.5 742.5 "/>
 </clipPath>
-<image id="image773" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image808" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image773"/>
+  <use xlink:href="#image808"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 195.5 277.5 L 1743.5 277.5 L 1743.5 287.5 L 195.5 287.5 Z M 195.5 782.5 L 1743.5 782.5 L 1743.5 792.5 L 195.5 792.5 Z M 195.5 782.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image772"/>
+  <use xlink:href="#image807"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 195.5 277.5 L 1743.5 277.5 L 1743.5 287.5 L 195.5 287.5 Z M 404.5 450.5 L 420.5 450.5 L 420.5 475.5 L 404.5 475.5 Z M 355.5 450.5 L 373.5 450.5 L 373.5 475.5 L 355.5 475.5 Z M 259.5 450.5 L 276.5 450.5 L 276.5 475.5 L 259.5 475.5 Z M 307.5 450.5 L 324.5 450.5 L 324.5 475.5 L 307.5 475.5 Z M 259.5 475.5 L 276.5 475.5 L 276.5 485.5 L 259.5 485.5 Z M 355.5 475.5 L 373.5 475.5 L 373.5 485.5 L 355.5 485.5 Z M 307.5 475.5 L 324.5 475.5 L 324.5 485.5 L 307.5 485.5 Z M 404.5 475.5 L 420.5 475.5 L 420.5 485.5 L 404.5 485.5 Z M 1103.5 475.5 L 1119.5 475.5 L 1119.5 486.5 L 1103.5 486.5 Z M 1055.5 475.5 L 1072.5 475.5 L 1072.5 486.5 L 1055.5 486.5 Z M 355.5 485.5 L 373.5 485.5 L 373.5 496.5 L 355.5 496.5 Z M 307.5 485.5 L 324.5 485.5 L 324.5 496.5 L 307.5 496.5 Z M 404.5 485.5 L 420.5 485.5 L 420.5 496.5 L 404.5 496.5 Z M 259.5 485.5 L 276.5 485.5 L 276.5 496.5 L 259.5 496.5 Z M 1055.5 486.5 L 1072.5 486.5 L 1072.5 496.5 L 1055.5 496.5 Z M 1103.5 486.5 L 1119.5 486.5 L 1119.5 496.5 L 1103.5 496.5 Z M 875.5 475.5 L 892.5 475.5 L 892.5 499.5 L 875.5 499.5 Z M 827.5 475.5 L 844.5 475.5 L 844.5 499.5 L 827.5 499.5 Z M 923.5 475.5 L 940.5 475.5 L 940.5 499.5 L 923.5 499.5 Z M 971.5 475.5 L 989.5 475.5 L 989.5 499.5 L 971.5 499.5 Z M 1020.5 475.5 L 1036.5 475.5 L 1036.5 499.5 L 1020.5 499.5 Z M 404.5 496.5 L 420.5 496.5 L 420.5 506.5 L 404.5 506.5 Z M 259.5 496.5 L 276.5 496.5 L 276.5 506.5 L 259.5 506.5 Z M 307.5 496.5 L 324.5 496.5 L 324.5 506.5 L 307.5 506.5 Z M 355.5 496.5 L 373.5 496.5 L 373.5 506.5 L 355.5 506.5 Z M 1103.5 496.5 L 1119.5 496.5 L 1119.5 507.5 L 1103.5 507.5 Z M 1055.5 496.5 L 1072.5 496.5 L 1072.5 507.5 L 1055.5 507.5 Z M 923.5 499.5 L 940.5 499.5 L 940.5 509.5 L 923.5 509.5 Z M 827.5 499.5 L 844.5 499.5 L 844.5 509.5 L 827.5 509.5 Z M 1020.5 499.5 L 1036.5 499.5 L 1036.5 509.5 L 1020.5 509.5 Z M 875.5 499.5 L 892.5 499.5 L 892.5 509.5 L 875.5 509.5 Z M 971.5 499.5 L 989.5 499.5 L 989.5 509.5 L 971.5 509.5 Z M 1103.5 507.5 L 1119.5 507.5 L 1119.5 517.5 L 1103.5 517.5 Z M 1055.5 507.5 L 1072.5 507.5 L 1072.5 517.5 L 1055.5 517.5 Z M 404.5 506.5 L 420.5 506.5 L 420.5 517.5 L 404.5 517.5 Z M 355.5 506.5 L 373.5 506.5 L 373.5 517.5 L 355.5 517.5 Z M 307.5 506.5 L 324.5 506.5 L 324.5 517.5 L 307.5 517.5 Z M 259.5 506.5 L 276.5 506.5 L 276.5 517.5 L 259.5 517.5 Z M 827.5 509.5 L 844.5 509.5 L 844.5 520.5 L 827.5 520.5 Z M 971.5 509.5 L 989.5 509.5 L 989.5 520.5 L 971.5 520.5 Z M 923.5 509.5 L 940.5 509.5 L 940.5 520.5 L 923.5 520.5 Z M 1020.5 509.5 L 1036.5 509.5 L 1036.5 520.5 L 1020.5 520.5 Z M 875.5 509.5 L 892.5 509.5 L 892.5 520.5 L 875.5 520.5 Z M 1103.5 517.5 L 1119.5 517.5 L 1119.5 521.5 L 1103.5 521.5 Z M 1055.5 517.5 L 1072.5 517.5 L 1072.5 521.5 L 1055.5 521.5 Z M 259.5 517.5 L 276.5 517.5 L 276.5 527.5 L 259.5 527.5 Z M 404.5 517.5 L 420.5 517.5 L 420.5 527.5 L 404.5 527.5 Z M 307.5 517.5 L 324.5 517.5 L 324.5 527.5 L 307.5 527.5 Z M 355.5 517.5 L 373.5 517.5 L 373.5 527.5 L 355.5 527.5 Z M 971.5 520.5 L 989.5 520.5 L 989.5 530.5 L 971.5 530.5 Z M 827.5 520.5 L 844.5 520.5 L 844.5 530.5 L 827.5 530.5 Z M 923.5 520.5 L 940.5 520.5 L 940.5 530.5 L 923.5 530.5 Z M 875.5 520.5 L 892.5 520.5 L 892.5 530.5 L 875.5 530.5 Z M 1020.5 520.5 L 1036.5 520.5 L 1036.5 530.5 L 1020.5 530.5 Z M 632.5 517.5 L 649.5 517.5 L 649.5 532.5 L 632.5 532.5 Z M 585.5 517.5 L 601.5 517.5 L 601.5 532.5 L 585.5 532.5 Z M 680.5 517.5 L 697.5 517.5 L 697.5 532.5 L 680.5 532.5 Z M 355.5 527.5 L 373.5 527.5 L 373.5 538.5 L 355.5 538.5 Z M 259.5 527.5 L 276.5 527.5 L 276.5 538.5 L 259.5 538.5 Z M 307.5 527.5 L 324.5 527.5 L 324.5 538.5 L 307.5 538.5 Z M 404.5 527.5 L 420.5 527.5 L 420.5 538.5 L 404.5 538.5 Z M 1020.5 530.5 L 1036.5 530.5 L 1036.5 541.5 L 1020.5 541.5 Z M 971.5 530.5 L 989.5 530.5 L 989.5 541.5 L 971.5 541.5 Z M 827.5 530.5 L 844.5 530.5 L 844.5 541.5 L 827.5 541.5 Z M 923.5 530.5 L 940.5 530.5 L 940.5 541.5 L 923.5 541.5 Z M 875.5 530.5 L 892.5 530.5 L 892.5 541.5 L 875.5 541.5 Z M 585.5 532.5 L 601.5 532.5 L 601.5 543.5 L 585.5 543.5 Z M 632.5 532.5 L 649.5 532.5 L 649.5 543.5 L 632.5 543.5 Z M 680.5 532.5 L 697.5 532.5 L 697.5 543.5 L 680.5 543.5 Z M 307.5 538.5 L 324.5 538.5 L 324.5 548.5 L 307.5 548.5 Z M 404.5 538.5 L 420.5 538.5 L 420.5 548.5 L 404.5 548.5 Z M 259.5 538.5 L 276.5 538.5 L 276.5 548.5 L 259.5 548.5 Z M 355.5 538.5 L 373.5 538.5 L 373.5 548.5 L 355.5 548.5 Z M 875.5 541.5 L 892.5 541.5 L 892.5 552.5 L 875.5 552.5 Z M 971.5 541.5 L 989.5 541.5 L 989.5 552.5 L 971.5 552.5 Z M 827.5 541.5 L 844.5 541.5 L 844.5 552.5 L 827.5 552.5 Z M 923.5 541.5 L 940.5 541.5 L 940.5 552.5 L 923.5 552.5 Z M 1020.5 541.5 L 1036.5 541.5 L 1036.5 552.5 L 1020.5 552.5 Z M 680.5 543.5 L 697.5 543.5 L 697.5 553.5 L 680.5 553.5 Z M 585.5 543.5 L 601.5 543.5 L 601.5 553.5 L 585.5 553.5 Z M 632.5 543.5 L 649.5 543.5 L 649.5 553.5 L 632.5 553.5 Z M 486.5 543.5 L 504.5 543.5 L 504.5 559.5 L 486.5 559.5 Z M 355.5 548.5 L 373.5 548.5 L 373.5 559.5 L 355.5 559.5 Z M 404.5 548.5 L 420.5 548.5 L 420.5 559.5 L 404.5 559.5 Z M 307.5 548.5 L 324.5 548.5 L 324.5 559.5 L 307.5 559.5 Z M 535.5 543.5 L 551.5 543.5 L 551.5 559.5 L 535.5 559.5 Z M 259.5 548.5 L 276.5 548.5 L 276.5 559.5 L 259.5 559.5 Z M 439.5 543.5 L 455.5 543.5 L 455.5 559.5 L 439.5 559.5 Z M 971.5 552.5 L 989.5 552.5 L 989.5 562.5 L 971.5 562.5 Z M 875.5 552.5 L 892.5 552.5 L 892.5 562.5 L 875.5 562.5 Z M 827.5 552.5 L 844.5 552.5 L 844.5 562.5 L 827.5 562.5 Z M 1020.5 552.5 L 1036.5 552.5 L 1036.5 562.5 L 1020.5 562.5 Z M 923.5 552.5 L 940.5 552.5 L 940.5 562.5 L 923.5 562.5 Z M 585.5 553.5 L 601.5 553.5 L 601.5 564.5 L 585.5 564.5 Z M 680.5 553.5 L 697.5 553.5 L 697.5 564.5 L 680.5 564.5 Z M 632.5 553.5 L 649.5 553.5 L 649.5 564.5 L 632.5 564.5 Z M 355.5 559.5 L 373.5 559.5 L 373.5 570.5 L 355.5 570.5 Z M 404.5 559.5 L 420.5 559.5 L 420.5 570.5 L 404.5 570.5 Z M 259.5 559.5 L 276.5 559.5 L 276.5 570.5 L 259.5 570.5 Z M 535.5 559.5 L 551.5 559.5 L 551.5 570.5 L 535.5 570.5 Z M 486.5 559.5 L 504.5 559.5 L 504.5 570.5 L 486.5 570.5 Z M 439.5 559.5 L 455.5 559.5 L 455.5 570.5 L 439.5 570.5 Z M 307.5 559.5 L 324.5 559.5 L 324.5 570.5 L 307.5 570.5 Z M 971.5 562.5 L 989.5 562.5 L 989.5 573.5 L 971.5 573.5 Z M 827.5 562.5 L 844.5 562.5 L 844.5 573.5 L 827.5 573.5 Z M 1020.5 562.5 L 1036.5 562.5 L 1036.5 573.5 L 1020.5 573.5 Z M 923.5 562.5 L 940.5 562.5 L 940.5 573.5 L 923.5 573.5 Z M 875.5 562.5 L 892.5 562.5 L 892.5 573.5 L 875.5 573.5 Z M 680.5 564.5 L 697.5 564.5 L 697.5 575.5 L 680.5 575.5 Z M 585.5 564.5 L 601.5 564.5 L 601.5 575.5 L 585.5 575.5 Z M 632.5 564.5 L 649.5 564.5 L 649.5 575.5 L 632.5 575.5 Z M 259.5 570.5 L 276.5 570.5 L 276.5 580.5 L 259.5 580.5 Z M 355.5 570.5 L 373.5 570.5 L 373.5 580.5 L 355.5 580.5 Z M 486.5 570.5 L 504.5 570.5 L 504.5 580.5 L 486.5 580.5 Z M 439.5 570.5 L 455.5 570.5 L 455.5 580.5 L 439.5 580.5 Z M 535.5 570.5 L 551.5 570.5 L 551.5 580.5 L 535.5 580.5 Z M 307.5 570.5 L 324.5 570.5 L 324.5 580.5 L 307.5 580.5 Z M 404.5 570.5 L 420.5 570.5 L 420.5 580.5 L 404.5 580.5 Z M 971.5 573.5 L 989.5 573.5 L 989.5 583.5 L 971.5 583.5 Z M 827.5 573.5 L 844.5 573.5 L 844.5 583.5 L 827.5 583.5 Z M 923.5 573.5 L 940.5 573.5 L 940.5 583.5 L 923.5 583.5 Z M 1020.5 573.5 L 1036.5 573.5 L 1036.5 583.5 L 1020.5 583.5 Z M 875.5 573.5 L 892.5 573.5 L 892.5 583.5 L 875.5 583.5 Z M 585.5 575.5 L 601.5 575.5 L 601.5 585.5 L 585.5 585.5 Z M 680.5 575.5 L 697.5 575.5 L 697.5 585.5 L 680.5 585.5 Z M 632.5 575.5 L 649.5 575.5 L 649.5 585.5 L 632.5 585.5 Z M 404.5 580.5 L 420.5 580.5 L 420.5 591.5 L 404.5 591.5 Z M 355.5 580.5 L 373.5 580.5 L 373.5 591.5 L 355.5 591.5 Z M 259.5 580.5 L 276.5 580.5 L 276.5 591.5 L 259.5 591.5 Z M 535.5 580.5 L 551.5 580.5 L 551.5 591.5 L 535.5 591.5 Z M 486.5 580.5 L 504.5 580.5 L 504.5 591.5 L 486.5 591.5 Z M 439.5 580.5 L 455.5 580.5 L 455.5 591.5 L 439.5 591.5 Z M 307.5 580.5 L 324.5 580.5 L 324.5 591.5 L 307.5 591.5 Z M 827.5 583.5 L 844.5 583.5 L 844.5 594.5 L 827.5 594.5 Z M 1020.5 583.5 L 1036.5 583.5 L 1036.5 594.5 L 1020.5 594.5 Z M 923.5 583.5 L 940.5 583.5 L 940.5 594.5 L 923.5 594.5 Z M 971.5 583.5 L 989.5 583.5 L 989.5 594.5 L 971.5 594.5 Z M 875.5 583.5 L 892.5 583.5 L 892.5 594.5 L 875.5 594.5 Z M 632.5 585.5 L 649.5 585.5 L 649.5 596.5 L 632.5 596.5 Z M 680.5 585.5 L 697.5 585.5 L 697.5 596.5 L 680.5 596.5 Z M 585.5 585.5 L 601.5 585.5 L 601.5 596.5 L 585.5 596.5 Z M 439.5 591.5 L 455.5 591.5 L 455.5 601.5 L 439.5 601.5 Z M 486.5 591.5 L 504.5 591.5 L 504.5 601.5 L 486.5 601.5 Z M 535.5 591.5 L 551.5 591.5 L 551.5 601.5 L 535.5 601.5 Z M 259.5 591.5 L 276.5 591.5 L 276.5 601.5 L 259.5 601.5 Z M 404.5 591.5 L 420.5 591.5 L 420.5 601.5 L 404.5 601.5 Z M 307.5 591.5 L 324.5 591.5 L 324.5 601.5 L 307.5 601.5 Z M 355.5 591.5 L 373.5 591.5 L 373.5 601.5 L 355.5 601.5 Z M 827.5 594.5 L 844.5 594.5 L 844.5 604.5 L 827.5 604.5 Z M 971.5 594.5 L 989.5 594.5 L 989.5 604.5 L 971.5 604.5 Z M 923.5 594.5 L 940.5 594.5 L 940.5 604.5 L 923.5 604.5 Z M 1020.5 594.5 L 1036.5 594.5 L 1036.5 604.5 L 1020.5 604.5 Z M 875.5 594.5 L 892.5 594.5 L 892.5 604.5 L 875.5 604.5 Z M 680.5 596.5 L 697.5 596.5 L 697.5 606.5 L 680.5 606.5 Z M 585.5 596.5 L 601.5 596.5 L 601.5 606.5 L 585.5 606.5 Z M 632.5 596.5 L 649.5 596.5 L 649.5 606.5 L 632.5 606.5 Z M 632.5 606.5 L 649.5 606.5 L 649.5 610.5 L 632.5 610.5 Z M 680.5 606.5 L 697.5 606.5 L 697.5 610.5 L 680.5 610.5 Z M 585.5 606.5 L 601.5 606.5 L 601.5 610.5 L 585.5 610.5 Z M 355.5 601.5 L 373.5 601.5 L 373.5 612.5 L 355.5 612.5 Z M 404.5 601.5 L 420.5 601.5 L 420.5 612.5 L 404.5 612.5 Z M 259.5 601.5 L 276.5 601.5 L 276.5 612.5 L 259.5 612.5 Z M 535.5 601.5 L 551.5 601.5 L 551.5 612.5 L 535.5 612.5 Z M 439.5 601.5 L 455.5 601.5 L 455.5 612.5 L 439.5 612.5 Z M 486.5 601.5 L 504.5 601.5 L 504.5 612.5 L 486.5 612.5 Z M 307.5 601.5 L 324.5 601.5 L 324.5 612.5 L 307.5 612.5 Z M 971.5 604.5 L 989.5 604.5 L 989.5 615.5 L 971.5 615.5 Z M 827.5 604.5 L 844.5 604.5 L 844.5 615.5 L 827.5 615.5 Z M 923.5 604.5 L 940.5 604.5 L 940.5 615.5 L 923.5 615.5 Z M 1020.5 604.5 L 1036.5 604.5 L 1036.5 615.5 L 1020.5 615.5 Z M 875.5 604.5 L 892.5 604.5 L 892.5 615.5 L 875.5 615.5 Z M 355.5 612.5 L 373.5 612.5 L 373.5 622.5 L 355.5 622.5 Z M 404.5 612.5 L 420.5 612.5 L 420.5 622.5 L 404.5 622.5 Z M 486.5 612.5 L 504.5 612.5 L 504.5 622.5 L 486.5 622.5 Z M 535.5 612.5 L 551.5 612.5 L 551.5 622.5 L 535.5 622.5 Z M 439.5 612.5 L 455.5 612.5 L 455.5 622.5 L 439.5 622.5 Z M 307.5 612.5 L 324.5 612.5 L 324.5 622.5 L 307.5 622.5 Z M 259.5 612.5 L 276.5 612.5 L 276.5 622.5 L 259.5 622.5 Z M 875.5 615.5 L 892.5 615.5 L 892.5 625.5 L 875.5 625.5 Z M 1020.5 615.5 L 1036.5 615.5 L 1036.5 625.5 L 1020.5 625.5 Z M 971.5 615.5 L 989.5 615.5 L 989.5 625.5 L 971.5 625.5 Z M 923.5 615.5 L 940.5 615.5 L 940.5 625.5 L 923.5 625.5 Z M 827.5 615.5 L 844.5 615.5 L 844.5 625.5 L 827.5 625.5 Z M 355.5 622.5 L 373.5 622.5 L 373.5 633.5 L 355.5 633.5 Z M 486.5 622.5 L 504.5 622.5 L 504.5 633.5 L 486.5 633.5 Z M 439.5 622.5 L 455.5 622.5 L 455.5 633.5 L 439.5 633.5 Z M 259.5 622.5 L 276.5 622.5 L 276.5 633.5 L 259.5 633.5 Z M 307.5 622.5 L 324.5 622.5 L 324.5 633.5 L 307.5 633.5 Z M 404.5 622.5 L 420.5 622.5 L 420.5 633.5 L 404.5 633.5 Z M 535.5 622.5 L 551.5 622.5 L 551.5 633.5 L 535.5 633.5 Z M 827.5 625.5 L 844.5 625.5 L 844.5 636.5 L 827.5 636.5 Z M 971.5 625.5 L 989.5 625.5 L 989.5 636.5 L 971.5 636.5 Z M 923.5 625.5 L 940.5 625.5 L 940.5 636.5 L 923.5 636.5 Z M 875.5 625.5 L 892.5 625.5 L 892.5 636.5 L 875.5 636.5 Z M 1020.5 625.5 L 1036.5 625.5 L 1036.5 636.5 L 1020.5 636.5 Z M 259.5 633.5 L 276.5 633.5 L 276.5 637.5 L 259.5 637.5 Z M 355.5 633.5 L 373.5 633.5 L 373.5 637.5 L 355.5 637.5 Z M 535.5 633.5 L 551.5 633.5 L 551.5 637.5 L 535.5 637.5 Z M 486.5 633.5 L 504.5 633.5 L 504.5 637.5 L 486.5 637.5 Z M 307.5 633.5 L 324.5 633.5 L 324.5 637.5 L 307.5 637.5 Z M 439.5 633.5 L 455.5 633.5 L 455.5 637.5 L 439.5 637.5 Z M 404.5 633.5 L 420.5 633.5 L 420.5 637.5 L 404.5 637.5 Z M 827.5 636.5 L 844.5 636.5 L 844.5 646.5 L 827.5 646.5 Z M 971.5 636.5 L 989.5 636.5 L 989.5 646.5 L 971.5 646.5 Z M 1020.5 636.5 L 1036.5 636.5 L 1036.5 646.5 L 1020.5 646.5 Z M 923.5 636.5 L 940.5 636.5 L 940.5 646.5 L 923.5 646.5 Z M 875.5 636.5 L 892.5 636.5 L 892.5 646.5 L 875.5 646.5 Z M 827.5 646.5 L 844.5 646.5 L 844.5 657.5 L 827.5 657.5 Z M 1020.5 646.5 L 1036.5 646.5 L 1036.5 657.5 L 1020.5 657.5 Z M 923.5 646.5 L 940.5 646.5 L 940.5 657.5 L 923.5 657.5 Z M 971.5 646.5 L 989.5 646.5 L 989.5 657.5 L 971.5 657.5 Z M 875.5 646.5 L 892.5 646.5 L 892.5 657.5 L 875.5 657.5 Z M 875.5 657.5 L 892.5 657.5 L 892.5 661.5 L 875.5 661.5 Z M 1020.5 657.5 L 1036.5 657.5 L 1036.5 661.5 L 1020.5 661.5 Z M 923.5 657.5 L 940.5 657.5 L 940.5 661.5 L 923.5 661.5 Z M 827.5 657.5 L 844.5 657.5 L 844.5 661.5 L 827.5 661.5 Z M 971.5 657.5 L 989.5 657.5 L 989.5 661.5 L 971.5 661.5 Z M 195.5 782.5 L 1743.5 782.5 L 1743.5 792.5 L 195.5 792.5 Z M 195.5 782.5 "/>
 </clipPath>
-<image id="image774" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image809" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image774"/>
+  <use xlink:href="#image809"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -68,9 +68,9 @@
 <clipPath id="clip11">
   <path d="M 1493.5 329.5 L 1502.5 329.5 L 1502.5 375.5 L 1493.5 375.5 Z M 1466.5 329.5 L 1475.5 329.5 L 1475.5 375.5 L 1466.5 375.5 Z M 1317.5 329.5 L 1326.5 329.5 L 1326.5 375.5 L 1317.5 375.5 Z M 1343.5 329.5 L 1353.5 329.5 L 1353.5 375.5 L 1343.5 375.5 Z M 1373.5 329.5 L 1383.5 329.5 L 1383.5 375.5 L 1373.5 375.5 Z M 1402.5 329.5 L 1412.5 329.5 L 1412.5 375.5 L 1402.5 375.5 Z M 276.5 375.5 L 307.5 375.5 L 307.5 401.5 L 276.5 401.5 Z M 989.5 375.5 L 1020.5 375.5 L 1020.5 401.5 L 989.5 401.5 Z M 1072.5 355.5 L 1103.5 355.5 L 1103.5 401.5 L 1072.5 401.5 Z M 1319.5 694.5 L 1328.5 694.5 L 1328.5 740.5 L 1319.5 740.5 Z M 1378.5 694.5 L 1387.5 694.5 L 1387.5 740.5 L 1378.5 740.5 Z M 1404.5 694.5 L 1414.5 694.5 L 1414.5 740.5 L 1404.5 740.5 Z M 1348.5 694.5 L 1357.5 694.5 L 1357.5 740.5 L 1348.5 740.5 Z M 373.5 684.5 L 404.5 684.5 L 404.5 746.5 L 373.5 746.5 Z M 504.5 684.5 L 535.5 684.5 L 535.5 746.5 L 504.5 746.5 Z M 324.5 684.5 L 355.5 684.5 L 355.5 746.5 L 324.5 746.5 Z M 276.5 684.5 L 307.5 684.5 L 307.5 746.5 L 276.5 746.5 Z M 455.5 684.5 L 486.5 684.5 L 486.5 746.5 L 455.5 746.5 Z M 455.5 684.5 "/>
 </clipPath>
-<image id="image775" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image810" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image775"/>
+  <use xlink:href="#image810"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -78,9 +78,9 @@
 <clipPath id="clip12">
   <path d="M 1466.5 420.5 L 1475.5 420.5 L 1475.5 489.5 L 1466.5 489.5 Z M 1494.5 420.5 L 1503.5 420.5 L 1503.5 489.5 L 1494.5 489.5 Z M 1402.5 420.5 L 1411.5 420.5 L 1411.5 489.5 L 1402.5 489.5 Z M 1318.5 420.5 L 1327.5 420.5 L 1327.5 489.5 L 1318.5 489.5 Z M 1374.5 420.5 L 1383.5 420.5 L 1383.5 489.5 L 1374.5 489.5 Z M 1346.5 420.5 L 1355.5 420.5 L 1355.5 489.5 L 1346.5 489.5 Z M 1072.5 475.5 L 1103.5 475.5 L 1103.5 521.5 L 1072.5 521.5 Z M 649.5 517.5 L 680.5 517.5 L 680.5 610.5 L 649.5 610.5 Z M 601.5 517.5 L 632.5 517.5 L 632.5 610.5 L 601.5 610.5 Z M 276.5 450.5 L 307.5 450.5 L 307.5 637.5 L 276.5 637.5 Z M 324.5 450.5 L 355.5 450.5 L 355.5 637.5 L 324.5 637.5 Z M 504.5 543.5 L 535.5 543.5 L 535.5 637.5 L 504.5 637.5 Z M 455.5 543.5 L 486.5 543.5 L 486.5 637.5 L 455.5 637.5 Z M 373.5 450.5 L 404.5 450.5 L 404.5 637.5 L 373.5 637.5 Z M 1403.5 579.5 L 1413.5 579.5 L 1413.5 649.5 L 1403.5 649.5 Z M 1348.5 579.5 L 1357.5 579.5 L 1357.5 649.5 L 1348.5 649.5 Z M 1375.5 579.5 L 1385.5 579.5 L 1385.5 649.5 L 1375.5 649.5 Z M 1320.5 579.5 L 1329.5 579.5 L 1329.5 649.5 L 1320.5 649.5 Z M 940.5 475.5 L 971.5 475.5 L 971.5 661.5 L 940.5 661.5 Z M 989.5 475.5 L 1020.5 475.5 L 1020.5 661.5 L 989.5 661.5 Z M 892.5 475.5 L 923.5 475.5 L 923.5 661.5 L 892.5 661.5 Z M 844.5 475.5 L 875.5 475.5 L 875.5 661.5 L 844.5 661.5 Z M 844.5 475.5 "/>
 </clipPath>
-<image id="image776" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image811" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image776"/>
+  <use xlink:href="#image811"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -97,15 +97,25 @@
 <clipPath id="clip16">
   <path d="M 204.5 277.5 L 215.5 277.5 L 215.5 287.5 L 204.5 287.5 Z M 1723.5 277.5 L 1734.5 277.5 L 1734.5 287.5 L 1723.5 287.5 Z M 1694.5 277.5 L 1704.5 277.5 L 1704.5 287.5 L 1694.5 287.5 Z M 1664.5 277.5 L 1674.5 277.5 L 1674.5 287.5 L 1664.5 287.5 Z M 1634.5 277.5 L 1644.5 277.5 L 1644.5 287.5 L 1634.5 287.5 Z M 1604.5 277.5 L 1615.5 277.5 L 1615.5 287.5 L 1604.5 287.5 Z M 1574.5 277.5 L 1585.5 277.5 L 1585.5 287.5 L 1574.5 287.5 Z M 1545.5 277.5 L 1555.5 277.5 L 1555.5 287.5 L 1545.5 287.5 Z M 1515.5 277.5 L 1525.5 277.5 L 1525.5 287.5 L 1515.5 287.5 Z M 1485.5 277.5 L 1496.5 277.5 L 1496.5 287.5 L 1485.5 287.5 Z M 1455.5 277.5 L 1466.5 277.5 L 1466.5 287.5 L 1455.5 287.5 Z M 1425.5 277.5 L 1436.5 277.5 L 1436.5 287.5 L 1425.5 287.5 Z M 1396.5 277.5 L 1406.5 277.5 L 1406.5 287.5 L 1396.5 287.5 Z M 1366.5 277.5 L 1376.5 277.5 L 1376.5 287.5 L 1366.5 287.5 Z M 1336.5 277.5 L 1347.5 277.5 L 1347.5 287.5 L 1336.5 287.5 Z M 1306.5 277.5 L 1317.5 277.5 L 1317.5 287.5 L 1306.5 287.5 Z M 1276.5 277.5 L 1287.5 277.5 L 1287.5 287.5 L 1276.5 287.5 Z M 1247.5 277.5 L 1257.5 277.5 L 1257.5 287.5 L 1247.5 287.5 Z M 1217.5 277.5 L 1227.5 277.5 L 1227.5 287.5 L 1217.5 287.5 Z M 1187.5 277.5 L 1198.5 277.5 L 1198.5 287.5 L 1187.5 287.5 Z M 1157.5 277.5 L 1168.5 277.5 L 1168.5 287.5 L 1157.5 287.5 Z M 1128.5 277.5 L 1138.5 277.5 L 1138.5 287.5 L 1128.5 287.5 Z M 1098.5 277.5 L 1108.5 277.5 L 1108.5 287.5 L 1098.5 287.5 Z M 1068.5 277.5 L 1079.5 277.5 L 1079.5 287.5 L 1068.5 287.5 Z M 1038.5 277.5 L 1049.5 277.5 L 1049.5 287.5 L 1038.5 287.5 Z M 1008.5 277.5 L 1019.5 277.5 L 1019.5 287.5 L 1008.5 287.5 Z M 979.5 277.5 L 989.5 277.5 L 989.5 287.5 L 979.5 287.5 Z M 949.5 277.5 L 959.5 277.5 L 959.5 287.5 L 949.5 287.5 Z M 919.5 277.5 L 930.5 277.5 L 930.5 287.5 L 919.5 287.5 Z M 889.5 277.5 L 900.5 277.5 L 900.5 287.5 L 889.5 287.5 Z M 859.5 277.5 L 870.5 277.5 L 870.5 287.5 L 859.5 287.5 Z M 830.5 277.5 L 840.5 277.5 L 840.5 287.5 L 830.5 287.5 Z M 800.5 277.5 L 810.5 277.5 L 810.5 287.5 L 800.5 287.5 Z M 770.5 277.5 L 781.5 277.5 L 781.5 287.5 L 770.5 287.5 Z M 740.5 277.5 L 751.5 277.5 L 751.5 287.5 L 740.5 287.5 Z M 711.5 277.5 L 721.5 277.5 L 721.5 287.5 L 711.5 287.5 Z M 681.5 277.5 L 691.5 277.5 L 691.5 287.5 L 681.5 287.5 Z M 651.5 277.5 L 661.5 277.5 L 661.5 287.5 L 651.5 287.5 Z M 621.5 277.5 L 632.5 277.5 L 632.5 287.5 L 621.5 287.5 Z M 591.5 277.5 L 602.5 277.5 L 602.5 287.5 L 591.5 287.5 Z M 562.5 277.5 L 572.5 277.5 L 572.5 287.5 L 562.5 287.5 Z M 532.5 277.5 L 542.5 277.5 L 542.5 287.5 L 532.5 287.5 Z M 502.5 277.5 L 513.5 277.5 L 513.5 287.5 L 502.5 287.5 Z M 472.5 277.5 L 483.5 277.5 L 483.5 287.5 L 472.5 287.5 Z M 442.5 277.5 L 453.5 277.5 L 453.5 287.5 L 442.5 287.5 Z M 413.5 277.5 L 423.5 277.5 L 423.5 287.5 L 413.5 287.5 Z M 383.5 277.5 L 393.5 277.5 L 393.5 287.5 L 383.5 287.5 Z M 353.5 277.5 L 364.5 277.5 L 364.5 287.5 L 353.5 287.5 Z M 323.5 277.5 L 334.5 277.5 L 334.5 287.5 L 323.5 287.5 Z M 293.5 277.5 L 304.5 277.5 L 304.5 287.5 L 293.5 287.5 Z M 264.5 277.5 L 274.5 277.5 L 274.5 287.5 L 264.5 287.5 Z M 234.5 277.5 L 244.5 277.5 L 244.5 287.5 L 234.5 287.5 Z M 264.5 305.5 L 274.5 305.5 L 274.5 315.5 L 264.5 315.5 Z M 293.5 305.5 L 304.5 305.5 L 304.5 315.5 L 293.5 315.5 Z M 353.5 305.5 L 364.5 305.5 L 364.5 315.5 L 353.5 315.5 Z M 472.5 305.5 L 483.5 305.5 L 483.5 315.5 L 472.5 315.5 Z M 711.5 305.5 L 721.5 305.5 L 721.5 315.5 L 711.5 315.5 Z M 740.5 305.5 L 751.5 305.5 L 751.5 315.5 L 740.5 315.5 Z M 502.5 305.5 L 513.5 305.5 L 513.5 315.5 L 502.5 315.5 Z M 770.5 305.5 L 781.5 305.5 L 781.5 315.5 L 770.5 315.5 Z M 800.5 305.5 L 810.5 305.5 L 810.5 315.5 L 800.5 315.5 Z M 1098.5 305.5 L 1108.5 305.5 L 1108.5 315.5 L 1098.5 315.5 Z M 1068.5 305.5 L 1079.5 305.5 L 1079.5 315.5 L 1068.5 315.5 Z M 1038.5 305.5 L 1048.5 305.5 L 1048.5 315.5 L 1038.5 315.5 Z M 1008.5 305.5 L 1019.5 305.5 L 1019.5 315.5 L 1008.5 315.5 Z M 979.5 305.5 L 989.5 305.5 L 989.5 315.5 L 979.5 315.5 Z M 949.5 305.5 L 959.5 305.5 L 959.5 315.5 L 949.5 315.5 Z M 919.5 305.5 L 930.5 305.5 L 930.5 315.5 L 919.5 315.5 Z M 889.5 305.5 L 900.5 305.5 L 900.5 315.5 L 889.5 315.5 Z M 859.5 305.5 L 870.5 305.5 L 870.5 315.5 L 859.5 315.5 Z M 383.5 305.5 L 393.5 305.5 L 393.5 315.5 L 383.5 315.5 Z M 532.5 305.5 L 542.5 305.5 L 542.5 315.5 L 532.5 315.5 Z M 830.5 305.5 L 840.5 305.5 L 840.5 315.5 L 830.5 315.5 Z M 562.5 305.5 L 572.5 305.5 L 572.5 315.5 L 562.5 315.5 Z M 323.5 305.5 L 334.5 305.5 L 334.5 315.5 L 323.5 315.5 Z M 681.5 305.5 L 691.5 305.5 L 691.5 315.5 L 681.5 315.5 Z M 651.5 305.5 L 661.5 305.5 L 661.5 315.5 L 651.5 315.5 Z M 621.5 305.5 L 632.5 305.5 L 632.5 315.5 L 621.5 315.5 Z M 413.5 305.5 L 423.5 305.5 L 423.5 315.5 L 413.5 315.5 Z M 591.5 305.5 L 602.5 305.5 L 602.5 315.5 L 591.5 315.5 Z M 442.5 305.5 L 453.5 305.5 L 453.5 315.5 L 442.5 315.5 Z M 1509.5 308.5 L 1519.5 308.5 L 1519.5 319.5 L 1509.5 319.5 Z M 1360.5 308.5 L 1370.5 308.5 L 1370.5 319.5 L 1360.5 319.5 Z M 1390.5 308.5 L 1400.5 308.5 L 1400.5 319.5 L 1390.5 319.5 Z M 1330.5 308.5 L 1341.5 308.5 L 1341.5 319.5 L 1330.5 319.5 Z M 1420.5 308.5 L 1430.5 308.5 L 1430.5 319.5 L 1420.5 319.5 Z M 1479.5 308.5 L 1490.5 308.5 L 1490.5 319.5 L 1479.5 319.5 Z M 1449.5 308.5 L 1460.5 308.5 L 1460.5 319.5 L 1449.5 319.5 Z M 1300.5 308.5 L 1311.5 308.5 L 1311.5 319.5 L 1300.5 319.5 Z M 1106.5 502.5 L 1116.5 502.5 L 1116.5 507.5 L 1106.5 507.5 Z M 1106.5 507.5 L 1116.5 507.5 L 1116.5 512.5 L 1106.5 512.5 Z M 1083.5 502.5 L 1094.5 502.5 L 1094.5 512.5 L 1083.5 512.5 Z M 321.5 502.5 L 332.5 502.5 L 332.5 512.5 L 321.5 512.5 Z M 299.5 502.5 L 310.5 502.5 L 310.5 512.5 L 299.5 512.5 Z M 396.5 502.5 L 406.5 502.5 L 406.5 512.5 L 396.5 512.5 Z M 418.5 502.5 L 429.5 502.5 L 429.5 512.5 L 418.5 512.5 Z M 226.5 529.5 L 237.5 529.5 L 237.5 540.5 L 226.5 540.5 Z M 769.5 529.5 L 780.5 529.5 L 780.5 540.5 L 769.5 540.5 Z M 792.5 529.5 L 802.5 529.5 L 802.5 540.5 L 792.5 540.5 Z M 204.5 529.5 L 215.5 529.5 L 215.5 540.5 L 204.5 540.5 Z M 489.5 557.5 L 500.5 557.5 L 500.5 559.5 L 489.5 559.5 Z M 489.5 559.5 L 500.5 559.5 L 500.5 567.5 L 489.5 567.5 Z M 1034.5 557.5 L 1045.5 557.5 L 1045.5 567.5 L 1034.5 567.5 Z M 841.5 557.5 L 851.5 557.5 L 851.5 567.5 L 841.5 567.5 Z M 1012.5 557.5 L 1023.5 557.5 L 1023.5 567.5 L 1012.5 567.5 Z M 938.5 557.5 L 948.5 557.5 L 948.5 567.5 L 938.5 567.5 Z M 915.5 557.5 L 926.5 557.5 L 926.5 567.5 L 915.5 567.5 Z M 512.5 557.5 L 522.5 557.5 L 522.5 567.5 L 512.5 567.5 Z M 818.5 557.5 L 829.5 557.5 L 829.5 567.5 L 818.5 567.5 Z M 1423.5 586.5 L 1434.5 586.5 L 1434.5 594.5 L 1423.5 594.5 Z M 1446.5 586.5 L 1456.5 586.5 L 1456.5 597.5 L 1446.5 597.5 Z M 1423.5 594.5 L 1434.5 594.5 L 1434.5 597.5 L 1423.5 597.5 Z M 1360.5 750.5 L 1370.5 750.5 L 1370.5 761.5 L 1360.5 761.5 Z M 1390.5 750.5 L 1400.5 750.5 L 1400.5 761.5 L 1390.5 761.5 Z M 1330.5 750.5 L 1341.5 750.5 L 1341.5 761.5 L 1330.5 761.5 Z M 1300.5 750.5 L 1311.5 750.5 L 1311.5 761.5 L 1300.5 761.5 Z M 1420.5 750.5 L 1430.5 750.5 L 1430.5 761.5 L 1420.5 761.5 Z M 478.5 759.5 L 489.5 759.5 L 489.5 769.5 L 478.5 769.5 Z M 501.5 759.5 L 511.5 759.5 L 511.5 769.5 L 501.5 769.5 Z M 333.5 759.5 L 343.5 759.5 L 343.5 769.5 L 333.5 769.5 Z M 385.5 759.5 L 395.5 759.5 L 395.5 769.5 L 385.5 769.5 Z M 407.5 759.5 L 418.5 759.5 L 418.5 769.5 L 407.5 769.5 Z M 310.5 759.5 L 321.5 759.5 L 321.5 769.5 L 310.5 769.5 Z M 204.5 782.5 L 215.5 782.5 L 215.5 792.5 L 204.5 792.5 Z M 1723.5 782.5 L 1734.5 782.5 L 1734.5 792.5 L 1723.5 792.5 Z M 1694.5 782.5 L 1704.5 782.5 L 1704.5 792.5 L 1694.5 792.5 Z M 1664.5 782.5 L 1674.5 782.5 L 1674.5 792.5 L 1664.5 792.5 Z M 1634.5 782.5 L 1644.5 782.5 L 1644.5 792.5 L 1634.5 792.5 Z M 1604.5 782.5 L 1615.5 782.5 L 1615.5 792.5 L 1604.5 792.5 Z M 1574.5 782.5 L 1585.5 782.5 L 1585.5 792.5 L 1574.5 792.5 Z M 1545.5 782.5 L 1555.5 782.5 L 1555.5 792.5 L 1545.5 792.5 Z M 1515.5 782.5 L 1525.5 782.5 L 1525.5 792.5 L 1515.5 792.5 Z M 1485.5 782.5 L 1496.5 782.5 L 1496.5 792.5 L 1485.5 792.5 Z M 1455.5 782.5 L 1466.5 782.5 L 1466.5 792.5 L 1455.5 792.5 Z M 1425.5 782.5 L 1436.5 782.5 L 1436.5 792.5 L 1425.5 792.5 Z M 1396.5 782.5 L 1406.5 782.5 L 1406.5 792.5 L 1396.5 792.5 Z M 1366.5 782.5 L 1376.5 782.5 L 1376.5 792.5 L 1366.5 792.5 Z M 1336.5 782.5 L 1347.5 782.5 L 1347.5 792.5 L 1336.5 792.5 Z M 1306.5 782.5 L 1317.5 782.5 L 1317.5 792.5 L 1306.5 792.5 Z M 1276.5 782.5 L 1287.5 782.5 L 1287.5 792.5 L 1276.5 792.5 Z M 1247.5 782.5 L 1257.5 782.5 L 1257.5 792.5 L 1247.5 792.5 Z M 1217.5 782.5 L 1227.5 782.5 L 1227.5 792.5 L 1217.5 792.5 Z M 1187.5 782.5 L 1198.5 782.5 L 1198.5 792.5 L 1187.5 792.5 Z M 1157.5 782.5 L 1168.5 782.5 L 1168.5 792.5 L 1157.5 792.5 Z M 1128.5 782.5 L 1138.5 782.5 L 1138.5 792.5 L 1128.5 792.5 Z M 1098.5 782.5 L 1108.5 782.5 L 1108.5 792.5 L 1098.5 792.5 Z M 1068.5 782.5 L 1079.5 782.5 L 1079.5 792.5 L 1068.5 792.5 Z M 1038.5 782.5 L 1049.5 782.5 L 1049.5 792.5 L 1038.5 792.5 Z M 1008.5 782.5 L 1019.5 782.5 L 1019.5 792.5 L 1008.5 792.5 Z M 979.5 782.5 L 989.5 782.5 L 989.5 792.5 L 979.5 792.5 Z M 949.5 782.5 L 959.5 782.5 L 959.5 792.5 L 949.5 792.5 Z M 919.5 782.5 L 930.5 782.5 L 930.5 792.5 L 919.5 792.5 Z M 889.5 782.5 L 900.5 782.5 L 900.5 792.5 L 889.5 792.5 Z M 859.5 782.5 L 870.5 782.5 L 870.5 792.5 L 859.5 792.5 Z M 830.5 782.5 L 840.5 782.5 L 840.5 792.5 L 830.5 792.5 Z M 800.5 782.5 L 810.5 782.5 L 810.5 792.5 L 800.5 792.5 Z M 770.5 782.5 L 781.5 782.5 L 781.5 792.5 L 770.5 792.5 Z M 740.5 782.5 L 751.5 782.5 L 751.5 792.5 L 740.5 792.5 Z M 711.5 782.5 L 721.5 782.5 L 721.5 792.5 L 711.5 792.5 Z M 681.5 782.5 L 691.5 782.5 L 691.5 792.5 L 681.5 792.5 Z M 651.5 782.5 L 661.5 782.5 L 661.5 792.5 L 651.5 792.5 Z M 621.5 782.5 L 632.5 782.5 L 632.5 792.5 L 621.5 792.5 Z M 591.5 782.5 L 602.5 782.5 L 602.5 792.5 L 591.5 792.5 Z M 562.5 782.5 L 572.5 782.5 L 572.5 792.5 L 562.5 792.5 Z M 532.5 782.5 L 542.5 782.5 L 542.5 792.5 L 532.5 792.5 Z M 502.5 782.5 L 513.5 782.5 L 513.5 792.5 L 502.5 792.5 Z M 472.5 782.5 L 483.5 782.5 L 483.5 792.5 L 472.5 792.5 Z M 442.5 782.5 L 453.5 782.5 L 453.5 792.5 L 442.5 792.5 Z M 413.5 782.5 L 423.5 782.5 L 423.5 792.5 L 413.5 792.5 Z M 383.5 782.5 L 393.5 782.5 L 393.5 792.5 L 383.5 792.5 Z M 353.5 782.5 L 364.5 782.5 L 364.5 792.5 L 353.5 792.5 Z M 323.5 782.5 L 334.5 782.5 L 334.5 792.5 L 323.5 792.5 Z M 293.5 782.5 L 304.5 782.5 L 304.5 792.5 L 293.5 792.5 Z M 264.5 782.5 L 274.5 782.5 L 274.5 792.5 L 264.5 792.5 Z M 234.5 782.5 L 244.5 782.5 L 244.5 792.5 L 234.5 792.5 Z M 234.5 782.5 "/>
 </clipPath>
-<image id="image777" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image812" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image777"/>
+  <use xlink:href="#image812"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
+<clipPath id="clip17">
+  <path d="M 18.5 888.5 L 1144.5 888.5 L 1144.5 890.5 L 18.5 890.5 Z M 1142.5 890.5 L 1144.5 890.5 L 1144.5 1059 L 1142.5 1059 Z M 1142.5 890.5 "/>
+</clipPath>
+<image id="image4786" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAbSURBVDiNY/jPgB8yEJAnDEdNGDVh1IQhagIAIcT+EDL4XQEAAAAASUVORK5CYII="/>
+<pattern id="pattern8" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image4786"/>
+</pattern>
+<mask id="mask8">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern8);stroke:none;"/>
+</mask>
 </defs>
-<g id="surface768">
+<g id="surface803">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -352,6 +362,8 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,100%,0%);fill-opacity:0.724409;" d="M 1085.871094 380.070312 L 1085.546875 380.097656 L 1085.269531 380.167969 L 1085.046875 380.285156 L 1084.859375 380.453125 L 1084.722656 380.667969 L 1084.625 380.933594 L 1084.59375 381.023438 L 1084.574219 381.121094 L 1084.566406 381.21875 L 1084.554688 381.335938 L 1084.542969 381.445312 L 1084.542969 381.5625 L 1083.679688 381.5625 L 1083.71875 381.011719 L 1083.847656 380.539062 L 1084.035156 380.148438 L 1084.308594 379.824219 L 1084.644531 379.578125 L 1085.066406 379.410156 L 1085.183594 379.382812 L 1085.3125 379.363281 L 1085.4375 379.34375 L 1085.574219 379.332031 L 1085.714844 379.324219 L 1085.859375 379.3125 L 1086.222656 379.332031 L 1086.566406 379.390625 L 1086.871094 379.488281 L 1087.148438 379.617188 L 1087.382812 379.792969 L 1087.589844 380 L 1087.707031 380.175781 L 1087.804688 380.355469 L 1087.882812 380.550781 L 1087.933594 380.765625 L 1087.960938 380.992188 L 1087.980469 381.226562 L 1087.953125 381.570312 L 1087.875 381.867188 L 1087.734375 382.121094 L 1087.550781 382.347656 L 1087.304688 382.535156 L 1087.007812 382.671875 L 1087.253906 382.769531 L 1087.46875 382.886719 L 1087.65625 383.015625 L 1087.8125 383.160156 L 1087.941406 383.328125 L 1088.039062 383.503906 L 1088.078125 383.625 L 1088.117188 383.75 L 1088.148438 383.886719 L 1088.167969 384.027344 L 1088.175781 384.171875 L 1088.1875 384.332031 L 1088.167969 384.664062 L 1088.109375 384.96875 L 1088.011719 385.242188 L 1087.882812 385.507812 L 1087.714844 385.742188 L 1087.511719 385.949219 L 1087.285156 386.117188 L 1087.039062 386.253906 L 1086.773438 386.351562 L 1086.480469 386.429688 L 1086.164062 386.480469 L 1085.832031 386.5 L 1085.300781 386.460938 L 1084.847656 386.34375 L 1084.457031 386.167969 L 1084.132812 385.902344 L 1083.878906 385.566406 L 1083.699219 385.15625 L 1083.652344 385.027344 L 1083.621094 384.878906 L 1083.59375 384.734375 L 1083.5625 384.585938 L 1083.542969 384.429688 L 1083.535156 384.25 L 1084.398438 384.25 L 1084.4375 384.605469 L 1084.515625 384.910156 L 1084.632812 385.164062 L 1084.789062 385.371094 L 1084.988281 385.539062 L 1085.230469 385.644531 L 1085.320312 385.675781 L 1085.515625 385.714844 L 1085.625 385.722656 L 1085.734375 385.734375 L 1085.859375 385.734375 L 1086.125 385.722656 L 1086.371094 385.675781 L 1086.585938 385.597656 L 1086.785156 385.488281 L 1086.949219 385.339844 L 1087.085938 385.164062 L 1087.148438 385.058594 L 1087.207031 384.929688 L 1087.246094 384.792969 L 1087.273438 384.652344 L 1087.292969 384.507812 L 1087.304688 384.339844 L 1087.265625 383.988281 L 1087.167969 383.691406 L 1087 383.445312 L 1086.765625 383.269531 L 1086.460938 383.152344 L 1086.085938 383.082031 L 1085.890625 383.082031 L 1085.859375 383.074219 L 1085.496094 383.082031 L 1085.390625 383.082031 L 1085.390625 382.347656 L 1085.683594 382.335938 L 1085.949219 382.316406 L 1086.183594 382.289062 L 1086.378906 382.25 L 1086.546875 382.199219 L 1086.695312 382.132812 L 1086.8125 382.042969 L 1086.910156 381.925781 L 1086.988281 381.796875 L 1087.046875 381.640625 L 1087.078125 381.464844 L 1087.097656 381.257812 L 1087.078125 381.042969 L 1087.039062 380.835938 L 1086.96875 380.660156 L 1086.871094 380.5 L 1086.742188 380.363281 L 1086.585938 380.246094 L 1086.480469 380.195312 L 1086.359375 380.148438 L 1086.253906 380.117188 L 1086.125 380.089844 L 1085.996094 380.078125 Z M 1085.871094 380.070312 "/>
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,100%,0%);fill-opacity:0.724409;" d="M 1093.339844 379.3125 L 1093.339844 380.167969 L 1090.445312 380.167969 L 1090.171875 382.113281 L 1090.367188 381.992188 L 1090.574219 381.886719 L 1090.777344 381.808594 L 1091.003906 381.75 L 1091.222656 381.707031 L 1091.457031 381.6875 L 1091.769531 381.707031 L 1092.074219 381.769531 L 1092.351562 381.855469 L 1092.613281 381.984375 L 1092.851562 382.140625 L 1093.078125 382.328125 L 1093.261719 382.554688 L 1093.421875 382.796875 L 1093.546875 383.0625 L 1093.625 383.359375 L 1093.683594 383.671875 L 1093.703125 384.007812 L 1093.683594 384.359375 L 1093.625 384.683594 L 1093.539062 384.988281 L 1093.410156 385.273438 L 1093.253906 385.539062 L 1093.066406 385.773438 L 1092.839844 385.988281 L 1092.605469 386.15625 L 1092.351562 386.285156 L 1092.066406 386.382812 L 1091.769531 386.449219 L 1091.457031 386.488281 L 1091.339844 386.488281 L 1091.320312 386.5 L 1090.71875 386.441406 L 1090.210938 386.292969 L 1089.789062 386.046875 L 1089.453125 385.695312 L 1089.199219 385.242188 L 1089.042969 384.683594 L 1089.03125 384.675781 L 1089.03125 384.664062 L 1089.023438 384.644531 L 1089.023438 384.625 L 1089.011719 384.59375 L 1089.011719 384.566406 L 1089.875 384.566406 L 1089.992188 384.910156 L 1090.152344 385.195312 L 1090.347656 385.410156 L 1090.59375 385.578125 L 1090.867188 385.683594 L 1091.191406 385.722656 L 1091.203125 385.734375 L 1091.300781 385.734375 L 1091.566406 385.722656 L 1091.808594 385.675781 L 1092.027344 385.585938 L 1092.222656 385.480469 L 1092.398438 385.320312 L 1092.546875 385.136719 L 1092.625 384.996094 L 1092.695312 384.851562 L 1092.753906 384.683594 L 1092.78125 384.507812 L 1092.8125 384.320312 L 1092.820312 384.125 L 1092.800781 383.839844 L 1092.753906 383.574219 L 1092.675781 383.328125 L 1092.566406 383.121094 L 1092.429688 382.9375 L 1092.261719 382.769531 L 1092.125 382.679688 L 1091.976562 382.601562 L 1091.820312 382.542969 L 1091.652344 382.496094 L 1091.476562 382.464844 L 1091.300781 382.457031 L 1091.121094 382.464844 L 1090.957031 382.496094 L 1090.796875 382.535156 L 1090.652344 382.59375 L 1090.515625 382.660156 L 1090.386719 382.738281 L 1090.328125 382.789062 L 1090.210938 382.90625 L 1090.140625 382.964844 L 1090.082031 383.035156 L 1090.023438 383.101562 L 1089.226562 383.101562 L 1089.75 379.3125 Z M 1093.339844 379.3125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 446 480 L 446 485 M 443 483 L 448 483 M 495 480 L 495 485 M 492 483 L 497 483 M 543 480 L 543 485 M 540 483 L 545 483 M 350 705 L 350 710 M 347 708 L 352 708 M 459 705 L 459 710 M 456 708 L 461 708 M 423 705 L 423 710 M 420 708 L 425 708 M 471 480 L 471 485 M 468 483 L 473 483 M 856 445 L 856 450 M 853 448 L 858 448 M 519 480 L 519 485 M 516 483 L 521 483 M 471 360 L 471 365 M 468 363 L 473 363 M 953 445 L 953 450 M 950 448 L 955 448 M 1529 772 L 1529 773 M 1528 773 L 1529 773 M 1440 772 L 1440 773 M 1439 773 L 1440 773 M 606 705 L 606 710 M 603 708 L 608 708 M 1291 315 L 1291 316 M 1290 316 L 1291 316 M 1035 378 L 1035 383 M 1032 381 L 1037 381 M 533 705 L 533 710 M 530 708 L 535 708 M 291 522 L 291 527 M 288 525 L 293 525 M 899 705 L 899 710 M 896 708 L 901 708 M 826 705 L 826 710 M 823 708 L 828 708 M 904 445 L 904 450 M 901 448 L 906 448 M 752 705 L 752 710 M 749 708 L 754 708 M 340 522 L 340 527 M 337 525 L 342 525 M 388 360 L 388 365 M 385 363 L 390 363 M 340 360 L 340 365 M 337 363 L 342 363 M 679 705 L 679 710 M 676 708 L 681 708 M 665 507 L 665 512 M 662 510 L 667 510 M 1016 684 L 1016 689 M 1013 687 L 1018 687 M 643 705 L 643 710 M 640 708 L 645 708 M 616 507 L 616 512 M 613 510 L 618 510 M 1001 445 L 1001 450 M 998 448 L 1003 448 M 519 360 L 519 365 M 516 363 L 521 363 M 291 360 L 291 365 M 288 363 L 293 363 M 388 522 L 388 527 M 385 525 L 390 525 M 386 705 L 386 710 M 383 708 L 388 708 M 543 360 L 543 365 M 540 363 L 545 363 M 495 360 L 495 365 M 492 363 L 497 363 M 446 360 L 446 365 M 443 363 L 448 363 M 412 360 L 412 365 M 409 363 L 414 363 M 364 360 L 364 365 M 361 363 L 366 363 M 316 360 L 316 365 M 313 363 L 318 363 M 267 360 L 267 365 M 264 363 L 269 363 M 291 684 L 291 689 M 288 687 L 293 687 M 641 507 L 641 512 M 638 510 L 643 510 M 592 507 L 592 512 M 589 510 L 594 510 M 835 498 L 835 503 M 832 501 L 837 501 M 883 498 L 883 503 M 880 501 L 885 501 M 932 498 L 932 503 M 929 501 L 934 501 M 980 498 L 980 503 M 977 501 L 982 501 M 1029 498 L 1029 503 M 1026 501 L 1031 501 M 641 507 L 641 512 M 638 510 L 643 510 M 689 507 L 689 512 M 686 510 L 691 510 M 412 522 L 412 527 M 409 525 L 414 525 M 364 522 L 364 527 M 361 525 L 366 525 M 316 522 L 316 527 M 313 525 L 318 525 M 267 522 L 267 527 M 264 525 L 269 525 M 1111 574 L 1111 579 M 1108 577 L 1113 577 M 1063 574 L 1063 579 M 1060 577 L 1065 577 M 267 684 L 267 689 M 264 687 L 269 687 M 316 684 L 316 689 M 313 687 L 318 687 M 1029 684 L 1029 689 M 1026 687 L 1031 687 M 980 684 L 980 689 M 977 687 L 982 687 M 1111 694 L 1111 699 M 1108 697 L 1113 697 M 1063 694 L 1063 699 M 1060 697 L 1065 697 M 496 705 L 496 710 M 493 708 L 498 708 M 569 705 L 569 710 M 566 708 L 571 708 M 592 653 L 592 658 M 589 656 L 594 656 M 689 653 L 689 658 M 686 656 L 691 656 M 1035 348 L 1035 353 M 1032 351 L 1037 351 M 643 705 L 643 710 M 640 708 L 645 708 M 716 705 L 716 710 M 713 708 L 718 708 M 789 705 L 789 710 M 786 708 L 791 708 M 862 705 L 862 710 M 859 708 L 864 708 M 935 705 L 935 710 M 932 708 L 937 708 M 1087 574 L 1087 579 M 1084 577 L 1089 577 M 1087 694 L 1087 699 M 1084 697 L 1089 697 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 195 287 L 195 296 M 190 292 L 199 292 M 194 293 L 196 293 M 194 291 L 196 291 M 194 291 L 194 293 M 196 291 L 196 293 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<g clip-path="url(#clip17)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(100%,100%,100%);fill-opacity:0.724409;stroke:none;" mask="url(#mask8)"/>
+</g>
 </g>
 </svg>
diff --git a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.svg b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.svg
index 4c1734f..923f928 100644
--- a/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.svg
+++ b/cells/lsbuflv2hv_isosrchvaon/sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 214.5 308.5 L 302.5 308.5 L 302.5 334.5 L 214.5 334.5 Z M 214.5 334.5 L 878.5 334.5 L 878.5 743.5 L 214.5 743.5 Z M 1178.5 324.5 L 1369.5 324.5 L 1369.5 748.5 L 1178.5 748.5 Z M 214.5 743.5 L 302.5 743.5 L 302.5 765.5 L 214.5 765.5 Z M 214.5 743.5 "/>
 </clipPath>
-<image id="image569" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image601" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image569"/>
+  <use xlink:href="#image601"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 286.5 410.5 L 304.5 410.5 L 304.5 437.5 L 286.5 437.5 Z M 286.5 437.5 L 304.5 437.5 L 304.5 455.5 L 286.5 455.5 Z M 286.5 455.5 L 304.5 455.5 L 304.5 527.5 L 286.5 527.5 Z M 1200.5 527.5 L 1288.5 527.5 L 1288.5 545.5 L 1200.5 545.5 Z M 248.5 527.5 L 320.5 527.5 L 320.5 545.5 L 248.5 545.5 Z M 248.5 527.5 "/>
 </clipPath>
-<image id="image570" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image602" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image570"/>
+  <use xlink:href="#image602"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 347.5 181.5 L 699.5 181.5 L 699.5 190.5 L 347.5 190.5 Z M 347.5 190.5 L 699.5 190.5 L 699.5 208.5 L 347.5 208.5 Z M 347.5 208.5 L 699.5 208.5 L 699.5 226.5 L 347.5 226.5 Z M 347.5 226.5 L 699.5 226.5 L 699.5 244.5 L 347.5 244.5 Z M 347.5 244.5 L 699.5 244.5 L 699.5 262.5 L 347.5 262.5 Z M 347.5 262.5 L 699.5 262.5 L 699.5 279.5 L 347.5 279.5 Z M 347.5 279.5 L 699.5 279.5 L 699.5 286.5 L 347.5 286.5 Z M 923.5 300.5 L 1133.5 300.5 L 1133.5 337.5 L 923.5 337.5 Z M 923.5 337.5 L 1133.5 337.5 L 1133.5 355.5 L 923.5 355.5 Z M 923.5 355.5 L 1133.5 355.5 L 1133.5 372.5 L 923.5 372.5 Z M 923.5 372.5 L 1133.5 372.5 L 1133.5 390.5 L 923.5 390.5 Z M 923.5 390.5 L 1133.5 390.5 L 1133.5 408.5 L 923.5 408.5 Z M 923.5 408.5 L 1133.5 408.5 L 1133.5 426.5 L 923.5 426.5 Z M 286.5 410.5 L 304.5 410.5 L 304.5 437.5 L 286.5 437.5 Z M 923.5 426.5 L 1133.5 426.5 L 1133.5 444.5 L 923.5 444.5 Z M 286.5 437.5 L 304.5 437.5 L 304.5 455.5 L 286.5 455.5 Z M 923.5 444.5 L 1133.5 444.5 L 1133.5 461.5 L 923.5 461.5 Z M 923.5 461.5 L 1133.5 461.5 L 1133.5 479.5 L 923.5 479.5 Z M 923.5 479.5 L 1133.5 479.5 L 1133.5 497.5 L 923.5 497.5 Z M 923.5 497.5 L 1133.5 497.5 L 1133.5 515.5 L 923.5 515.5 Z M 286.5 455.5 L 304.5 455.5 L 304.5 527.5 L 286.5 527.5 Z M 923.5 515.5 L 1133.5 515.5 L 1133.5 533.5 L 923.5 533.5 Z M 248.5 527.5 L 320.5 527.5 L 320.5 545.5 L 248.5 545.5 Z M 923.5 533.5 L 1133.5 533.5 L 1133.5 550.5 L 923.5 550.5 Z M 923.5 550.5 L 1133.5 550.5 L 1133.5 568.5 L 923.5 568.5 Z M 923.5 568.5 L 1133.5 568.5 L 1133.5 586.5 L 923.5 586.5 Z M 923.5 586.5 L 1133.5 586.5 L 1133.5 604.5 L 923.5 604.5 Z M 923.5 604.5 L 1133.5 604.5 L 1133.5 621.5 L 923.5 621.5 Z M 923.5 621.5 L 1133.5 621.5 L 1133.5 639.5 L 923.5 639.5 Z M 923.5 639.5 L 1133.5 639.5 L 1133.5 657.5 L 923.5 657.5 Z M 923.5 657.5 L 1133.5 657.5 L 1133.5 675.5 L 923.5 675.5 Z M 923.5 675.5 L 1133.5 675.5 L 1133.5 693.5 L 923.5 693.5 Z M 923.5 693.5 L 1133.5 693.5 L 1133.5 710.5 L 923.5 710.5 Z M 923.5 710.5 L 1133.5 710.5 L 1133.5 728.5 L 923.5 728.5 Z M 923.5 728.5 L 1133.5 728.5 L 1133.5 746.5 L 923.5 746.5 Z M 923.5 746.5 L 1133.5 746.5 L 1133.5 764.5 L 923.5 764.5 Z M 923.5 764.5 L 1133.5 764.5 L 1133.5 782.5 L 923.5 782.5 Z M 486.5 788.5 L 625.5 788.5 L 625.5 797.5 L 486.5 797.5 Z M 923.5 782.5 L 1133.5 782.5 L 1133.5 799.5 L 923.5 799.5 Z M 347.5 788.5 L 454.5 788.5 L 454.5 807.5 L 347.5 807.5 Z M 486.5 797.5 L 625.5 797.5 L 625.5 814.5 L 486.5 814.5 Z M 486.5 814.5 L 713.5 814.5 L 713.5 815.5 L 486.5 815.5 Z M 923.5 799.5 L 1133.5 799.5 L 1133.5 817.5 L 923.5 817.5 Z M 923.5 817.5 L 1133.5 817.5 L 1133.5 823.5 L 923.5 823.5 Z M 347.5 807.5 L 454.5 807.5 L 454.5 824.5 L 347.5 824.5 Z M 486.5 815.5 L 713.5 815.5 L 713.5 833.5 L 486.5 833.5 Z M 347.5 824.5 L 454.5 824.5 L 454.5 842.5 L 347.5 842.5 Z M 486.5 833.5 L 713.5 833.5 L 713.5 851.5 L 486.5 851.5 Z M 347.5 842.5 L 454.5 842.5 L 454.5 860.5 L 347.5 860.5 Z M 347.5 860.5 L 454.5 860.5 L 454.5 866.5 L 347.5 866.5 Z M 486.5 851.5 L 713.5 851.5 L 713.5 868.5 L 486.5 868.5 Z M 486.5 868.5 L 713.5 868.5 L 713.5 886.5 L 486.5 886.5 Z M 486.5 886.5 L 713.5 886.5 L 713.5 892.5 L 486.5 892.5 Z M 486.5 886.5 "/>
 </clipPath>
-<image id="image571" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image603" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image571"/>
+  <use xlink:href="#image603"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 248.5 101.5 L 1705.5 101.5 L 1705.5 119.5 L 248.5 119.5 Z M 248.5 953.5 L 1705.5 953.5 L 1705.5 971.5 L 248.5 971.5 Z M 248.5 953.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image570"/>
+  <use xlink:href="#image602"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 248.5 101.5 L 1705.5 101.5 L 1705.5 119.5 L 248.5 119.5 Z M 340.5 399.5 L 368.5 399.5 L 368.5 418.5 L 340.5 418.5 Z M 577.5 399.5 L 607.5 399.5 L 607.5 418.5 L 577.5 418.5 Z M 816.5 399.5 L 844.5 399.5 L 844.5 418.5 L 816.5 418.5 Z M 816.5 418.5 L 844.5 418.5 L 844.5 436.5 L 816.5 436.5 Z M 577.5 418.5 L 607.5 418.5 L 607.5 436.5 L 577.5 436.5 Z M 340.5 418.5 L 368.5 418.5 L 368.5 436.5 L 340.5 436.5 Z M 340.5 436.5 L 368.5 436.5 L 368.5 443.5 L 340.5 443.5 Z M 577.5 436.5 L 607.5 436.5 L 607.5 443.5 L 577.5 443.5 Z M 816.5 436.5 L 844.5 436.5 L 844.5 443.5 L 816.5 443.5 Z M 605.5 551.5 L 633.5 551.5 L 633.5 578.5 L 605.5 578.5 Z M 685.5 551.5 L 713.5 551.5 L 713.5 578.5 L 685.5 578.5 Z M 685.5 578.5 L 713.5 578.5 L 713.5 595.5 L 685.5 595.5 Z M 605.5 578.5 L 633.5 578.5 L 633.5 595.5 L 605.5 595.5 Z M 685.5 595.5 L 713.5 595.5 L 713.5 613.5 L 685.5 613.5 Z M 605.5 595.5 L 633.5 595.5 L 633.5 613.5 L 605.5 613.5 Z M 605.5 613.5 L 633.5 613.5 L 633.5 631.5 L 605.5 631.5 Z M 685.5 613.5 L 713.5 613.5 L 713.5 631.5 L 685.5 631.5 Z M 685.5 631.5 L 713.5 631.5 L 713.5 649.5 L 685.5 649.5 Z M 347.5 630.5 L 374.5 630.5 L 374.5 649.5 L 347.5 649.5 Z M 605.5 631.5 L 633.5 631.5 L 633.5 649.5 L 605.5 649.5 Z M 427.5 630.5 L 454.5 630.5 L 454.5 649.5 L 427.5 649.5 Z M 605.5 649.5 L 633.5 649.5 L 633.5 666.5 L 605.5 666.5 Z M 685.5 649.5 L 713.5 649.5 L 713.5 666.5 L 685.5 666.5 Z M 427.5 649.5 L 454.5 649.5 L 454.5 666.5 L 427.5 666.5 Z M 347.5 649.5 L 374.5 649.5 L 374.5 666.5 L 347.5 666.5 Z M 427.5 666.5 L 454.5 666.5 L 454.5 684.5 L 427.5 684.5 Z M 347.5 666.5 L 374.5 666.5 L 374.5 684.5 L 347.5 684.5 Z M 605.5 666.5 L 633.5 666.5 L 633.5 684.5 L 605.5 684.5 Z M 685.5 666.5 L 713.5 666.5 L 713.5 684.5 L 685.5 684.5 Z M 347.5 684.5 L 374.5 684.5 L 374.5 702.5 L 347.5 702.5 Z M 685.5 684.5 L 713.5 684.5 L 713.5 702.5 L 685.5 702.5 Z M 427.5 684.5 L 454.5 684.5 L 454.5 702.5 L 427.5 702.5 Z M 605.5 684.5 L 633.5 684.5 L 633.5 702.5 L 605.5 702.5 Z M 605.5 702.5 L 633.5 702.5 L 633.5 708.5 L 605.5 708.5 Z M 347.5 702.5 L 374.5 702.5 L 374.5 708.5 L 347.5 708.5 Z M 685.5 702.5 L 713.5 702.5 L 713.5 708.5 L 685.5 708.5 Z M 427.5 702.5 L 454.5 702.5 L 454.5 708.5 L 427.5 708.5 Z M 248.5 953.5 L 1705.5 953.5 L 1705.5 971.5 L 248.5 971.5 Z M 248.5 953.5 "/>
 </clipPath>
-<image id="image572" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image604" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image572"/>
+  <use xlink:href="#image604"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1243.5 189.5 L 1259.5 189.5 L 1259.5 267.5 L 1243.5 267.5 Z M 456.5 181.5 L 508.5 181.5 L 508.5 286.5 L 456.5 286.5 Z M 619.5 181.5 L 671.5 181.5 L 671.5 286.5 L 619.5 286.5 Z M 537.5 181.5 L 590.5 181.5 L 590.5 286.5 L 537.5 286.5 Z M 374.5 181.5 L 427.5 181.5 L 427.5 286.5 L 374.5 286.5 Z M 1043.5 300.5 L 1106.5 300.5 L 1106.5 823.5 L 1043.5 823.5 Z M 951.5 300.5 L 1014.5 300.5 L 1014.5 823.5 L 951.5 823.5 Z M 374.5 788.5 L 427.5 788.5 L 427.5 866.5 L 374.5 866.5 Z M 1288.5 806.5 L 1304.5 806.5 L 1304.5 883.5 L 1288.5 883.5 Z M 633.5 814.5 L 685.5 814.5 L 685.5 892.5 L 633.5 892.5 Z M 513.5 788.5 L 597.5 788.5 L 597.5 892.5 L 513.5 892.5 Z M 513.5 788.5 "/>
 </clipPath>
-<image id="image573" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image605" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image573"/>
+  <use xlink:href="#image605"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 607.5 399.5 L 816.5 399.5 L 816.5 443.5 L 607.5 443.5 Z M 368.5 399.5 L 577.5 399.5 L 577.5 443.5 L 368.5 443.5 Z M 1244.5 343.5 L 1260.5 343.5 L 1260.5 460.5 L 1244.5 460.5 Z M 633.5 551.5 L 685.5 551.5 L 685.5 708.5 L 633.5 708.5 Z M 374.5 630.5 L 427.5 630.5 L 427.5 708.5 L 374.5 708.5 Z M 1287.5 612.5 L 1303.5 612.5 L 1303.5 729.5 L 1287.5 729.5 Z M 1287.5 612.5 "/>
 </clipPath>
-<image id="image574" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image606" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image574"/>
+  <use xlink:href="#image606"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -94,15 +94,15 @@
 <clipPath id="clip15">
   <path d="M 264.5 101.5 L 282.5 101.5 L 282.5 119.5 L 264.5 119.5 Z M 1671.5 101.5 L 1689.5 101.5 L 1689.5 119.5 L 1671.5 119.5 Z M 1620.5 101.5 L 1638.5 101.5 L 1638.5 119.5 L 1620.5 119.5 Z M 1570.5 101.5 L 1588.5 101.5 L 1588.5 119.5 L 1570.5 119.5 Z M 1520.5 101.5 L 1538.5 101.5 L 1538.5 119.5 L 1520.5 119.5 Z M 1470.5 101.5 L 1488.5 101.5 L 1488.5 119.5 L 1470.5 119.5 Z M 1420.5 101.5 L 1437.5 101.5 L 1437.5 119.5 L 1420.5 119.5 Z M 1369.5 101.5 L 1387.5 101.5 L 1387.5 119.5 L 1369.5 119.5 Z M 1319.5 101.5 L 1337.5 101.5 L 1337.5 119.5 L 1319.5 119.5 Z M 1269.5 101.5 L 1287.5 101.5 L 1287.5 119.5 L 1269.5 119.5 Z M 1219.5 101.5 L 1236.5 101.5 L 1236.5 119.5 L 1219.5 119.5 Z M 1168.5 101.5 L 1186.5 101.5 L 1186.5 119.5 L 1168.5 119.5 Z M 1118.5 101.5 L 1136.5 101.5 L 1136.5 119.5 L 1118.5 119.5 Z M 1068.5 101.5 L 1086.5 101.5 L 1086.5 119.5 L 1068.5 119.5 Z M 1018.5 101.5 L 1036.5 101.5 L 1036.5 119.5 L 1018.5 119.5 Z M 968.5 101.5 L 985.5 101.5 L 985.5 119.5 L 968.5 119.5 Z M 917.5 101.5 L 935.5 101.5 L 935.5 119.5 L 917.5 119.5 Z M 867.5 101.5 L 885.5 101.5 L 885.5 119.5 L 867.5 119.5 Z M 817.5 101.5 L 835.5 101.5 L 835.5 119.5 L 817.5 119.5 Z M 767.5 101.5 L 784.5 101.5 L 784.5 119.5 L 767.5 119.5 Z M 716.5 101.5 L 734.5 101.5 L 734.5 119.5 L 716.5 119.5 Z M 666.5 101.5 L 684.5 101.5 L 684.5 119.5 L 666.5 119.5 Z M 616.5 101.5 L 634.5 101.5 L 634.5 119.5 L 616.5 119.5 Z M 566.5 101.5 L 584.5 101.5 L 584.5 119.5 L 566.5 119.5 Z M 516.5 101.5 L 533.5 101.5 L 533.5 119.5 L 516.5 119.5 Z M 465.5 101.5 L 483.5 101.5 L 483.5 119.5 L 465.5 119.5 Z M 415.5 101.5 L 433.5 101.5 L 433.5 119.5 L 415.5 119.5 Z M 365.5 101.5 L 383.5 101.5 L 383.5 119.5 L 365.5 119.5 Z M 315.5 101.5 L 332.5 101.5 L 332.5 119.5 L 315.5 119.5 Z M 1267.5 154.5 L 1285.5 154.5 L 1285.5 172.5 L 1267.5 172.5 Z M 1304.5 154.5 L 1322.5 154.5 L 1322.5 172.5 L 1304.5 172.5 Z M 264.5 527.5 L 282.5 527.5 L 282.5 545.5 L 264.5 545.5 Z M 302.5 527.5 L 320.5 527.5 L 320.5 545.5 L 302.5 545.5 Z M 435.5 578.5 L 453.5 578.5 L 453.5 595.5 L 435.5 595.5 Z M 609.5 578.5 L 627.5 578.5 L 627.5 595.5 L 609.5 595.5 Z M 571.5 578.5 L 589.5 578.5 L 589.5 595.5 L 571.5 595.5 Z M 473.5 578.5 L 491.5 578.5 L 491.5 595.5 L 473.5 595.5 Z M 1263.5 622.5 L 1280.5 622.5 L 1280.5 636.5 L 1263.5 636.5 Z M 1263.5 636.5 L 1280.5 636.5 L 1280.5 640.5 L 1263.5 640.5 Z M 1225.5 622.5 L 1243.5 622.5 L 1243.5 640.5 L 1225.5 640.5 Z M 398.5 900.5 L 416.5 900.5 L 416.5 918.5 L 398.5 918.5 Z M 1263.5 900.5 L 1280.5 900.5 L 1280.5 918.5 L 1263.5 918.5 Z M 1225.5 900.5 L 1243.5 900.5 L 1243.5 918.5 L 1225.5 918.5 Z M 1038.5 900.5 L 1055.5 900.5 L 1055.5 918.5 L 1038.5 918.5 Z M 1000.5 900.5 L 1018.5 900.5 L 1018.5 918.5 L 1000.5 918.5 Z M 621.5 900.5 L 639.5 900.5 L 639.5 918.5 L 621.5 918.5 Z M 584.5 900.5 L 601.5 900.5 L 601.5 918.5 L 584.5 918.5 Z M 435.5 900.5 L 453.5 900.5 L 453.5 918.5 L 435.5 918.5 Z M 264.5 953.5 L 282.5 953.5 L 282.5 971.5 L 264.5 971.5 Z M 1671.5 953.5 L 1689.5 953.5 L 1689.5 971.5 L 1671.5 971.5 Z M 1620.5 953.5 L 1638.5 953.5 L 1638.5 971.5 L 1620.5 971.5 Z M 1570.5 953.5 L 1588.5 953.5 L 1588.5 971.5 L 1570.5 971.5 Z M 1520.5 953.5 L 1538.5 953.5 L 1538.5 971.5 L 1520.5 971.5 Z M 1470.5 953.5 L 1488.5 953.5 L 1488.5 971.5 L 1470.5 971.5 Z M 1420.5 953.5 L 1437.5 953.5 L 1437.5 971.5 L 1420.5 971.5 Z M 1369.5 953.5 L 1387.5 953.5 L 1387.5 971.5 L 1369.5 971.5 Z M 1319.5 953.5 L 1337.5 953.5 L 1337.5 971.5 L 1319.5 971.5 Z M 1269.5 953.5 L 1287.5 953.5 L 1287.5 971.5 L 1269.5 971.5 Z M 1219.5 953.5 L 1236.5 953.5 L 1236.5 971.5 L 1219.5 971.5 Z M 1168.5 953.5 L 1186.5 953.5 L 1186.5 971.5 L 1168.5 971.5 Z M 1118.5 953.5 L 1136.5 953.5 L 1136.5 971.5 L 1118.5 971.5 Z M 1068.5 953.5 L 1086.5 953.5 L 1086.5 971.5 L 1068.5 971.5 Z M 1018.5 953.5 L 1036.5 953.5 L 1036.5 971.5 L 1018.5 971.5 Z M 968.5 953.5 L 985.5 953.5 L 985.5 971.5 L 968.5 971.5 Z M 917.5 953.5 L 935.5 953.5 L 935.5 971.5 L 917.5 971.5 Z M 867.5 953.5 L 885.5 953.5 L 885.5 971.5 L 867.5 971.5 Z M 817.5 953.5 L 835.5 953.5 L 835.5 971.5 L 817.5 971.5 Z M 767.5 953.5 L 784.5 953.5 L 784.5 971.5 L 767.5 971.5 Z M 716.5 953.5 L 734.5 953.5 L 734.5 971.5 L 716.5 971.5 Z M 666.5 953.5 L 684.5 953.5 L 684.5 971.5 L 666.5 971.5 Z M 616.5 953.5 L 634.5 953.5 L 634.5 971.5 L 616.5 971.5 Z M 566.5 953.5 L 584.5 953.5 L 584.5 971.5 L 566.5 971.5 Z M 516.5 953.5 L 533.5 953.5 L 533.5 971.5 L 516.5 971.5 Z M 465.5 953.5 L 483.5 953.5 L 483.5 971.5 L 465.5 971.5 Z M 415.5 953.5 L 433.5 953.5 L 433.5 971.5 L 415.5 971.5 Z M 365.5 953.5 L 383.5 953.5 L 383.5 971.5 L 365.5 971.5 Z M 315.5 953.5 L 332.5 953.5 L 332.5 971.5 L 315.5 971.5 Z M 315.5 953.5 "/>
 </clipPath>
-<image id="image575" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image607" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image575"/>
+  <use xlink:href="#image607"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface566">
+<g id="surface598">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -279,6 +279,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,100%,0%);fill-opacity:0.724409;" d="M 887.132812 252.527344 L 887.132812 253.765625 L 885.5625 253.765625 L 885.5625 260.511719 L 885.582031 260.675781 L 885.617188 260.824219 L 885.671875 260.933594 L 885.746094 261.023438 L 885.835938 261.078125 L 885.890625 261.113281 L 885.984375 261.132812 L 886.054688 261.152344 L 886.164062 261.167969 L 886.820312 261.167969 L 886.929688 261.152344 L 887.039062 261.132812 L 887.132812 261.097656 L 887.132812 262.371094 L 886.894531 262.410156 L 886.675781 262.445312 L 886.457031 262.464844 L 886.257812 262.480469 L 886.054688 262.480469 L 885.890625 262.5 L 885.453125 262.464844 L 885.070312 262.390625 L 884.742188 262.261719 L 884.488281 262.082031 L 884.285156 261.863281 L 884.140625 261.570312 L 884.105469 261.496094 L 884.066406 261.316406 L 884.050781 261.207031 L 884.050781 253.765625 L 882.753906 253.765625 L 882.753906 252.527344 L 884.050781 252.527344 L 884.050781 249.902344 L 885.5625 249.902344 L 885.5625 252.527344 Z M 887.132812 252.527344 "/>
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,100%,0%);fill-opacity:0.724409;" d="M 892.472656 250.558594 L 891.871094 250.613281 L 891.359375 250.738281 L 890.941406 250.957031 L 890.59375 251.269531 L 890.339844 251.667969 L 890.15625 252.160156 L 890.101562 252.324219 L 890.066406 252.507812 L 890.046875 252.691406 L 890.03125 252.910156 L 890.011719 253.109375 L 890.011719 253.328125 L 888.40625 253.328125 L 888.480469 252.308594 L 888.71875 251.433594 L 889.0625 250.703125 L 889.574219 250.101562 L 890.195312 249.644531 L 890.976562 249.335938 L 891.195312 249.28125 L 891.433594 249.246094 L 891.671875 249.207031 L 891.925781 249.191406 L 892.179688 249.171875 L 892.457031 249.152344 L 893.128906 249.191406 L 893.769531 249.300781 L 894.332031 249.480469 L 894.84375 249.71875 L 895.28125 250.046875 L 895.664062 250.429688 L 895.882812 250.757812 L 896.066406 251.085938 L 896.210938 251.449219 L 896.300781 251.851562 L 896.355469 252.269531 L 896.394531 252.707031 L 896.339844 253.347656 L 896.191406 253.894531 L 895.9375 254.367188 L 895.589844 254.789062 L 895.136719 255.132812 L 894.589844 255.390625 L 895.042969 255.570312 L 895.445312 255.789062 L 895.792969 256.027344 L 896.082031 256.300781 L 896.320312 256.609375 L 896.503906 256.9375 L 896.574219 257.15625 L 896.648438 257.394531 L 896.703125 257.648438 L 896.738281 257.90625 L 896.757812 258.179688 L 896.777344 258.46875 L 896.738281 259.089844 L 896.628906 259.65625 L 896.449219 260.167969 L 896.210938 260.660156 L 895.902344 261.097656 L 895.519531 261.480469 L 895.097656 261.789062 L 894.644531 262.042969 L 894.152344 262.226562 L 893.605469 262.371094 L 893.019531 262.464844 L 892.402344 262.5 L 891.414062 262.425781 L 890.578125 262.207031 L 889.847656 261.878906 L 889.246094 261.386719 L 888.773438 260.769531 L 888.445312 260.003906 L 888.351562 259.765625 L 888.1875 258.945312 L 888.152344 258.652344 L 888.132812 258.324219 L 889.738281 258.324219 L 889.8125 258.980469 L 889.957031 259.546875 L 890.175781 260.019531 L 890.46875 260.402344 L 890.832031 260.714844 L 891.289062 260.914062 L 891.453125 260.96875 L 891.632812 261.003906 L 891.816406 261.042969 L 892.015625 261.058594 L 892.21875 261.078125 L 892.457031 261.078125 L 892.949219 261.058594 L 893.402344 260.96875 L 893.804688 260.824219 L 894.167969 260.621094 L 894.480469 260.347656 L 894.734375 260.019531 L 894.84375 259.820312 L 894.953125 259.582031 L 895.027344 259.328125 L 895.082031 259.070312 L 895.117188 258.796875 L 895.136719 258.488281 L 895.0625 257.832031 L 894.878906 257.285156 L 894.570312 256.828125 L 894.132812 256.5 L 893.566406 256.28125 L 892.875 256.15625 L 892.511719 256.15625 L 892.457031 256.136719 L 891.78125 256.15625 L 891.578125 256.15625 L 891.578125 254.789062 L 892.125 254.769531 L 892.621094 254.734375 L 893.058594 254.679688 L 893.421875 254.605469 L 893.730469 254.515625 L 894.003906 254.386719 L 894.222656 254.222656 L 894.40625 254.003906 L 894.550781 253.765625 L 894.660156 253.476562 L 894.714844 253.148438 L 894.753906 252.765625 L 894.714844 252.363281 L 894.644531 251.980469 L 894.515625 251.652344 L 894.332031 251.359375 L 894.097656 251.105469 L 893.804688 250.886719 L 893.605469 250.792969 L 893.386719 250.703125 L 893.183594 250.648438 L 892.949219 250.59375 L 892.710938 250.574219 Z M 892.472656 250.558594 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 711 661 L 711 668 M 707 665 L 714 665 M 400 242 L 400 249 M 396 246 L 403 246 M 400 400 L 400 407 M 396 404 L 403 404 M 482 840 L 482 847 M 478 844 L 485 844 M 659 222 L 659 229 M 655 226 L 662 226 M 564 840 L 564 847 M 560 844 L 567 844 M 889 878 L 889 885 M 885 882 L 892 882 M 936 498 L 936 505 M 932 502 L 939 502 M 1028 498 L 1028 505 M 1024 502 L 1031 502 M 1120 498 L 1120 505 M 1116 502 L 1123 502 M 700 215 L 700 222 M 696 219 L 703 219 M 499 233 L 499 240 M 495 237 L 502 237 M 612 233 L 612 240 M 608 237 L 615 237 M 441 242 L 441 249 M 437 246 L 444 246 M 360 242 L 360 249 M 356 246 L 363 246 M 993 498 L 993 505 M 989 502 L 996 502 M 618 435 L 618 442 M 614 439 L 621 439 M 700 435 L 700 442 M 696 439 L 703 439 M 441 400 L 441 407 M 437 404 L 444 404 M 360 400 L 360 407 M 356 404 L 363 404 M 473 661 L 473 668 M 469 665 L 476 665 M 400 840 L 400 847 M 396 844 L 403 844 M 592 648 L 592 655 M 588 652 L 595 652 M 353 648 L 353 655 M 349 652 L 356 652 M 592 648 L 592 655 M 588 652 L 595 652 M 830 648 L 830 655 M 826 652 L 833 652 M 645 840 L 645 847 M 641 844 L 648 844 M 659 435 L 659 442 M 655 439 L 662 439 M 555 233 L 555 240 M 551 237 L 558 237 M 523 840 L 523 847 M 519 844 L 526 844 M 604 840 L 604 847 M 600 844 L 607 844 M 686 840 L 686 847 M 682 844 L 689 844 M 604 758 L 604 765 M 600 762 L 607 762 M 523 840 L 523 847 M 519 844 L 526 844 M 441 840 L 441 847 M 437 844 L 444 844 M 1074 498 L 1074 505 M 1070 502 L 1077 502 M 360 840 L 360 847 M 356 844 L 363 844 M 441 758 L 441 765 M 437 762 L 444 762 M 889 820 L 889 827 M 885 824 L 892 824 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 248 112 L 248 121 M 243 117 L 252 117 M 247 118 L 249 118 M 247 116 L 249 116 M 247 116 L 247 118 M 249 116 L 249 118 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.svg b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.svg
index a855493..cd5371b 100644
--- a/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.svg
+++ b/cells/lsbuflv2hv_symmetric/sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1046.5 308.5 L 1573.5 308.5 L 1573.5 704.5 L 1046.5 704.5 Z M 676.5 510.5 L 837.5 510.5 L 837.5 751.5 L 676.5 751.5 Z M 1409.5 704.5 L 1573.5 704.5 L 1573.5 765.5 L 1409.5 765.5 Z M 349.5 308.5 L 467.5 308.5 L 467.5 765.5 L 349.5 765.5 Z M 349.5 308.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 725.5 528.5 L 818.5 528.5 L 818.5 531.5 L 725.5 531.5 Z M 1488.5 527.5 L 1538.5 527.5 L 1538.5 545.5 L 1488.5 545.5 Z M 1241.5 527.5 L 1351.5 527.5 L 1351.5 545.5 L 1241.5 545.5 Z M 383.5 527.5 L 432.5 527.5 L 432.5 545.5 L 383.5 545.5 Z M 725.5 531.5 L 818.5 531.5 L 818.5 549.5 L 725.5 549.5 Z M 725.5 549.5 L 818.5 549.5 L 818.5 589.5 L 725.5 589.5 Z M 725.5 589.5 L 818.5 589.5 L 818.5 606.5 L 725.5 606.5 Z M 725.5 606.5 L 818.5 606.5 L 818.5 616.5 L 725.5 616.5 Z M 725.5 606.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 730.5 166.5 L 919.5 166.5 L 919.5 173.5 L 730.5 173.5 Z M 1329.5 166.5 L 1523.5 166.5 L 1523.5 173.5 L 1329.5 173.5 Z M 730.5 173.5 L 919.5 173.5 L 919.5 190.5 L 730.5 190.5 Z M 1329.5 173.5 L 1523.5 173.5 L 1523.5 190.5 L 1329.5 190.5 Z M 730.5 190.5 L 919.5 190.5 L 919.5 214.5 L 730.5 214.5 Z M 1329.5 190.5 L 1523.5 190.5 L 1523.5 221.5 L 1329.5 221.5 Z M 730.5 214.5 L 919.5 214.5 L 919.5 232.5 L 730.5 232.5 Z M 1329.5 221.5 L 1523.5 221.5 L 1523.5 238.5 L 1329.5 238.5 Z M 1329.5 238.5 L 1523.5 238.5 L 1523.5 245.5 L 1329.5 245.5 Z M 730.5 232.5 L 919.5 232.5 L 919.5 257.5 L 730.5 257.5 Z M 730.5 257.5 L 919.5 257.5 L 919.5 275.5 L 730.5 275.5 Z M 730.5 275.5 L 919.5 275.5 L 919.5 299.5 L 730.5 299.5 Z M 730.5 299.5 L 919.5 299.5 L 919.5 317.5 L 730.5 317.5 Z M 730.5 317.5 L 919.5 317.5 L 919.5 323.5 L 730.5 323.5 Z M 383.5 527.5 L 432.5 527.5 L 432.5 545.5 L 383.5 545.5 Z M 1488.5 527.5 L 1538.5 527.5 L 1538.5 545.5 L 1488.5 545.5 Z M 1241.5 527.5 L 1351.5 527.5 L 1351.5 545.5 L 1241.5 545.5 Z M 929.5 749.5 L 1119.5 749.5 L 1119.5 755.5 L 929.5 755.5 Z M 1174.5 749.5 L 1364.5 749.5 L 1364.5 755.5 L 1174.5 755.5 Z M 929.5 755.5 L 1119.5 755.5 L 1119.5 773.5 L 929.5 773.5 Z M 1174.5 755.5 L 1364.5 755.5 L 1364.5 773.5 L 1174.5 773.5 Z M 929.5 773.5 L 1119.5 773.5 L 1119.5 797.5 L 929.5 797.5 Z M 1174.5 773.5 L 1364.5 773.5 L 1364.5 797.5 L 1174.5 797.5 Z M 929.5 797.5 L 1119.5 797.5 L 1119.5 815.5 L 929.5 815.5 Z M 1174.5 797.5 L 1364.5 797.5 L 1364.5 815.5 L 1174.5 815.5 Z M 1174.5 815.5 L 1364.5 815.5 L 1364.5 840.5 L 1174.5 840.5 Z M 929.5 815.5 L 1119.5 815.5 L 1119.5 840.5 L 929.5 840.5 Z M 929.5 840.5 L 1119.5 840.5 L 1119.5 858.5 L 929.5 858.5 Z M 1174.5 840.5 L 1364.5 840.5 L 1364.5 858.5 L 1174.5 858.5 Z M 1174.5 858.5 L 1364.5 858.5 L 1364.5 882.5 L 1174.5 882.5 Z M 929.5 858.5 L 1119.5 858.5 L 1119.5 882.5 L 929.5 882.5 Z M 929.5 882.5 L 1119.5 882.5 L 1119.5 900.5 L 929.5 900.5 Z M 1174.5 882.5 L 1364.5 882.5 L 1364.5 900.5 L 1174.5 900.5 Z M 1174.5 900.5 L 1364.5 900.5 L 1364.5 906.5 L 1174.5 906.5 Z M 929.5 900.5 L 1119.5 900.5 L 1119.5 906.5 L 929.5 906.5 Z M 929.5 900.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 383.5 101.5 L 1538.5 101.5 L 1538.5 119.5 L 383.5 119.5 Z M 383.5 953.5 L 1538.5 953.5 L 1538.5 971.5 L 383.5 971.5 Z M 383.5 953.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 383.5 101.5 L 1538.5 101.5 L 1538.5 119.5 L 383.5 119.5 Z M 1088.5 342.5 L 1116.5 342.5 L 1116.5 348.5 L 1088.5 348.5 Z M 1254.5 342.5 L 1282.5 342.5 L 1282.5 348.5 L 1254.5 348.5 Z M 1495.5 342.5 L 1523.5 342.5 L 1523.5 348.5 L 1495.5 348.5 Z M 1329.5 342.5 L 1356.5 342.5 L 1356.5 348.5 L 1329.5 348.5 Z M 1168.5 342.5 L 1202.5 342.5 L 1202.5 348.5 L 1168.5 348.5 Z M 1409.5 342.5 L 1443.5 342.5 L 1443.5 348.5 L 1409.5 348.5 Z M 1168.5 348.5 L 1202.5 348.5 L 1202.5 366.5 L 1168.5 366.5 Z M 1254.5 348.5 L 1282.5 348.5 L 1282.5 366.5 L 1254.5 366.5 Z M 1088.5 348.5 L 1116.5 348.5 L 1116.5 366.5 L 1088.5 366.5 Z M 1495.5 348.5 L 1523.5 348.5 L 1523.5 366.5 L 1495.5 366.5 Z M 1329.5 348.5 L 1356.5 348.5 L 1356.5 366.5 L 1329.5 366.5 Z M 1409.5 348.5 L 1443.5 348.5 L 1443.5 366.5 L 1409.5 366.5 Z M 1409.5 366.5 L 1443.5 366.5 L 1443.5 390.5 L 1409.5 390.5 Z M 1329.5 366.5 L 1356.5 366.5 L 1356.5 390.5 L 1329.5 390.5 Z M 1088.5 366.5 L 1116.5 366.5 L 1116.5 390.5 L 1088.5 390.5 Z M 1495.5 366.5 L 1523.5 366.5 L 1523.5 390.5 L 1495.5 390.5 Z M 1168.5 366.5 L 1202.5 366.5 L 1202.5 390.5 L 1168.5 390.5 Z M 1254.5 366.5 L 1282.5 366.5 L 1282.5 390.5 L 1254.5 390.5 Z M 1254.5 390.5 L 1282.5 390.5 L 1282.5 408.5 L 1254.5 408.5 Z M 1088.5 390.5 L 1116.5 390.5 L 1116.5 408.5 L 1088.5 408.5 Z M 1329.5 390.5 L 1356.5 390.5 L 1356.5 408.5 L 1329.5 408.5 Z M 1168.5 390.5 L 1202.5 390.5 L 1202.5 408.5 L 1168.5 408.5 Z M 1409.5 390.5 L 1443.5 390.5 L 1443.5 408.5 L 1409.5 408.5 Z M 1495.5 390.5 L 1523.5 390.5 L 1523.5 408.5 L 1495.5 408.5 Z M 1168.5 408.5 L 1202.5 408.5 L 1202.5 433.5 L 1168.5 433.5 Z M 1088.5 408.5 L 1116.5 408.5 L 1116.5 433.5 L 1088.5 433.5 Z M 1329.5 408.5 L 1356.5 408.5 L 1356.5 433.5 L 1329.5 433.5 Z M 1254.5 408.5 L 1282.5 408.5 L 1282.5 433.5 L 1254.5 433.5 Z M 1409.5 408.5 L 1443.5 408.5 L 1443.5 433.5 L 1409.5 433.5 Z M 1495.5 408.5 L 1523.5 408.5 L 1523.5 433.5 L 1495.5 433.5 Z M 1409.5 433.5 L 1443.5 433.5 L 1443.5 451.5 L 1409.5 451.5 Z M 1088.5 433.5 L 1116.5 433.5 L 1116.5 451.5 L 1088.5 451.5 Z M 1254.5 433.5 L 1282.5 433.5 L 1282.5 451.5 L 1254.5 451.5 Z M 1329.5 433.5 L 1356.5 433.5 L 1356.5 451.5 L 1329.5 451.5 Z M 1495.5 433.5 L 1523.5 433.5 L 1523.5 451.5 L 1495.5 451.5 Z M 1168.5 433.5 L 1202.5 433.5 L 1202.5 451.5 L 1168.5 451.5 Z M 1254.5 451.5 L 1282.5 451.5 L 1282.5 475.5 L 1254.5 475.5 Z M 1168.5 451.5 L 1202.5 451.5 L 1202.5 475.5 L 1168.5 475.5 Z M 1088.5 451.5 L 1116.5 451.5 L 1116.5 475.5 L 1088.5 475.5 Z M 1409.5 451.5 L 1443.5 451.5 L 1443.5 475.5 L 1409.5 475.5 Z M 1329.5 451.5 L 1356.5 451.5 L 1356.5 475.5 L 1329.5 475.5 Z M 1495.5 451.5 L 1523.5 451.5 L 1523.5 475.5 L 1495.5 475.5 Z M 1168.5 475.5 L 1202.5 475.5 L 1202.5 493.5 L 1168.5 493.5 Z M 1088.5 475.5 L 1116.5 475.5 L 1116.5 493.5 L 1088.5 493.5 Z M 1495.5 475.5 L 1523.5 475.5 L 1523.5 493.5 L 1495.5 493.5 Z M 1409.5 475.5 L 1443.5 475.5 L 1443.5 493.5 L 1409.5 493.5 Z M 1329.5 475.5 L 1356.5 475.5 L 1356.5 493.5 L 1329.5 493.5 Z M 1254.5 475.5 L 1282.5 475.5 L 1282.5 493.5 L 1254.5 493.5 Z M 1254.5 493.5 L 1282.5 493.5 L 1282.5 499.5 L 1254.5 499.5 Z M 1088.5 493.5 L 1116.5 493.5 L 1116.5 499.5 L 1088.5 499.5 Z M 1495.5 493.5 L 1523.5 493.5 L 1523.5 499.5 L 1495.5 499.5 Z M 1168.5 493.5 L 1202.5 493.5 L 1202.5 499.5 L 1168.5 499.5 Z M 1409.5 493.5 L 1443.5 493.5 L 1443.5 499.5 L 1409.5 499.5 Z M 1329.5 493.5 L 1356.5 493.5 L 1356.5 499.5 L 1329.5 499.5 Z M 1081.5 602.5 L 1111.5 602.5 L 1111.5 608.5 L 1081.5 608.5 Z M 1382.5 602.5 L 1412.5 602.5 L 1412.5 608.5 L 1382.5 608.5 Z M 1231.5 602.5 L 1262.5 602.5 L 1262.5 608.5 L 1231.5 608.5 Z M 1480.5 602.5 L 1511.5 602.5 L 1511.5 608.5 L 1480.5 608.5 Z M 1382.5 608.5 L 1412.5 608.5 L 1412.5 624.5 L 1382.5 624.5 Z M 1231.5 608.5 L 1262.5 608.5 L 1262.5 624.5 L 1231.5 624.5 Z M 1480.5 608.5 L 1511.5 608.5 L 1511.5 624.5 L 1480.5 624.5 Z M 1081.5 608.5 L 1111.5 608.5 L 1111.5 624.5 L 1081.5 624.5 Z M 1223.5 624.5 L 1269.5 624.5 L 1269.5 626.5 L 1223.5 626.5 Z M 1081.5 624.5 L 1119.5 624.5 L 1119.5 626.5 L 1081.5 626.5 Z M 1374.5 624.5 L 1420.5 624.5 L 1420.5 626.5 L 1374.5 626.5 Z M 1472.5 624.5 L 1511.5 624.5 L 1511.5 626.5 L 1472.5 626.5 Z M 1472.5 626.5 L 1511.5 626.5 L 1511.5 643.5 L 1472.5 643.5 Z M 1223.5 626.5 L 1269.5 626.5 L 1269.5 643.5 L 1223.5 643.5 Z M 1374.5 626.5 L 1420.5 626.5 L 1420.5 643.5 L 1374.5 643.5 Z M 1081.5 626.5 L 1119.5 626.5 L 1119.5 643.5 L 1081.5 643.5 Z M 1223.5 643.5 L 1269.5 643.5 L 1269.5 661.5 L 1223.5 661.5 Z M 1374.5 643.5 L 1420.5 643.5 L 1420.5 661.5 L 1374.5 661.5 Z M 1472.5 643.5 L 1511.5 643.5 L 1511.5 661.5 L 1472.5 661.5 Z M 1081.5 643.5 L 1119.5 643.5 L 1119.5 661.5 L 1081.5 661.5 Z M 1081.5 661.5 L 1119.5 661.5 L 1119.5 668.5 L 1081.5 668.5 Z M 1374.5 661.5 L 1420.5 661.5 L 1420.5 668.5 L 1374.5 668.5 Z M 1472.5 661.5 L 1511.5 661.5 L 1511.5 668.5 L 1472.5 668.5 Z M 1223.5 661.5 L 1269.5 661.5 L 1269.5 668.5 L 1223.5 668.5 Z M 383.5 953.5 L 1538.5 953.5 L 1538.5 971.5 L 383.5 971.5 Z M 383.5 953.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1356.5 166.5 L 1409.5 166.5 L 1409.5 245.5 L 1356.5 245.5 Z M 1443.5 166.5 L 1495.5 166.5 L 1495.5 245.5 L 1443.5 245.5 Z M 758.5 166.5 L 810.5 166.5 L 810.5 323.5 L 758.5 323.5 Z M 839.5 166.5 L 892.5 166.5 L 892.5 323.5 L 839.5 323.5 Z M 771.5 795.5 L 787.5 795.5 L 787.5 883.5 L 771.5 883.5 Z M 726.5 795.5 L 742.5 795.5 L 742.5 883.5 L 726.5 883.5 Z M 1202.5 749.5 L 1254.5 749.5 L 1254.5 906.5 L 1202.5 906.5 Z M 1039.5 749.5 L 1091.5 749.5 L 1091.5 906.5 L 1039.5 906.5 Z M 957.5 749.5 L 1009.5 749.5 L 1009.5 906.5 L 957.5 906.5 Z M 1284.5 749.5 L 1336.5 749.5 L 1336.5 906.5 L 1284.5 906.5 Z M 1284.5 749.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1116.5 342.5 L 1168.5 342.5 L 1168.5 499.5 L 1116.5 499.5 Z M 1443.5 342.5 L 1495.5 342.5 L 1495.5 499.5 L 1443.5 499.5 Z M 1356.5 342.5 L 1409.5 342.5 L 1409.5 499.5 L 1356.5 499.5 Z M 1202.5 342.5 L 1254.5 342.5 L 1254.5 499.5 L 1202.5 499.5 Z M 1420.5 624.5 L 1472.5 624.5 L 1472.5 668.5 L 1420.5 668.5 Z M 1269.5 624.5 L 1374.5 624.5 L 1374.5 668.5 L 1269.5 668.5 Z M 1119.5 624.5 L 1223.5 624.5 L 1223.5 668.5 L 1119.5 668.5 Z M 771.5 644.5 L 787.5 644.5 L 787.5 732.5 L 771.5 732.5 Z M 726.5 644.5 L 742.5 644.5 L 742.5 732.5 L 726.5 732.5 Z M 726.5 644.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -94,15 +94,15 @@
 <clipPath id="clip15">
   <path d="M 399.5 101.5 L 417.5 101.5 L 417.5 119.5 L 399.5 119.5 Z M 1504.5 101.5 L 1522.5 101.5 L 1522.5 119.5 L 1504.5 119.5 Z M 1454.5 101.5 L 1472.5 101.5 L 1472.5 119.5 L 1454.5 119.5 Z M 1404.5 101.5 L 1422.5 101.5 L 1422.5 119.5 L 1404.5 119.5 Z M 1354.5 101.5 L 1371.5 101.5 L 1371.5 119.5 L 1354.5 119.5 Z M 1303.5 101.5 L 1321.5 101.5 L 1321.5 119.5 L 1303.5 119.5 Z M 1253.5 101.5 L 1271.5 101.5 L 1271.5 119.5 L 1253.5 119.5 Z M 1203.5 101.5 L 1221.5 101.5 L 1221.5 119.5 L 1203.5 119.5 Z M 1153.5 101.5 L 1171.5 101.5 L 1171.5 119.5 L 1153.5 119.5 Z M 1103.5 101.5 L 1120.5 101.5 L 1120.5 119.5 L 1103.5 119.5 Z M 1052.5 101.5 L 1070.5 101.5 L 1070.5 119.5 L 1052.5 119.5 Z M 1002.5 101.5 L 1020.5 101.5 L 1020.5 119.5 L 1002.5 119.5 Z M 952.5 101.5 L 970.5 101.5 L 970.5 119.5 L 952.5 119.5 Z M 902.5 101.5 L 919.5 101.5 L 919.5 119.5 L 902.5 119.5 Z M 851.5 101.5 L 869.5 101.5 L 869.5 119.5 L 851.5 119.5 Z M 801.5 101.5 L 819.5 101.5 L 819.5 119.5 L 801.5 119.5 Z M 751.5 101.5 L 769.5 101.5 L 769.5 119.5 L 751.5 119.5 Z M 701.5 101.5 L 719.5 101.5 L 719.5 119.5 L 701.5 119.5 Z M 650.5 101.5 L 668.5 101.5 L 668.5 119.5 L 650.5 119.5 Z M 600.5 101.5 L 618.5 101.5 L 618.5 119.5 L 600.5 119.5 Z M 550.5 101.5 L 568.5 101.5 L 568.5 119.5 L 550.5 119.5 Z M 500.5 101.5 L 518.5 101.5 L 518.5 119.5 L 500.5 119.5 Z M 450.5 101.5 L 467.5 101.5 L 467.5 119.5 L 450.5 119.5 Z M 715.5 155.5 L 733.5 155.5 L 733.5 173.5 L 715.5 173.5 Z M 1438.5 155.5 L 1456.5 155.5 L 1456.5 173.5 L 1438.5 173.5 Z M 1400.5 155.5 L 1418.5 155.5 L 1418.5 173.5 L 1400.5 173.5 Z M 916.5 155.5 L 934.5 155.5 L 934.5 173.5 L 916.5 173.5 Z M 879.5 155.5 L 896.5 155.5 L 896.5 173.5 L 879.5 173.5 Z M 753.5 155.5 L 771.5 155.5 L 771.5 173.5 L 753.5 173.5 Z M 1438.5 474.5 L 1456.5 474.5 L 1456.5 492.5 L 1438.5 492.5 Z M 1400.5 474.5 L 1418.5 474.5 L 1418.5 492.5 L 1400.5 492.5 Z M 1197.5 474.5 L 1215.5 474.5 L 1215.5 492.5 L 1197.5 492.5 Z M 1160.5 474.5 L 1177.5 474.5 L 1177.5 492.5 L 1160.5 492.5 Z M 399.5 527.5 L 417.5 527.5 L 417.5 545.5 L 399.5 545.5 Z M 1404.5 527.5 L 1422.5 527.5 L 1422.5 545.5 L 1404.5 545.5 Z M 1354.5 527.5 L 1371.5 527.5 L 1371.5 545.5 L 1354.5 545.5 Z M 1303.5 527.5 L 1321.5 527.5 L 1321.5 545.5 L 1303.5 545.5 Z M 1253.5 527.5 L 1271.5 527.5 L 1271.5 545.5 L 1253.5 545.5 Z M 1504.5 527.5 L 1522.5 527.5 L 1522.5 545.5 L 1504.5 545.5 Z M 1454.5 527.5 L 1472.5 527.5 L 1472.5 545.5 L 1454.5 545.5 Z M 1483.5 581.5 L 1501.5 581.5 L 1501.5 598.5 L 1483.5 598.5 Z M 1446.5 581.5 L 1464.5 581.5 L 1464.5 598.5 L 1446.5 598.5 Z M 1219.5 581.5 L 1236.5 581.5 L 1236.5 598.5 L 1219.5 598.5 Z M 1256.5 581.5 L 1274.5 581.5 L 1274.5 598.5 L 1256.5 598.5 Z M 785.5 619.5 L 803.5 619.5 L 803.5 637.5 L 785.5 637.5 Z M 748.5 625.5 L 766.5 625.5 L 766.5 643.5 L 748.5 643.5 Z M 1116.5 900.5 L 1133.5 900.5 L 1133.5 918.5 L 1116.5 918.5 Z M 748.5 900.5 L 766.5 900.5 L 766.5 918.5 L 748.5 918.5 Z M 915.5 900.5 L 932.5 900.5 L 932.5 918.5 L 915.5 918.5 Z M 952.5 900.5 L 970.5 900.5 L 970.5 918.5 L 952.5 918.5 Z M 1078.5 900.5 L 1096.5 900.5 L 1096.5 918.5 L 1078.5 918.5 Z M 710.5 906.5 L 728.5 906.5 L 728.5 924.5 L 710.5 924.5 Z M 785.5 906.5 L 803.5 906.5 L 803.5 924.5 L 785.5 924.5 Z M 399.5 953.5 L 417.5 953.5 L 417.5 971.5 L 399.5 971.5 Z M 1504.5 953.5 L 1522.5 953.5 L 1522.5 971.5 L 1504.5 971.5 Z M 1454.5 953.5 L 1472.5 953.5 L 1472.5 971.5 L 1454.5 971.5 Z M 1404.5 953.5 L 1422.5 953.5 L 1422.5 971.5 L 1404.5 971.5 Z M 1354.5 953.5 L 1371.5 953.5 L 1371.5 971.5 L 1354.5 971.5 Z M 1303.5 953.5 L 1321.5 953.5 L 1321.5 971.5 L 1303.5 971.5 Z M 1253.5 953.5 L 1271.5 953.5 L 1271.5 971.5 L 1253.5 971.5 Z M 1203.5 953.5 L 1221.5 953.5 L 1221.5 971.5 L 1203.5 971.5 Z M 1153.5 953.5 L 1171.5 953.5 L 1171.5 971.5 L 1153.5 971.5 Z M 1103.5 953.5 L 1120.5 953.5 L 1120.5 971.5 L 1103.5 971.5 Z M 1052.5 953.5 L 1070.5 953.5 L 1070.5 971.5 L 1052.5 971.5 Z M 1002.5 953.5 L 1020.5 953.5 L 1020.5 971.5 L 1002.5 971.5 Z M 952.5 953.5 L 970.5 953.5 L 970.5 971.5 L 952.5 971.5 Z M 902.5 953.5 L 919.5 953.5 L 919.5 971.5 L 902.5 971.5 Z M 851.5 953.5 L 869.5 953.5 L 869.5 971.5 L 851.5 971.5 Z M 801.5 953.5 L 819.5 953.5 L 819.5 971.5 L 801.5 971.5 Z M 751.5 953.5 L 769.5 953.5 L 769.5 971.5 L 751.5 971.5 Z M 701.5 953.5 L 719.5 953.5 L 719.5 971.5 L 701.5 971.5 Z M 650.5 953.5 L 668.5 953.5 L 668.5 971.5 L 650.5 971.5 Z M 600.5 953.5 L 618.5 953.5 L 618.5 971.5 L 600.5 971.5 Z M 550.5 953.5 L 568.5 953.5 L 568.5 971.5 L 550.5 971.5 Z M 500.5 953.5 L 518.5 953.5 L 518.5 971.5 L 500.5 971.5 Z M 450.5 953.5 L 467.5 953.5 L 467.5 971.5 L 450.5 971.5 Z M 450.5 953.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface365">
+<g id="surface396">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -222,6 +222,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 991.824219 541.082031 L 991.761719 542.070312 L 991.605469 542.964844 L 991.328125 543.796875 L 990.957031 544.539062 L 990.464844 545.246094 L 989.878906 545.863281 L 989.230469 546.390625 L 988.550781 546.789062 L 987.78125 547.097656 L 986.976562 547.347656 L 986.113281 547.46875 L 985.1875 547.5 L 975.039062 547.5 L 975.039062 525.007812 L 984.171875 525.007812 L 985.496094 525.097656 L 986.667969 525.316406 L 987.71875 525.683594 L 988.613281 526.210938 L 989.386719 526.886719 L 990.003906 527.722656 L 990.25 528.183594 L 990.464844 528.679688 L 990.621094 529.140625 L 990.742188 529.664062 L 990.804688 530.191406 L 990.835938 530.714844 L 990.742188 531.824219 L 990.464844 532.78125 L 990.03125 533.675781 L 989.414062 534.417969 L 988.644531 535.097656 L 987.71875 535.621094 L 988.613281 536.023438 L 989.386719 536.453125 L 990.0625 536.949219 L 990.621094 537.503906 L 991.050781 538.089844 L 991.390625 538.707031 L 991.515625 539.078125 L 991.605469 539.445312 L 991.699219 539.816406 L 991.761719 540.25 L 991.792969 540.648438 Z M 987.964844 531.117188 L 987.875 530.191406 L 987.59375 529.417969 L 987.164062 528.738281 L 986.546875 528.246094 L 985.773438 527.875 L 984.820312 527.628906 L 984.601562 527.628906 L 984.171875 527.566406 L 983.675781 527.566406 L 983.460938 527.535156 L 977.90625 527.535156 L 977.90625 534.695312 L 983.460938 534.695312 L 984.601562 534.632812 L 985.589844 534.449219 L 986.421875 534.109375 L 987.039062 533.644531 L 987.535156 533.027344 L 987.84375 532.289062 L 987.875 532.132812 L 987.902344 531.949219 L 987.933594 531.765625 L 987.933594 531.332031 Z M 984.910156 544.96875 L 985.773438 544.9375 L 986.546875 544.753906 L 987.226562 544.445312 L 987.78125 544.042969 L 988.242188 543.519531 L 988.613281 542.871094 L 988.707031 542.625 L 988.769531 542.347656 L 988.859375 542.039062 L 988.890625 541.761719 L 988.921875 541.453125 L 988.953125 541.113281 L 988.890625 540.433594 L 988.769531 539.785156 L 988.550781 539.230469 L 988.242188 538.707031 L 987.84375 538.273438 L 987.378906 537.875 L 987.039062 537.6875 L 986.667969 537.535156 L 986.269531 537.410156 L 985.835938 537.316406 L 985.375 537.257812 L 984.910156 537.226562 L 977.90625 537.226562 L 977.90625 544.96875 Z M 984.910156 544.96875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 383 555 L 1538 555 M 383 531 L 1538 531 M 383 531 L 383 555 M 1538 531 L 1538 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 383 555 L 1538 555 M 383 531 L 1538 531 M 1538 555 L 1538 531 M 383 555 L 383 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 383 112 L 383 121 M 378 117 L 387 117 M 382 118 L 384 118 M 382 116 L 384 116 M 382 116 L 382 118 M 384 116 L 384 118 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2/sky130_fd_sc_hvl__mux2_1.svg b/cells/mux2/sky130_fd_sc_hvl__mux2_1.svg
index 61c9e9a..c70db96 100644
--- a/cells/mux2/sky130_fd_sc_hvl__mux2_1.svg
+++ b/cells/mux2/sky130_fd_sc_hvl__mux2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 396.5 98.5 L 1526.5 98.5 L 1526.5 593.5 L 396.5 593.5 Z M 396.5 98.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 458.5 161.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 494.5 707.5 L 697.5 707.5 L 697.5 715.5 L 494.5 715.5 Z M 494.5 715.5 L 697.5 715.5 L 697.5 747.5 L 494.5 747.5 Z M 494.5 747.5 L 697.5 747.5 L 697.5 770.5 L 494.5 770.5 Z M 494.5 770.5 L 1435.5 770.5 L 1435.5 810.5 L 494.5 810.5 Z M 494.5 810.5 L 1435.5 810.5 L 1435.5 842.5 L 494.5 842.5 Z M 494.5 842.5 L 1435.5 842.5 L 1435.5 850.5 L 494.5 850.5 Z M 494.5 842.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 494.5 245.5 L 548.5 245.5 L 548.5 252.5 L 494.5 252.5 Z M 643.5 245.5 L 697.5 245.5 L 697.5 252.5 L 643.5 252.5 Z M 494.5 252.5 L 548.5 252.5 L 548.5 285.5 L 494.5 285.5 Z M 643.5 252.5 L 697.5 252.5 L 697.5 285.5 L 643.5 285.5 Z M 643.5 285.5 L 697.5 285.5 L 697.5 331.5 L 643.5 331.5 Z M 494.5 285.5 L 548.5 285.5 L 548.5 331.5 L 494.5 331.5 Z M 494.5 331.5 L 548.5 331.5 L 548.5 364.5 L 494.5 364.5 Z M 643.5 331.5 L 697.5 331.5 L 697.5 364.5 L 643.5 364.5 Z M 643.5 364.5 L 697.5 364.5 L 697.5 404.5 L 643.5 404.5 Z M 494.5 364.5 L 548.5 364.5 L 548.5 411.5 L 494.5 411.5 Z M 643.5 404.5 L 718.5 404.5 L 718.5 411.5 L 643.5 411.5 Z M 1380.5 404.5 L 1435.5 404.5 L 1435.5 428.5 L 1380.5 428.5 Z M 1232.5 404.5 L 1285.5 404.5 L 1285.5 428.5 L 1232.5 428.5 Z M 948.5 404.5 L 1002.5 404.5 L 1002.5 428.5 L 948.5 428.5 Z M 494.5 411.5 L 548.5 411.5 L 548.5 444.5 L 494.5 444.5 Z M 643.5 411.5 L 718.5 411.5 L 718.5 444.5 L 643.5 444.5 Z M 1380.5 428.5 L 1435.5 428.5 L 1435.5 461.5 L 1380.5 461.5 Z M 948.5 428.5 L 1002.5 428.5 L 1002.5 461.5 L 948.5 461.5 Z M 1232.5 428.5 L 1285.5 428.5 L 1285.5 461.5 L 1232.5 461.5 Z M 813.5 404.5 L 853.5 404.5 L 853.5 484.5 L 813.5 484.5 Z M 1380.5 461.5 L 1435.5 461.5 L 1435.5 484.5 L 1380.5 484.5 Z M 948.5 461.5 L 1002.5 461.5 L 1002.5 484.5 L 948.5 484.5 Z M 643.5 444.5 L 718.5 444.5 L 718.5 484.5 L 643.5 484.5 Z M 1232.5 461.5 L 1285.5 461.5 L 1285.5 484.5 L 1232.5 484.5 Z M 1097.5 404.5 L 1137.5 404.5 L 1137.5 484.5 L 1097.5 484.5 Z M 643.5 484.5 L 697.5 484.5 L 697.5 490.5 L 643.5 490.5 Z M 494.5 444.5 L 548.5 444.5 L 548.5 490.5 L 494.5 490.5 Z M 494.5 490.5 L 548.5 490.5 L 548.5 522.5 L 494.5 522.5 Z M 643.5 490.5 L 697.5 490.5 L 697.5 522.5 L 643.5 522.5 Z M 643.5 522.5 L 697.5 522.5 L 697.5 530.5 L 643.5 530.5 Z M 494.5 522.5 L 548.5 522.5 L 548.5 530.5 L 494.5 530.5 Z M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 548.5 707.5 L 643.5 707.5 L 643.5 850.5 L 548.5 850.5 Z M 1285.5 770.5 L 1380.5 770.5 L 1380.5 850.5 L 1285.5 850.5 Z M 1137.5 770.5 L 1232.5 770.5 L 1232.5 850.5 L 1137.5 850.5 Z M 1002.5 770.5 L 1097.5 770.5 L 1097.5 850.5 L 1002.5 850.5 Z M 853.5 770.5 L 948.5 770.5 L 948.5 850.5 L 853.5 850.5 Z M 718.5 770.5 L 813.5 770.5 L 813.5 850.5 L 718.5 850.5 Z M 718.5 770.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image343"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 718.5 404.5 L 813.5 404.5 L 813.5 484.5 L 718.5 484.5 Z M 1285.5 404.5 L 1380.5 404.5 L 1380.5 484.5 L 1285.5 484.5 Z M 1137.5 404.5 L 1232.5 404.5 L 1232.5 484.5 L 1137.5 484.5 Z M 1002.5 404.5 L 1097.5 404.5 L 1097.5 484.5 L 1002.5 484.5 Z M 853.5 404.5 L 948.5 404.5 L 948.5 484.5 L 853.5 484.5 Z M 548.5 245.5 L 643.5 245.5 L 643.5 530.5 L 548.5 530.5 Z M 548.5 245.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 488.5 161.5 L 520.5 161.5 L 520.5 193.5 L 488.5 193.5 Z M 1401.5 161.5 L 1434.5 161.5 L 1434.5 193.5 L 1401.5 193.5 Z M 1310.5 161.5 L 1342.5 161.5 L 1342.5 193.5 L 1310.5 193.5 Z M 1219.5 161.5 L 1251.5 161.5 L 1251.5 193.5 L 1219.5 193.5 Z M 1127.5 161.5 L 1160.5 161.5 L 1160.5 193.5 L 1127.5 193.5 Z M 1036.5 161.5 L 1068.5 161.5 L 1068.5 193.5 L 1036.5 193.5 Z M 945.5 161.5 L 977.5 161.5 L 977.5 193.5 L 945.5 193.5 Z M 853.5 161.5 L 886.5 161.5 L 886.5 193.5 L 853.5 193.5 Z M 762.5 161.5 L 794.5 161.5 L 794.5 193.5 L 762.5 193.5 Z M 671.5 161.5 L 703.5 161.5 L 703.5 193.5 L 671.5 193.5 Z M 579.5 161.5 L 612.5 161.5 L 612.5 193.5 L 579.5 193.5 Z M 592.5 252.5 L 624.5 252.5 L 624.5 285.5 L 592.5 285.5 Z M 1319.5 252.5 L 1351.5 252.5 L 1351.5 285.5 L 1319.5 285.5 Z M 1250.5 252.5 L 1282.5 252.5 L 1282.5 285.5 L 1250.5 285.5 Z M 1182.5 252.5 L 1214.5 252.5 L 1214.5 285.5 L 1182.5 285.5 Z M 1113.5 252.5 L 1145.5 252.5 L 1145.5 285.5 L 1113.5 285.5 Z M 660.5 252.5 L 692.5 252.5 L 692.5 285.5 L 660.5 285.5 Z M 572.5 844.5 L 604.5 844.5 L 604.5 876.5 L 572.5 876.5 Z M 1320.5 844.5 L 1352.5 844.5 L 1352.5 876.5 L 1320.5 876.5 Z M 1251.5 844.5 L 1283.5 844.5 L 1283.5 876.5 L 1251.5 876.5 Z M 1182.5 844.5 L 1215.5 844.5 L 1215.5 876.5 L 1182.5 876.5 Z M 1114.5 844.5 L 1146.5 844.5 L 1146.5 876.5 L 1114.5 876.5 Z M 1045.5 844.5 L 1078.5 844.5 L 1078.5 876.5 L 1045.5 876.5 Z M 846.5 844.5 L 878.5 844.5 L 878.5 876.5 L 846.5 876.5 Z M 777.5 844.5 L 809.5 844.5 L 809.5 876.5 L 777.5 876.5 Z M 709.5 844.5 L 741.5 844.5 L 741.5 876.5 L 709.5 876.5 Z M 640.5 844.5 L 672.5 844.5 L 672.5 876.5 L 640.5 876.5 Z M 488.5 935.5 L 520.5 935.5 L 520.5 968.5 L 488.5 968.5 Z M 1401.5 935.5 L 1434.5 935.5 L 1434.5 968.5 L 1401.5 968.5 Z M 1310.5 935.5 L 1342.5 935.5 L 1342.5 968.5 L 1310.5 968.5 Z M 1219.5 935.5 L 1251.5 935.5 L 1251.5 968.5 L 1219.5 968.5 Z M 1127.5 935.5 L 1160.5 935.5 L 1160.5 968.5 L 1127.5 968.5 Z M 1036.5 935.5 L 1068.5 935.5 L 1068.5 968.5 L 1036.5 968.5 Z M 945.5 935.5 L 977.5 935.5 L 977.5 968.5 L 945.5 968.5 Z M 853.5 935.5 L 886.5 935.5 L 886.5 968.5 L 853.5 968.5 Z M 762.5 935.5 L 794.5 935.5 L 794.5 968.5 L 762.5 968.5 Z M 671.5 935.5 L 703.5 935.5 L 703.5 968.5 L 671.5 968.5 Z M 579.5 935.5 L 612.5 935.5 L 612.5 968.5 L 579.5 968.5 Z M 579.5 935.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface366">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -210,6 +210,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 508.433594 352.519531 L 522.910156 373.5 L 516.457031 373.5 L 505.292969 356.445312 L 494.074219 373.5 L 487.734375 373.5 L 502.207031 352.519531 L 488.632812 332.601562 L 494.972656 332.601562 L 505.460938 348.648438 L 516.007812 332.601562 L 522.234375 332.601562 Z M 508.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 488 742 L 520 742 M 488 710 L 520 710 M 488 710 L 488 742 M 520 710 L 520 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 488 742 L 520 742 M 488 710 L 520 710 M 520 742 L 520 710 M 488 742 L 488 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 458 122 L 458 131 M 453 127 L 462 127 M 457 128 L 459 128 M 457 126 L 459 126 M 457 126 L 457 128 M 459 126 L 459 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux4/sky130_fd_sc_hvl__mux4_1.svg b/cells/mux4/sky130_fd_sc_hvl__mux4_1.svg
index 7b3c4dd..52fab3e 100644
--- a/cells/mux4/sky130_fd_sc_hvl__mux4_1.svg
+++ b/cells/mux4/sky130_fd_sc_hvl__mux4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 260.5 L 1743.5 260.5 L 1743.5 570.5 L 174.5 570.5 Z M 174.5 260.5 "/>
 </clipPath>
-<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image486" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image456"/>
+  <use xlink:href="#image486"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 213.5 299.5 L 1704.5 299.5 L 1704.5 319.5 L 213.5 319.5 Z M 213.5 299.5 "/>
 </clipPath>
-<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image487" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image457"/>
+  <use xlink:href="#image487"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 213.5 299.5 L 1704.5 299.5 L 1704.5 319.5 L 213.5 319.5 Z M 1442.5 631.5 L 1686.5 631.5 L 1686.5 646.5 L 1442.5 646.5 Z M 1442.5 646.5 L 1686.5 646.5 L 1686.5 666.5 L 1442.5 666.5 Z M 1442.5 666.5 L 1686.5 666.5 L 1686.5 681.5 L 1442.5 681.5 Z M 1183.5 677.5 L 1404.5 677.5 L 1404.5 687.5 L 1183.5 687.5 Z M 1561.5 681.5 L 1686.5 681.5 L 1686.5 696.5 L 1561.5 696.5 Z M 231.5 681.5 L 1097.5 681.5 L 1097.5 696.5 L 231.5 696.5 Z M 1183.5 687.5 L 1404.5 687.5 L 1404.5 707.5 L 1183.5 707.5 Z M 1561.5 696.5 L 1686.5 696.5 L 1686.5 716.5 L 1561.5 716.5 Z M 231.5 696.5 L 1097.5 696.5 L 1097.5 717.5 L 231.5 717.5 Z M 1561.5 716.5 L 1686.5 716.5 L 1686.5 721.5 L 1561.5 721.5 Z M 1183.5 707.5 L 1404.5 707.5 L 1404.5 727.5 L 1183.5 727.5 Z M 231.5 717.5 L 1097.5 717.5 L 1097.5 731.5 L 231.5 731.5 Z M 231.5 717.5 "/>
 </clipPath>
-<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image488" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image458"/>
+  <use xlink:href="#image488"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 213.5 785.5 L 1704.5 785.5 L 1704.5 806.5 L 213.5 806.5 Z M 213.5 785.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image457"/>
+  <use xlink:href="#image487"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1549.5 352.5 L 1595.5 352.5 L 1595.5 356.5 L 1549.5 356.5 Z M 1654.5 352.5 L 1686.5 352.5 L 1686.5 359.5 L 1654.5 359.5 Z M 1549.5 356.5 L 1595.5 356.5 L 1595.5 377.5 L 1549.5 377.5 Z M 1654.5 359.5 L 1686.5 359.5 L 1686.5 379.5 L 1654.5 379.5 Z M 1210.5 378.5 L 1244.5 378.5 L 1244.5 386.5 L 1210.5 386.5 Z M 1047.5 371.5 L 1081.5 371.5 L 1081.5 386.5 L 1047.5 386.5 Z M 231.5 371.5 L 263.5 371.5 L 263.5 386.5 L 231.5 386.5 Z M 323.5 371.5 L 356.5 371.5 L 356.5 386.5 L 323.5 386.5 Z M 691.5 371.5 L 724.5 371.5 L 724.5 386.5 L 691.5 386.5 Z M 869.5 371.5 L 902.5 371.5 L 902.5 386.5 L 869.5 386.5 Z M 501.5 371.5 L 534.5 371.5 L 534.5 389.5 L 501.5 389.5 Z M 1116.5 378.5 L 1150.5 378.5 L 1150.5 393.5 L 1116.5 393.5 Z M 1303.5 378.5 L 1382.5 378.5 L 1382.5 393.5 L 1303.5 393.5 Z M 691.5 386.5 L 724.5 386.5 L 724.5 406.5 L 691.5 406.5 Z M 869.5 386.5 L 902.5 386.5 L 902.5 406.5 L 869.5 406.5 Z M 323.5 386.5 L 356.5 386.5 L 356.5 406.5 L 323.5 406.5 Z M 1549.5 377.5 L 1595.5 377.5 L 1595.5 406.5 L 1549.5 406.5 Z M 1047.5 386.5 L 1081.5 386.5 L 1081.5 406.5 L 1047.5 406.5 Z M 231.5 386.5 L 263.5 386.5 L 263.5 406.5 L 231.5 406.5 Z M 1210.5 386.5 L 1244.5 386.5 L 1244.5 406.5 L 1210.5 406.5 Z M 1654.5 379.5 L 1686.5 379.5 L 1686.5 407.5 L 1654.5 407.5 Z M 501.5 389.5 L 534.5 389.5 L 534.5 410.5 L 501.5 410.5 Z M 1116.5 393.5 L 1150.5 393.5 L 1150.5 413.5 L 1116.5 413.5 Z M 1303.5 393.5 L 1382.5 393.5 L 1382.5 413.5 L 1303.5 413.5 Z M 594.5 371.5 L 631.5 371.5 L 631.5 421.5 L 594.5 421.5 Z M 1047.5 406.5 L 1081.5 406.5 L 1081.5 421.5 L 1047.5 421.5 Z M 869.5 406.5 L 902.5 406.5 L 902.5 421.5 L 869.5 421.5 Z M 323.5 406.5 L 356.5 406.5 L 356.5 421.5 L 323.5 421.5 Z M 231.5 406.5 L 263.5 406.5 L 263.5 421.5 L 231.5 421.5 Z M 501.5 410.5 L 534.5 410.5 L 534.5 421.5 L 501.5 421.5 Z M 784.5 371.5 L 809.5 371.5 L 809.5 421.5 L 784.5 421.5 Z M 691.5 406.5 L 724.5 406.5 L 724.5 421.5 L 691.5 421.5 Z M 416.5 371.5 L 441.5 371.5 L 441.5 421.5 L 416.5 421.5 Z M 962.5 371.5 L 987.5 371.5 L 987.5 421.5 L 962.5 421.5 Z M 1549.5 406.5 L 1595.5 406.5 L 1595.5 426.5 L 1549.5 426.5 Z M 1654.5 407.5 L 1686.5 407.5 L 1686.5 427.5 L 1654.5 427.5 Z M 1116.5 413.5 L 1150.5 413.5 L 1150.5 428.5 L 1116.5 428.5 Z M 1303.5 413.5 L 1382.5 413.5 L 1382.5 428.5 L 1303.5 428.5 Z M 1210.5 406.5 L 1244.5 406.5 L 1244.5 428.5 L 1210.5 428.5 Z M 1654.5 427.5 L 1686.5 427.5 L 1686.5 456.5 L 1654.5 456.5 Z M 1549.5 426.5 L 1595.5 426.5 L 1595.5 456.5 L 1549.5 456.5 Z M 1654.5 456.5 L 1686.5 456.5 L 1686.5 476.5 L 1654.5 476.5 Z M 1549.5 456.5 L 1595.5 456.5 L 1595.5 476.5 L 1549.5 476.5 Z M 1549.5 476.5 L 1595.5 476.5 L 1595.5 481.5 L 1549.5 481.5 Z M 1445.5 481.5 L 1476.5 481.5 L 1476.5 496.5 L 1445.5 496.5 Z M 1654.5 476.5 L 1686.5 476.5 L 1686.5 503.5 L 1654.5 503.5 Z M 1536.5 481.5 L 1595.5 481.5 L 1595.5 506.5 L 1536.5 506.5 Z M 1445.5 496.5 L 1476.5 496.5 L 1476.5 516.5 L 1445.5 516.5 Z M 1654.5 503.5 L 1686.5 503.5 L 1686.5 524.5 L 1654.5 524.5 Z M 1536.5 506.5 L 1595.5 506.5 L 1595.5 526.5 L 1536.5 526.5 Z M 1654.5 524.5 L 1686.5 524.5 L 1686.5 531.5 L 1654.5 531.5 Z M 1445.5 516.5 L 1476.5 516.5 L 1476.5 531.5 L 1445.5 531.5 Z M 1536.5 526.5 L 1595.5 526.5 L 1595.5 531.5 L 1536.5 531.5 Z M 213.5 785.5 L 1704.5 785.5 L 1704.5 806.5 L 213.5 806.5 Z M 213.5 785.5 "/>
 </clipPath>
-<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image489" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image459"/>
+  <use xlink:href="#image489"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1476.5 631.5 L 1536.5 631.5 L 1536.5 681.5 L 1476.5 681.5 Z M 1595.5 631.5 L 1654.5 631.5 L 1654.5 721.5 L 1595.5 721.5 Z M 1217.5 677.5 L 1277.5 677.5 L 1277.5 727.5 L 1217.5 727.5 Z M 1310.5 677.5 L 1370.5 677.5 L 1370.5 727.5 L 1310.5 727.5 Z M 534.5 681.5 L 594.5 681.5 L 594.5 731.5 L 534.5 731.5 Z M 1004.5 681.5 L 1063.5 681.5 L 1063.5 731.5 L 1004.5 731.5 Z M 919.5 681.5 L 978.5 681.5 L 978.5 731.5 L 919.5 731.5 Z M 826.5 681.5 L 885.5 681.5 L 885.5 731.5 L 826.5 731.5 Z M 741.5 681.5 L 800.5 681.5 L 800.5 731.5 L 741.5 731.5 Z M 619.5 681.5 L 679.5 681.5 L 679.5 731.5 L 619.5 731.5 Z M 356.5 681.5 L 416.5 681.5 L 416.5 731.5 L 356.5 731.5 Z M 441.5 681.5 L 501.5 681.5 L 501.5 731.5 L 441.5 731.5 Z M 263.5 681.5 L 323.5 681.5 L 323.5 731.5 L 263.5 731.5 Z M 263.5 681.5 "/>
 </clipPath>
-<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image490" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image460"/>
+  <use xlink:href="#image490"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 263.5 371.5 L 323.5 371.5 L 323.5 421.5 L 263.5 421.5 Z M 534.5 371.5 L 594.5 371.5 L 594.5 421.5 L 534.5 421.5 Z M 902.5 371.5 L 962.5 371.5 L 962.5 421.5 L 902.5 421.5 Z M 356.5 371.5 L 416.5 371.5 L 416.5 421.5 L 356.5 421.5 Z M 987.5 371.5 L 1047.5 371.5 L 1047.5 421.5 L 987.5 421.5 Z M 631.5 371.5 L 691.5 371.5 L 691.5 421.5 L 631.5 421.5 Z M 809.5 371.5 L 869.5 371.5 L 869.5 421.5 L 809.5 421.5 Z M 724.5 371.5 L 784.5 371.5 L 784.5 421.5 L 724.5 421.5 Z M 441.5 371.5 L 501.5 371.5 L 501.5 421.5 L 441.5 421.5 Z M 1244.5 378.5 L 1303.5 378.5 L 1303.5 428.5 L 1244.5 428.5 Z M 1150.5 378.5 L 1210.5 378.5 L 1210.5 428.5 L 1150.5 428.5 Z M 1595.5 352.5 L 1654.5 352.5 L 1654.5 531.5 L 1595.5 531.5 Z M 1476.5 481.5 L 1536.5 481.5 L 1536.5 531.5 L 1476.5 531.5 Z M 1476.5 481.5 "/>
 </clipPath>
-<image id="image461" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image491" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image461"/>
+  <use xlink:href="#image491"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 232.5 299.5 L 252.5 299.5 L 252.5 319.5 L 232.5 319.5 Z M 1665.5 299.5 L 1685.5 299.5 L 1685.5 319.5 L 1665.5 319.5 Z M 1608.5 299.5 L 1628.5 299.5 L 1628.5 319.5 L 1608.5 319.5 Z M 1551.5 299.5 L 1571.5 299.5 L 1571.5 319.5 L 1551.5 319.5 Z M 1493.5 299.5 L 1514.5 299.5 L 1514.5 319.5 L 1493.5 319.5 Z M 1436.5 299.5 L 1456.5 299.5 L 1456.5 319.5 L 1436.5 319.5 Z M 1379.5 299.5 L 1399.5 299.5 L 1399.5 319.5 L 1379.5 319.5 Z M 1321.5 299.5 L 1342.5 299.5 L 1342.5 319.5 L 1321.5 319.5 Z M 1264.5 299.5 L 1284.5 299.5 L 1284.5 319.5 L 1264.5 319.5 Z M 1207.5 299.5 L 1227.5 299.5 L 1227.5 319.5 L 1207.5 319.5 Z M 1149.5 299.5 L 1170.5 299.5 L 1170.5 319.5 L 1149.5 319.5 Z M 1092.5 299.5 L 1112.5 299.5 L 1112.5 319.5 L 1092.5 319.5 Z M 1035.5 299.5 L 1055.5 299.5 L 1055.5 319.5 L 1035.5 319.5 Z M 977.5 299.5 L 998.5 299.5 L 998.5 319.5 L 977.5 319.5 Z M 920.5 299.5 L 940.5 299.5 L 940.5 319.5 L 920.5 319.5 Z M 863.5 299.5 L 883.5 299.5 L 883.5 319.5 L 863.5 319.5 Z M 805.5 299.5 L 826.5 299.5 L 826.5 319.5 L 805.5 319.5 Z M 748.5 299.5 L 768.5 299.5 L 768.5 319.5 L 748.5 319.5 Z M 691.5 299.5 L 711.5 299.5 L 711.5 319.5 L 691.5 319.5 Z M 633.5 299.5 L 654.5 299.5 L 654.5 319.5 L 633.5 319.5 Z M 576.5 299.5 L 596.5 299.5 L 596.5 319.5 L 576.5 319.5 Z M 519.5 299.5 L 539.5 299.5 L 539.5 319.5 L 519.5 319.5 Z M 461.5 299.5 L 482.5 299.5 L 482.5 319.5 L 461.5 319.5 Z M 404.5 299.5 L 424.5 299.5 L 424.5 319.5 L 404.5 319.5 Z M 347.5 299.5 L 367.5 299.5 L 367.5 319.5 L 347.5 319.5 Z M 289.5 299.5 L 310.5 299.5 L 310.5 319.5 L 289.5 319.5 Z M 291.5 356.5 L 311.5 356.5 L 311.5 377.5 L 291.5 377.5 Z M 1533.5 356.5 L 1554.5 356.5 L 1554.5 377.5 L 1533.5 377.5 Z M 1576.5 356.5 L 1597.5 356.5 L 1597.5 377.5 L 1576.5 377.5 Z M 1619.5 356.5 L 1640.5 356.5 L 1640.5 377.5 L 1619.5 377.5 Z M 1059.5 356.5 L 1079.5 356.5 L 1079.5 377.5 L 1059.5 377.5 Z M 1016.5 356.5 L 1036.5 356.5 L 1036.5 377.5 L 1016.5 377.5 Z M 973.5 356.5 L 993.5 356.5 L 993.5 377.5 L 973.5 377.5 Z M 694.5 356.5 L 714.5 356.5 L 714.5 377.5 L 694.5 377.5 Z M 651.5 356.5 L 671.5 356.5 L 671.5 377.5 L 651.5 377.5 Z M 608.5 356.5 L 628.5 356.5 L 628.5 377.5 L 608.5 377.5 Z M 377.5 356.5 L 397.5 356.5 L 397.5 377.5 L 377.5 377.5 Z M 334.5 356.5 L 354.5 356.5 L 354.5 377.5 L 334.5 377.5 Z M 605.5 728.5 L 626.5 728.5 L 626.5 748.5 L 605.5 748.5 Z M 1619.5 728.5 L 1640.5 728.5 L 1640.5 748.5 L 1619.5 748.5 Z M 1576.5 728.5 L 1597.5 728.5 L 1597.5 748.5 L 1576.5 748.5 Z M 1533.5 728.5 L 1554.5 728.5 L 1554.5 748.5 L 1533.5 748.5 Z M 291.5 728.5 L 311.5 728.5 L 311.5 748.5 L 291.5 748.5 Z M 377.5 728.5 L 397.5 728.5 L 397.5 748.5 L 377.5 748.5 Z M 334.5 728.5 L 354.5 728.5 L 354.5 748.5 L 334.5 748.5 Z M 648.5 728.5 L 669.5 728.5 L 669.5 748.5 L 648.5 748.5 Z M 1107.5 728.5 L 1127.5 728.5 L 1127.5 748.5 L 1107.5 748.5 Z M 1064.5 728.5 L 1084.5 728.5 L 1084.5 748.5 L 1064.5 748.5 Z M 691.5 728.5 L 712.5 728.5 L 712.5 748.5 L 691.5 748.5 Z M 232.5 785.5 L 252.5 785.5 L 252.5 806.5 L 232.5 806.5 Z M 1665.5 785.5 L 1685.5 785.5 L 1685.5 806.5 L 1665.5 806.5 Z M 1608.5 785.5 L 1628.5 785.5 L 1628.5 806.5 L 1608.5 806.5 Z M 1551.5 785.5 L 1571.5 785.5 L 1571.5 806.5 L 1551.5 806.5 Z M 1493.5 785.5 L 1514.5 785.5 L 1514.5 806.5 L 1493.5 806.5 Z M 1436.5 785.5 L 1456.5 785.5 L 1456.5 806.5 L 1436.5 806.5 Z M 1379.5 785.5 L 1399.5 785.5 L 1399.5 806.5 L 1379.5 806.5 Z M 1321.5 785.5 L 1342.5 785.5 L 1342.5 806.5 L 1321.5 806.5 Z M 1264.5 785.5 L 1284.5 785.5 L 1284.5 806.5 L 1264.5 806.5 Z M 1207.5 785.5 L 1227.5 785.5 L 1227.5 806.5 L 1207.5 806.5 Z M 1149.5 785.5 L 1170.5 785.5 L 1170.5 806.5 L 1149.5 806.5 Z M 1092.5 785.5 L 1112.5 785.5 L 1112.5 806.5 L 1092.5 806.5 Z M 1035.5 785.5 L 1055.5 785.5 L 1055.5 806.5 L 1035.5 806.5 Z M 977.5 785.5 L 998.5 785.5 L 998.5 806.5 L 977.5 806.5 Z M 920.5 785.5 L 940.5 785.5 L 940.5 806.5 L 920.5 806.5 Z M 863.5 785.5 L 883.5 785.5 L 883.5 806.5 L 863.5 806.5 Z M 805.5 785.5 L 826.5 785.5 L 826.5 806.5 L 805.5 806.5 Z M 748.5 785.5 L 768.5 785.5 L 768.5 806.5 L 748.5 806.5 Z M 691.5 785.5 L 711.5 785.5 L 711.5 806.5 L 691.5 806.5 Z M 633.5 785.5 L 654.5 785.5 L 654.5 806.5 L 633.5 806.5 Z M 576.5 785.5 L 596.5 785.5 L 596.5 806.5 L 576.5 806.5 Z M 519.5 785.5 L 539.5 785.5 L 539.5 806.5 L 519.5 806.5 Z M 461.5 785.5 L 482.5 785.5 L 482.5 806.5 L 461.5 806.5 Z M 404.5 785.5 L 424.5 785.5 L 424.5 806.5 L 404.5 806.5 Z M 347.5 785.5 L 367.5 785.5 L 367.5 806.5 L 347.5 806.5 Z M 289.5 785.5 L 310.5 785.5 L 310.5 806.5 L 289.5 806.5 Z M 289.5 785.5 "/>
 </clipPath>
-<image id="image462" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image492" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image462"/>
+  <use xlink:href="#image492"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface453">
+<g id="surface483">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -271,6 +271,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1174.933594 458.988281 L 1169.429688 458.988281 L 1169.429688 456.777344 L 1170.375 456.671875 L 1171.214844 456.53125 L 1171.953125 456.355469 L 1172.585938 456.214844 L 1173.109375 456.042969 L 1173.566406 455.832031 L 1173.917969 455.621094 L 1174.230469 455.375 L 1174.511719 455.09375 L 1174.792969 454.742188 L 1175.039062 454.359375 L 1175.285156 453.902344 L 1175.390625 453.65625 L 1175.496094 453.375 L 1175.597656 453.0625 L 1175.738281 452.675781 L 1175.84375 452.289062 L 1175.984375 451.832031 L 1178.019531 451.832031 L 1178.019531 476.695312 L 1174.933594 476.695312 Z M 1174.933594 458.988281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1149 625 L 1170 625 M 1149 605 L 1170 605 M 1149 605 L 1149 625 M 1170 605 L 1170 625 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1149 625 L 1170 625 M 1149 605 L 1170 605 M 1170 625 L 1170 605 M 1149 625 L 1149 605 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 213 279 L 213 288 M 208 284 L 217 284 M 212 285 L 214 285 M 212 283 L 214 283 M 212 283 L 212 285 M 214 283 L 214 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hvl__nand2_1.svg b/cells/nand2/sky130_fd_sc_hvl__nand2_1.svg
index c4108f3..63abadd 100644
--- a/cells/nand2/sky130_fd_sc_hvl__nand2_1.svg
+++ b/cells/nand2/sky130_fd_sc_hvl__nand2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 672.5 98.5 L 1255.5 98.5 L 1255.5 593.5 L 672.5 593.5 Z M 672.5 98.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 735.5 161.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 808.5 703.5 L 1146.5 703.5 L 1146.5 711.5 L 808.5 711.5 Z M 808.5 711.5 L 1146.5 711.5 L 1146.5 743.5 L 808.5 743.5 Z M 808.5 743.5 L 1146.5 743.5 L 1146.5 806.5 L 808.5 806.5 Z M 808.5 806.5 L 1146.5 806.5 L 1146.5 838.5 L 808.5 838.5 Z M 808.5 838.5 L 1146.5 838.5 L 1146.5 846.5 L 808.5 846.5 Z M 808.5 838.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 808.5 245.5 L 862.5 245.5 L 862.5 252.5 L 808.5 252.5 Z M 1105.5 245.5 L 1160.5 245.5 L 1160.5 252.5 L 1105.5 252.5 Z M 957.5 245.5 L 1010.5 245.5 L 1010.5 252.5 L 957.5 252.5 Z M 957.5 252.5 L 1010.5 252.5 L 1010.5 285.5 L 957.5 285.5 Z M 808.5 252.5 L 862.5 252.5 L 862.5 285.5 L 808.5 285.5 Z M 1105.5 252.5 L 1160.5 252.5 L 1160.5 285.5 L 1105.5 285.5 Z M 1105.5 285.5 L 1160.5 285.5 L 1160.5 331.5 L 1105.5 331.5 Z M 957.5 285.5 L 1010.5 285.5 L 1010.5 331.5 L 957.5 331.5 Z M 808.5 285.5 L 862.5 285.5 L 862.5 331.5 L 808.5 331.5 Z M 808.5 331.5 L 862.5 331.5 L 862.5 364.5 L 808.5 364.5 Z M 1105.5 331.5 L 1160.5 331.5 L 1160.5 364.5 L 1105.5 364.5 Z M 957.5 331.5 L 1010.5 331.5 L 1010.5 364.5 L 957.5 364.5 Z M 808.5 364.5 L 862.5 364.5 L 862.5 411.5 L 808.5 411.5 Z M 1105.5 364.5 L 1160.5 364.5 L 1160.5 411.5 L 1105.5 411.5 Z M 957.5 364.5 L 1010.5 364.5 L 1010.5 411.5 L 957.5 411.5 Z M 808.5 411.5 L 862.5 411.5 L 862.5 444.5 L 808.5 444.5 Z M 1105.5 411.5 L 1160.5 411.5 L 1160.5 444.5 L 1105.5 444.5 Z M 957.5 411.5 L 1010.5 411.5 L 1010.5 444.5 L 957.5 444.5 Z M 957.5 444.5 L 1010.5 444.5 L 1010.5 490.5 L 957.5 490.5 Z M 808.5 444.5 L 862.5 444.5 L 862.5 490.5 L 808.5 490.5 Z M 1105.5 444.5 L 1160.5 444.5 L 1160.5 490.5 L 1105.5 490.5 Z M 957.5 490.5 L 1010.5 490.5 L 1010.5 522.5 L 957.5 522.5 Z M 1105.5 490.5 L 1160.5 490.5 L 1160.5 522.5 L 1105.5 522.5 Z M 808.5 490.5 L 862.5 490.5 L 862.5 522.5 L 808.5 522.5 Z M 957.5 522.5 L 1010.5 522.5 L 1010.5 530.5 L 957.5 530.5 Z M 808.5 522.5 L 862.5 522.5 L 862.5 530.5 L 808.5 530.5 Z M 1105.5 522.5 L 1160.5 522.5 L 1160.5 530.5 L 1105.5 530.5 Z M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 997.5 703.5 L 1092.5 703.5 L 1092.5 846.5 L 997.5 846.5 Z M 862.5 703.5 L 957.5 703.5 L 957.5 846.5 L 862.5 846.5 Z M 862.5 703.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1010.5 245.5 L 1105.5 245.5 L 1105.5 530.5 L 1010.5 530.5 Z M 862.5 245.5 L 957.5 245.5 L 957.5 530.5 L 862.5 530.5 Z M 862.5 245.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 765.5 161.5 L 797.5 161.5 L 797.5 193.5 L 765.5 193.5 Z M 1130.5 161.5 L 1163.5 161.5 L 1163.5 193.5 L 1130.5 193.5 Z M 1039.5 161.5 L 1071.5 161.5 L 1071.5 193.5 L 1039.5 193.5 Z M 947.5 161.5 L 980.5 161.5 L 980.5 193.5 L 947.5 193.5 Z M 856.5 161.5 L 888.5 161.5 L 888.5 193.5 L 856.5 193.5 Z M 758.5 252.5 L 790.5 252.5 L 790.5 285.5 L 758.5 285.5 Z M 1125.5 252.5 L 1158.5 252.5 L 1158.5 285.5 L 1125.5 285.5 Z M 1057.5 252.5 L 1089.5 252.5 L 1089.5 285.5 L 1057.5 285.5 Z M 895.5 252.5 L 927.5 252.5 L 927.5 285.5 L 895.5 285.5 Z M 827.5 252.5 L 859.5 252.5 L 859.5 285.5 L 827.5 285.5 Z M 758.5 844.5 L 790.5 844.5 L 790.5 876.5 L 758.5 876.5 Z M 964.5 844.5 L 996.5 844.5 L 996.5 876.5 L 964.5 876.5 Z M 895.5 844.5 L 927.5 844.5 L 927.5 876.5 L 895.5 876.5 Z M 827.5 844.5 L 859.5 844.5 L 859.5 876.5 L 827.5 876.5 Z M 765.5 935.5 L 797.5 935.5 L 797.5 968.5 L 765.5 968.5 Z M 1130.5 935.5 L 1163.5 935.5 L 1163.5 968.5 L 1130.5 968.5 Z M 1039.5 935.5 L 1071.5 935.5 L 1071.5 968.5 L 1039.5 968.5 Z M 947.5 935.5 L 980.5 935.5 L 980.5 968.5 L 947.5 968.5 Z M 856.5 935.5 L 888.5 935.5 L 888.5 968.5 L 856.5 968.5 Z M 856.5 935.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 890.449219 643.832031 L 890.339844 645.625 L 890.058594 647.253906 L 889.554688 648.769531 L 888.878906 650.113281 L 887.984375 651.40625 L 886.917969 652.527344 L 885.738281 653.480469 L 884.503906 654.210938 L 883.101562 654.769531 L 881.644531 655.21875 L 880.070312 655.445312 L 878.390625 655.5 L 859.933594 655.5 L 859.933594 614.601562 L 876.539062 614.601562 L 878.949219 614.769531 L 881.082031 615.164062 L 882.988281 615.835938 L 884.617188 616.789062 L 886.019531 618.023438 L 887.140625 619.539062 L 887.589844 620.378906 L 887.984375 621.277344 L 888.261719 622.121094 L 888.488281 623.074219 L 888.597656 624.027344 L 888.65625 624.980469 L 888.488281 627 L 887.984375 628.738281 L 887.195312 630.367188 L 886.074219 631.714844 L 884.671875 632.949219 L 882.988281 633.902344 L 884.617188 634.628906 L 886.019531 635.414062 L 887.253906 636.3125 L 888.261719 637.324219 L 889.046875 638.390625 L 889.664062 639.511719 L 889.890625 640.183594 L 890.058594 640.859375 L 890.226562 641.53125 L 890.339844 642.316406 L 890.394531 643.046875 Z M 883.4375 625.710938 L 883.269531 624.027344 L 882.765625 622.625 L 881.980469 621.390625 L 880.859375 620.492188 L 879.457031 619.820312 L 877.714844 619.371094 L 877.324219 619.371094 L 876.929688 619.316406 L 876.539062 619.257812 L 875.640625 619.257812 L 875.246094 619.203125 L 865.148438 619.203125 L 865.148438 632.21875 L 875.246094 632.21875 L 877.324219 632.105469 L 879.117188 631.769531 L 880.632812 631.152344 L 881.753906 630.3125 L 882.652344 629.1875 L 883.214844 627.84375 L 883.269531 627.5625 L 883.324219 627.226562 L 883.382812 626.886719 L 883.382812 626.101562 Z M 877.882812 650.898438 L 879.457031 650.84375 L 880.859375 650.507812 L 882.09375 649.945312 L 883.101562 649.214844 L 883.941406 648.261719 L 884.617188 647.085938 L 884.785156 646.636719 L 884.898438 646.132812 L 885.066406 645.570312 L 885.121094 645.066406 L 885.175781 644.503906 L 885.234375 643.886719 L 885.121094 642.652344 L 884.898438 641.476562 L 884.503906 640.464844 L 883.941406 639.511719 L 883.214844 638.726562 L 882.371094 637.996094 L 881.753906 637.660156 L 881.082031 637.378906 L 880.351562 637.15625 L 879.566406 636.988281 L 878.726562 636.875 L 877.882812 636.820312 L 865.148438 636.820312 L 865.148438 650.898438 Z M 877.882812 650.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 856 460 L 888 460 M 856 428 L 888 428 M 856 428 L 856 460 M 888 428 L 888 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 856 460 L 888 460 M 856 428 L 888 428 M 888 460 L 888 428 M 856 460 L 856 428 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 735 122 L 735 131 M 730 127 L 739 127 M 734 128 L 736 128 M 734 126 L 736 126 M 734 126 L 734 128 M 736 126 L 736 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3/sky130_fd_sc_hvl__nand3_1.svg b/cells/nand3/sky130_fd_sc_hvl__nand3_1.svg
index f26feeb..7cd583d 100644
--- a/cells/nand3/sky130_fd_sc_hvl__nand3_1.svg
+++ b/cells/nand3/sky130_fd_sc_hvl__nand3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 725.5 707.5 L 1240.5 707.5 L 1240.5 715.5 L 725.5 715.5 Z M 725.5 715.5 L 1240.5 715.5 L 1240.5 747.5 L 725.5 747.5 Z M 725.5 747.5 L 1240.5 747.5 L 1240.5 810.5 L 725.5 810.5 Z M 725.5 810.5 L 1240.5 810.5 L 1240.5 842.5 L 725.5 842.5 Z M 725.5 842.5 L 1240.5 842.5 L 1240.5 850.5 L 725.5 850.5 Z M 725.5 842.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 711.5 245.5 L 766.5 245.5 L 766.5 252.5 L 711.5 252.5 Z M 1009.5 245.5 L 1104.5 245.5 L 1104.5 252.5 L 1009.5 252.5 Z M 1200.5 245.5 L 1254.5 245.5 L 1254.5 252.5 L 1200.5 252.5 Z M 861.5 245.5 L 914.5 245.5 L 914.5 252.5 L 861.5 252.5 Z M 861.5 252.5 L 914.5 252.5 L 914.5 285.5 L 861.5 285.5 Z M 711.5 252.5 L 766.5 252.5 L 766.5 285.5 L 711.5 285.5 Z M 1009.5 252.5 L 1104.5 252.5 L 1104.5 285.5 L 1009.5 285.5 Z M 1200.5 252.5 L 1254.5 252.5 L 1254.5 285.5 L 1200.5 285.5 Z M 711.5 285.5 L 766.5 285.5 L 766.5 331.5 L 711.5 331.5 Z M 1200.5 285.5 L 1254.5 285.5 L 1254.5 331.5 L 1200.5 331.5 Z M 861.5 285.5 L 914.5 285.5 L 914.5 331.5 L 861.5 331.5 Z M 1009.5 285.5 L 1104.5 285.5 L 1104.5 331.5 L 1009.5 331.5 Z M 1200.5 331.5 L 1254.5 331.5 L 1254.5 364.5 L 1200.5 364.5 Z M 711.5 331.5 L 766.5 331.5 L 766.5 364.5 L 711.5 364.5 Z M 1009.5 331.5 L 1104.5 331.5 L 1104.5 364.5 L 1009.5 364.5 Z M 861.5 331.5 L 914.5 331.5 L 914.5 364.5 L 861.5 364.5 Z M 861.5 364.5 L 914.5 364.5 L 914.5 411.5 L 861.5 411.5 Z M 1200.5 364.5 L 1254.5 364.5 L 1254.5 411.5 L 1200.5 411.5 Z M 711.5 364.5 L 766.5 364.5 L 766.5 411.5 L 711.5 411.5 Z M 1009.5 364.5 L 1104.5 364.5 L 1104.5 411.5 L 1009.5 411.5 Z M 1200.5 411.5 L 1254.5 411.5 L 1254.5 444.5 L 1200.5 444.5 Z M 1009.5 411.5 L 1104.5 411.5 L 1104.5 444.5 L 1009.5 444.5 Z M 711.5 411.5 L 766.5 411.5 L 766.5 444.5 L 711.5 444.5 Z M 861.5 411.5 L 914.5 411.5 L 914.5 444.5 L 861.5 444.5 Z M 861.5 444.5 L 914.5 444.5 L 914.5 490.5 L 861.5 490.5 Z M 1009.5 444.5 L 1104.5 444.5 L 1104.5 490.5 L 1009.5 490.5 Z M 711.5 444.5 L 766.5 444.5 L 766.5 490.5 L 711.5 490.5 Z M 1200.5 444.5 L 1254.5 444.5 L 1254.5 490.5 L 1200.5 490.5 Z M 1009.5 490.5 L 1104.5 490.5 L 1104.5 522.5 L 1009.5 522.5 Z M 1200.5 490.5 L 1254.5 490.5 L 1254.5 522.5 L 1200.5 522.5 Z M 861.5 490.5 L 914.5 490.5 L 914.5 522.5 L 861.5 522.5 Z M 711.5 490.5 L 766.5 490.5 L 766.5 522.5 L 711.5 522.5 Z M 711.5 522.5 L 766.5 522.5 L 766.5 530.5 L 711.5 530.5 Z M 1009.5 522.5 L 1104.5 522.5 L 1104.5 530.5 L 1009.5 530.5 Z M 1200.5 522.5 L 1254.5 522.5 L 1254.5 530.5 L 1200.5 530.5 Z M 861.5 522.5 L 914.5 522.5 L 914.5 530.5 L 861.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1089.5 707.5 L 1184.5 707.5 L 1184.5 850.5 L 1089.5 850.5 Z M 779.5 707.5 L 874.5 707.5 L 874.5 850.5 L 779.5 850.5 Z M 914.5 707.5 L 1009.5 707.5 L 1009.5 850.5 L 914.5 850.5 Z M 914.5 707.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1104.5 245.5 L 1200.5 245.5 L 1200.5 530.5 L 1104.5 530.5 Z M 766.5 245.5 L 861.5 245.5 L 861.5 530.5 L 766.5 530.5 Z M 914.5 245.5 L 1009.5 245.5 L 1009.5 530.5 L 914.5 530.5 Z M 914.5 245.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 664.5 252.5 L 696.5 252.5 L 696.5 285.5 L 664.5 285.5 Z M 1143.5 252.5 L 1176.5 252.5 L 1176.5 285.5 L 1143.5 285.5 Z M 1075.5 252.5 L 1107.5 252.5 L 1107.5 285.5 L 1075.5 285.5 Z M 1006.5 252.5 L 1039.5 252.5 L 1039.5 285.5 L 1006.5 285.5 Z M 938.5 252.5 L 970.5 252.5 L 970.5 285.5 L 938.5 285.5 Z M 801.5 252.5 L 833.5 252.5 L 833.5 285.5 L 801.5 285.5 Z M 732.5 252.5 L 765.5 252.5 L 765.5 285.5 L 732.5 285.5 Z M 661.5 844.5 L 693.5 844.5 L 693.5 876.5 L 661.5 876.5 Z M 935.5 844.5 L 967.5 844.5 L 967.5 876.5 L 935.5 876.5 Z M 867.5 844.5 L 899.5 844.5 L 899.5 876.5 L 867.5 876.5 Z M 798.5 844.5 L 830.5 844.5 L 830.5 876.5 L 798.5 876.5 Z M 730.5 844.5 L 762.5 844.5 L 762.5 876.5 L 730.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -210,6 +210,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1240.210938 357.457031 L 1240.210938 373.5 L 1234.992188 373.5 L 1234.992188 357.457031 L 1219.230469 332.601562 L 1225.679688 332.601562 L 1237.6875 352.519531 L 1249.355469 332.601562 L 1255.582031 332.601562 Z M 1240.210938 357.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1221 742 L 1253 742 M 1221 710 L 1253 710 M 1221 710 L 1221 742 M 1253 710 L 1253 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1221 742 L 1253 742 M 1221 710 L 1253 710 M 1253 742 L 1253 710 M 1221 742 L 1221 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hvl__nor2_1.svg b/cells/nor2/sky130_fd_sc_hvl__nor2_1.svg
index 00416be..8a598fd 100644
--- a/cells/nor2/sky130_fd_sc_hvl__nor2_1.svg
+++ b/cells/nor2/sky130_fd_sc_hvl__nor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 672.5 98.5 L 1255.5 98.5 L 1255.5 593.5 L 672.5 593.5 Z M 672.5 98.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 735.5 161.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 735.5 161.5 L 1192.5 161.5 L 1192.5 193.5 L 735.5 193.5 Z M 811.5 707.5 L 1163.5 707.5 L 1163.5 715.5 L 811.5 715.5 Z M 811.5 715.5 L 1163.5 715.5 L 1163.5 747.5 L 811.5 747.5 Z M 811.5 747.5 L 1163.5 747.5 L 1163.5 810.5 L 811.5 810.5 Z M 811.5 810.5 L 1163.5 810.5 L 1163.5 842.5 L 811.5 842.5 Z M 811.5 842.5 L 1163.5 842.5 L 1163.5 850.5 L 811.5 850.5 Z M 811.5 842.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 825.5 245.5 L 879.5 245.5 L 879.5 252.5 L 825.5 252.5 Z M 1109.5 245.5 L 1163.5 245.5 L 1163.5 252.5 L 1109.5 252.5 Z M 825.5 252.5 L 879.5 252.5 L 879.5 285.5 L 825.5 285.5 Z M 1109.5 252.5 L 1163.5 252.5 L 1163.5 285.5 L 1109.5 285.5 Z M 825.5 285.5 L 879.5 285.5 L 879.5 328.5 L 825.5 328.5 Z M 1109.5 285.5 L 1163.5 285.5 L 1163.5 331.5 L 1109.5 331.5 Z M 825.5 328.5 L 879.5 328.5 L 879.5 361.5 L 825.5 361.5 Z M 1109.5 331.5 L 1163.5 331.5 L 1163.5 364.5 L 1109.5 364.5 Z M 825.5 361.5 L 879.5 361.5 L 879.5 405.5 L 825.5 405.5 Z M 1109.5 364.5 L 1163.5 364.5 L 1163.5 411.5 L 1109.5 411.5 Z M 825.5 405.5 L 879.5 405.5 L 879.5 438.5 L 825.5 438.5 Z M 1109.5 411.5 L 1163.5 411.5 L 1163.5 444.5 L 1109.5 444.5 Z M 825.5 438.5 L 879.5 438.5 L 879.5 482.5 L 825.5 482.5 Z M 1109.5 444.5 L 1163.5 444.5 L 1163.5 490.5 L 1109.5 490.5 Z M 825.5 482.5 L 879.5 482.5 L 879.5 514.5 L 825.5 514.5 Z M 1109.5 490.5 L 1163.5 490.5 L 1163.5 522.5 L 1109.5 522.5 Z M 825.5 514.5 L 879.5 514.5 L 879.5 530.5 L 825.5 530.5 Z M 974.5 245.5 L 1014.5 245.5 L 1014.5 530.5 L 974.5 530.5 Z M 1109.5 522.5 L 1163.5 522.5 L 1163.5 530.5 L 1109.5 530.5 Z M 735.5 935.5 L 1192.5 935.5 L 1192.5 968.5 L 735.5 968.5 Z M 735.5 935.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1014.5 707.5 L 1109.5 707.5 L 1109.5 850.5 L 1014.5 850.5 Z M 866.5 707.5 L 961.5 707.5 L 961.5 850.5 L 866.5 850.5 Z M 866.5 707.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1014.5 245.5 L 1109.5 245.5 L 1109.5 530.5 L 1014.5 530.5 Z M 879.5 245.5 L 974.5 245.5 L 974.5 530.5 L 879.5 530.5 Z M 879.5 245.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 765.5 161.5 L 797.5 161.5 L 797.5 193.5 L 765.5 193.5 Z M 1130.5 161.5 L 1163.5 161.5 L 1163.5 193.5 L 1130.5 193.5 Z M 1039.5 161.5 L 1071.5 161.5 L 1071.5 193.5 L 1039.5 193.5 Z M 947.5 161.5 L 980.5 161.5 L 980.5 193.5 L 947.5 193.5 Z M 856.5 161.5 L 888.5 161.5 L 888.5 193.5 L 856.5 193.5 Z M 758.5 252.5 L 790.5 252.5 L 790.5 285.5 L 758.5 285.5 Z M 1032.5 252.5 L 1065.5 252.5 L 1065.5 285.5 L 1032.5 285.5 Z M 964.5 252.5 L 996.5 252.5 L 996.5 285.5 L 964.5 285.5 Z M 895.5 252.5 L 927.5 252.5 L 927.5 285.5 L 895.5 285.5 Z M 827.5 252.5 L 859.5 252.5 L 859.5 285.5 L 827.5 285.5 Z M 756.5 844.5 L 789.5 844.5 L 789.5 876.5 L 756.5 876.5 Z M 1137.5 844.5 L 1169.5 844.5 L 1169.5 876.5 L 1137.5 876.5 Z M 1068.5 844.5 L 1101.5 844.5 L 1101.5 876.5 L 1068.5 876.5 Z M 893.5 844.5 L 926.5 844.5 L 926.5 876.5 L 893.5 876.5 Z M 825.5 844.5 L 857.5 844.5 L 857.5 876.5 L 825.5 876.5 Z M 765.5 935.5 L 797.5 935.5 L 797.5 968.5 L 765.5 968.5 Z M 1130.5 935.5 L 1163.5 935.5 L 1163.5 968.5 L 1130.5 968.5 Z M 1039.5 935.5 L 1071.5 935.5 L 1071.5 968.5 L 1039.5 968.5 Z M 947.5 935.5 L 980.5 935.5 L 980.5 968.5 L 947.5 968.5 Z M 856.5 935.5 L 888.5 935.5 L 888.5 968.5 L 856.5 968.5 Z M 856.5 935.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -198,6 +198,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1150.210938 357.457031 L 1150.210938 373.5 L 1144.992188 373.5 L 1144.992188 357.457031 L 1129.230469 332.601562 L 1135.679688 332.601562 L 1147.6875 352.519531 L 1159.355469 332.601562 L 1165.582031 332.601562 Z M 1150.210938 357.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1130 742 L 1163 742 M 1130 710 L 1163 710 M 1130 710 L 1130 742 M 1163 710 L 1163 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1130 742 L 1163 742 M 1130 710 L 1163 710 M 1163 742 L 1163 710 M 1130 742 L 1130 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 735 122 L 735 131 M 730 127 L 739 127 M 734 128 L 736 128 M 734 126 L 736 126 M 734 126 L 734 128 M 736 126 L 736 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3/sky130_fd_sc_hvl__nor3_1.svg b/cells/nor3/sky130_fd_sc_hvl__nor3_1.svg
index 919eef7..3216e0a 100644
--- a/cells/nor3/sky130_fd_sc_hvl__nor3_1.svg
+++ b/cells/nor3/sky130_fd_sc_hvl__nor3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 679.5 707.5 L 1172.5 707.5 L 1172.5 718.5 L 679.5 718.5 Z M 679.5 718.5 L 1172.5 718.5 L 1172.5 751.5 L 679.5 751.5 Z M 679.5 751.5 L 1172.5 751.5 L 1172.5 806.5 L 679.5 806.5 Z M 679.5 806.5 L 1172.5 806.5 L 1172.5 838.5 L 679.5 838.5 Z M 679.5 838.5 L 1172.5 838.5 L 1172.5 850.5 L 679.5 850.5 Z M 679.5 838.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 689.5 245.5 L 743.5 245.5 L 743.5 252.5 L 689.5 252.5 Z M 1108.5 245.5 L 1163.5 245.5 L 1163.5 252.5 L 1108.5 252.5 Z M 689.5 252.5 L 743.5 252.5 L 743.5 285.5 L 689.5 285.5 Z M 1108.5 252.5 L 1163.5 252.5 L 1163.5 285.5 L 1108.5 285.5 Z M 689.5 285.5 L 743.5 285.5 L 743.5 328.5 L 689.5 328.5 Z M 1108.5 285.5 L 1163.5 285.5 L 1163.5 331.5 L 1108.5 331.5 Z M 689.5 328.5 L 743.5 328.5 L 743.5 361.5 L 689.5 361.5 Z M 1108.5 331.5 L 1163.5 331.5 L 1163.5 364.5 L 1108.5 364.5 Z M 689.5 361.5 L 743.5 361.5 L 743.5 405.5 L 689.5 405.5 Z M 1108.5 364.5 L 1163.5 364.5 L 1163.5 411.5 L 1108.5 411.5 Z M 689.5 405.5 L 743.5 405.5 L 743.5 438.5 L 689.5 438.5 Z M 1108.5 411.5 L 1163.5 411.5 L 1163.5 444.5 L 1108.5 444.5 Z M 689.5 438.5 L 743.5 438.5 L 743.5 482.5 L 689.5 482.5 Z M 1108.5 444.5 L 1163.5 444.5 L 1163.5 490.5 L 1108.5 490.5 Z M 689.5 482.5 L 743.5 482.5 L 743.5 514.5 L 689.5 514.5 Z M 1108.5 490.5 L 1163.5 490.5 L 1163.5 522.5 L 1108.5 522.5 Z M 838.5 245.5 L 878.5 245.5 L 878.5 530.5 L 838.5 530.5 Z M 689.5 514.5 L 743.5 514.5 L 743.5 530.5 L 689.5 530.5 Z M 973.5 245.5 L 1013.5 245.5 L 1013.5 530.5 L 973.5 530.5 Z M 1108.5 522.5 L 1163.5 522.5 L 1163.5 530.5 L 1108.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1026.5 707.5 L 1122.5 707.5 L 1122.5 850.5 L 1026.5 850.5 Z M 730.5 707.5 L 825.5 707.5 L 825.5 850.5 L 730.5 850.5 Z M 878.5 707.5 L 973.5 707.5 L 973.5 850.5 L 878.5 850.5 Z M 878.5 707.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1013.5 245.5 L 1108.5 245.5 L 1108.5 530.5 L 1013.5 530.5 Z M 743.5 245.5 L 838.5 245.5 L 838.5 530.5 L 743.5 530.5 Z M 878.5 245.5 L 973.5 245.5 L 973.5 530.5 L 878.5 530.5 Z M 878.5 245.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 666.5 252.5 L 698.5 252.5 L 698.5 285.5 L 666.5 285.5 Z M 940.5 252.5 L 972.5 252.5 L 972.5 285.5 L 940.5 285.5 Z M 871.5 252.5 L 904.5 252.5 L 904.5 285.5 L 871.5 285.5 Z M 803.5 252.5 L 835.5 252.5 L 835.5 285.5 L 803.5 285.5 Z M 734.5 252.5 L 767.5 252.5 L 767.5 285.5 L 734.5 285.5 Z M 666.5 844.5 L 698.5 844.5 L 698.5 876.5 L 666.5 876.5 Z M 1045.5 844.5 L 1077.5 844.5 L 1077.5 876.5 L 1045.5 876.5 Z M 976.5 844.5 L 1008.5 844.5 L 1008.5 876.5 L 976.5 876.5 Z M 908.5 844.5 L 940.5 844.5 L 940.5 876.5 L 908.5 876.5 Z M 734.5 844.5 L 767.5 844.5 L 767.5 876.5 L 734.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -213,6 +213,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1149.210938 357.457031 L 1149.210938 373.5 L 1143.992188 373.5 L 1143.992188 357.457031 L 1128.230469 332.601562 L 1134.679688 332.601562 L 1146.6875 352.519531 L 1158.355469 332.601562 L 1164.582031 332.601562 Z M 1149.210938 357.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1129 742 L 1162 742 M 1129 710 L 1162 710 M 1129 710 L 1129 742 M 1162 710 L 1162 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1129 742 L 1162 742 M 1129 710 L 1162 710 M 1162 742 L 1162 710 M 1129 742 L 1129 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21a/sky130_fd_sc_hvl__o21a_1.svg b/cells/o21a/sky130_fd_sc_hvl__o21a_1.svg
index cb3be04..bf1a9a1 100644
--- a/cells/o21a/sky130_fd_sc_hvl__o21a_1.svg
+++ b/cells/o21a/sky130_fd_sc_hvl__o21a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 488.5 98.5 L 1436.5 98.5 L 1436.5 593.5 L 488.5 593.5 Z M 488.5 98.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 551.5 161.5 L 1373.5 161.5 L 1373.5 193.5 L 551.5 193.5 Z M 551.5 161.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 551.5 161.5 L 1373.5 161.5 L 1373.5 193.5 L 551.5 193.5 Z M 579.5 701.5 L 779.5 701.5 L 779.5 713.5 L 579.5 713.5 Z M 839.5 707.5 L 1343.5 707.5 L 1343.5 715.5 L 839.5 715.5 Z M 579.5 713.5 L 779.5 713.5 L 779.5 745.5 L 579.5 745.5 Z M 839.5 715.5 L 1343.5 715.5 L 1343.5 747.5 L 839.5 747.5 Z M 579.5 745.5 L 779.5 745.5 L 779.5 800.5 L 579.5 800.5 Z M 839.5 747.5 L 1343.5 747.5 L 1343.5 810.5 L 839.5 810.5 Z M 579.5 800.5 L 779.5 800.5 L 779.5 833.5 L 579.5 833.5 Z M 839.5 810.5 L 1343.5 810.5 L 1343.5 842.5 L 839.5 842.5 Z M 579.5 833.5 L 779.5 833.5 L 779.5 844.5 L 579.5 844.5 Z M 839.5 842.5 L 1343.5 842.5 L 1343.5 850.5 L 839.5 850.5 Z M 839.5 842.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 551.5 935.5 L 1373.5 935.5 L 1373.5 968.5 L 551.5 968.5 Z M 551.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 620.5 245.5 L 674.5 245.5 L 674.5 252.5 L 620.5 252.5 Z M 1272.5 245.5 L 1326.5 245.5 L 1326.5 252.5 L 1272.5 252.5 Z M 960.5 245.5 L 1028.5 245.5 L 1028.5 252.5 L 960.5 252.5 Z M 770.5 245.5 L 865.5 245.5 L 865.5 252.5 L 770.5 252.5 Z M 620.5 252.5 L 674.5 252.5 L 674.5 285.5 L 620.5 285.5 Z M 960.5 252.5 L 1028.5 252.5 L 1028.5 285.5 L 960.5 285.5 Z M 770.5 252.5 L 865.5 252.5 L 865.5 285.5 L 770.5 285.5 Z M 1272.5 252.5 L 1326.5 252.5 L 1326.5 285.5 L 1272.5 285.5 Z M 770.5 285.5 L 865.5 285.5 L 865.5 328.5 L 770.5 328.5 Z M 960.5 285.5 L 1028.5 285.5 L 1028.5 331.5 L 960.5 331.5 Z M 620.5 285.5 L 674.5 285.5 L 674.5 331.5 L 620.5 331.5 Z M 1272.5 285.5 L 1326.5 285.5 L 1326.5 331.5 L 1272.5 331.5 Z M 770.5 328.5 L 865.5 328.5 L 865.5 361.5 L 770.5 361.5 Z M 1272.5 331.5 L 1326.5 331.5 L 1326.5 364.5 L 1272.5 364.5 Z M 620.5 331.5 L 674.5 331.5 L 674.5 364.5 L 620.5 364.5 Z M 960.5 331.5 L 1028.5 331.5 L 1028.5 364.5 L 960.5 364.5 Z M 770.5 361.5 L 865.5 361.5 L 865.5 405.5 L 770.5 405.5 Z M 960.5 364.5 L 1028.5 364.5 L 1028.5 411.5 L 960.5 411.5 Z M 1272.5 364.5 L 1326.5 364.5 L 1326.5 411.5 L 1272.5 411.5 Z M 620.5 364.5 L 674.5 364.5 L 674.5 411.5 L 620.5 411.5 Z M 770.5 405.5 L 865.5 405.5 L 865.5 438.5 L 770.5 438.5 Z M 960.5 411.5 L 1028.5 411.5 L 1028.5 444.5 L 960.5 444.5 Z M 620.5 411.5 L 674.5 411.5 L 674.5 444.5 L 620.5 444.5 Z M 1272.5 411.5 L 1326.5 411.5 L 1326.5 444.5 L 1272.5 444.5 Z M 770.5 438.5 L 865.5 438.5 L 865.5 482.5 L 770.5 482.5 Z M 960.5 444.5 L 1028.5 444.5 L 1028.5 490.5 L 960.5 490.5 Z M 620.5 444.5 L 674.5 444.5 L 674.5 490.5 L 620.5 490.5 Z M 1272.5 444.5 L 1326.5 444.5 L 1326.5 490.5 L 1272.5 490.5 Z M 770.5 482.5 L 865.5 482.5 L 865.5 514.5 L 770.5 514.5 Z M 960.5 490.5 L 1028.5 490.5 L 1028.5 522.5 L 960.5 522.5 Z M 620.5 490.5 L 674.5 490.5 L 674.5 522.5 L 620.5 522.5 Z M 1272.5 490.5 L 1326.5 490.5 L 1326.5 522.5 L 1272.5 522.5 Z M 1272.5 522.5 L 1326.5 522.5 L 1326.5 530.5 L 1272.5 530.5 Z M 1124.5 245.5 L 1177.5 245.5 L 1177.5 530.5 L 1124.5 530.5 Z M 960.5 522.5 L 1028.5 522.5 L 1028.5 530.5 L 960.5 530.5 Z M 770.5 514.5 L 865.5 514.5 L 865.5 530.5 L 770.5 530.5 Z M 620.5 522.5 L 674.5 522.5 L 674.5 530.5 L 620.5 530.5 Z M 551.5 935.5 L 1373.5 935.5 L 1373.5 968.5 L 551.5 968.5 Z M 551.5 935.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 630.5 701.5 L 725.5 701.5 L 725.5 844.5 L 630.5 844.5 Z M 1194.5 707.5 L 1289.5 707.5 L 1289.5 850.5 L 1194.5 850.5 Z M 1042.5 707.5 L 1137.5 707.5 L 1137.5 850.5 L 1042.5 850.5 Z M 893.5 707.5 L 988.5 707.5 L 988.5 850.5 L 893.5 850.5 Z M 893.5 707.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1177.5 245.5 L 1272.5 245.5 L 1272.5 530.5 L 1177.5 530.5 Z M 674.5 245.5 L 770.5 245.5 L 770.5 530.5 L 674.5 530.5 Z M 865.5 245.5 L 960.5 245.5 L 960.5 530.5 L 865.5 530.5 Z M 1028.5 245.5 L 1124.5 245.5 L 1124.5 530.5 L 1028.5 530.5 Z M 1028.5 245.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 580.5 161.5 L 613.5 161.5 L 613.5 193.5 L 580.5 193.5 Z M 1311.5 161.5 L 1343.5 161.5 L 1343.5 193.5 L 1311.5 193.5 Z M 1220.5 161.5 L 1252.5 161.5 L 1252.5 193.5 L 1220.5 193.5 Z M 1128.5 161.5 L 1161.5 161.5 L 1161.5 193.5 L 1128.5 193.5 Z M 1037.5 161.5 L 1069.5 161.5 L 1069.5 193.5 L 1037.5 193.5 Z M 946.5 161.5 L 978.5 161.5 L 978.5 193.5 L 946.5 193.5 Z M 854.5 161.5 L 887.5 161.5 L 887.5 193.5 L 854.5 193.5 Z M 763.5 161.5 L 795.5 161.5 L 795.5 193.5 L 763.5 193.5 Z M 672.5 161.5 L 704.5 161.5 L 704.5 193.5 L 672.5 193.5 Z M 698.5 252.5 L 731.5 252.5 L 731.5 285.5 L 698.5 285.5 Z M 1321.5 252.5 L 1354.5 252.5 L 1354.5 285.5 L 1321.5 285.5 Z M 1253.5 252.5 L 1285.5 252.5 L 1285.5 285.5 L 1253.5 285.5 Z M 1184.5 252.5 L 1217.5 252.5 L 1217.5 285.5 L 1184.5 285.5 Z M 1116.5 252.5 L 1148.5 252.5 L 1148.5 285.5 L 1116.5 285.5 Z M 904.5 252.5 L 936.5 252.5 L 936.5 285.5 L 904.5 285.5 Z M 835.5 252.5 L 868.5 252.5 L 868.5 285.5 L 835.5 285.5 Z M 767.5 252.5 L 799.5 252.5 L 799.5 285.5 L 767.5 285.5 Z M 665.5 844.5 L 697.5 844.5 L 697.5 876.5 L 665.5 876.5 Z M 1218.5 844.5 L 1250.5 844.5 L 1250.5 876.5 L 1218.5 876.5 Z M 1149.5 844.5 L 1182.5 844.5 L 1182.5 876.5 L 1149.5 876.5 Z M 1081.5 844.5 L 1113.5 844.5 L 1113.5 876.5 L 1081.5 876.5 Z M 761.5 844.5 L 793.5 844.5 L 793.5 876.5 L 761.5 876.5 Z M 580.5 935.5 L 613.5 935.5 L 613.5 968.5 L 580.5 968.5 Z M 1311.5 935.5 L 1343.5 935.5 L 1343.5 968.5 L 1311.5 968.5 Z M 1220.5 935.5 L 1252.5 935.5 L 1252.5 968.5 L 1220.5 968.5 Z M 1128.5 935.5 L 1161.5 935.5 L 1161.5 968.5 L 1128.5 968.5 Z M 1037.5 935.5 L 1069.5 935.5 L 1069.5 968.5 L 1037.5 968.5 Z M 946.5 935.5 L 978.5 935.5 L 978.5 968.5 L 946.5 968.5 Z M 854.5 935.5 L 887.5 935.5 L 887.5 968.5 L 854.5 968.5 Z M 763.5 935.5 L 795.5 935.5 L 795.5 968.5 L 763.5 968.5 Z M 672.5 935.5 L 704.5 935.5 L 704.5 968.5 L 672.5 968.5 Z M 672.5 935.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface371">
+<g id="surface400">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -232,6 +232,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 600.433594 352.519531 L 614.910156 373.5 L 608.457031 373.5 L 597.292969 356.445312 L 586.074219 373.5 L 579.734375 373.5 L 594.207031 352.519531 L 580.632812 332.601562 L 586.972656 332.601562 L 597.460938 348.648438 L 608.007812 332.601562 L 614.234375 332.601562 Z M 600.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 580 742 L 613 742 M 580 710 L 613 710 M 580 710 L 580 742 M 613 710 L 613 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 580 742 L 613 742 M 580 710 L 613 710 M 613 742 L 613 710 M 580 742 L 580 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 551 122 L 551 131 M 546 127 L 555 127 M 550 128 L 552 128 M 550 126 L 552 126 M 550 126 L 550 128 M 552 126 L 552 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.svg b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.svg
index 36104f6..f0372fb 100644
--- a/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.svg
+++ b/cells/o21ai/sky130_fd_sc_hvl__o21ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 672.5 707.5 L 1176.5 707.5 L 1176.5 715.5 L 672.5 715.5 Z M 672.5 715.5 L 1176.5 715.5 L 1176.5 747.5 L 672.5 747.5 Z M 672.5 747.5 L 1176.5 747.5 L 1176.5 810.5 L 672.5 810.5 Z M 672.5 810.5 L 1176.5 810.5 L 1176.5 842.5 L 672.5 842.5 Z M 672.5 842.5 L 1176.5 842.5 L 1176.5 850.5 L 672.5 850.5 Z M 672.5 842.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 689.5 245.5 L 743.5 245.5 L 743.5 252.5 L 689.5 252.5 Z M 973.5 245.5 L 1026.5 245.5 L 1026.5 252.5 L 973.5 252.5 Z M 1122.5 245.5 L 1176.5 245.5 L 1176.5 252.5 L 1122.5 252.5 Z M 689.5 252.5 L 743.5 252.5 L 743.5 285.5 L 689.5 285.5 Z M 973.5 252.5 L 1026.5 252.5 L 1026.5 285.5 L 973.5 285.5 Z M 1122.5 252.5 L 1176.5 252.5 L 1176.5 285.5 L 1122.5 285.5 Z M 1122.5 285.5 L 1176.5 285.5 L 1176.5 328.5 L 1122.5 328.5 Z M 973.5 285.5 L 1026.5 285.5 L 1026.5 331.5 L 973.5 331.5 Z M 689.5 285.5 L 743.5 285.5 L 743.5 331.5 L 689.5 331.5 Z M 1122.5 328.5 L 1176.5 328.5 L 1176.5 361.5 L 1122.5 361.5 Z M 689.5 331.5 L 743.5 331.5 L 743.5 364.5 L 689.5 364.5 Z M 973.5 331.5 L 1026.5 331.5 L 1026.5 364.5 L 973.5 364.5 Z M 1122.5 361.5 L 1176.5 361.5 L 1176.5 405.5 L 1122.5 405.5 Z M 689.5 364.5 L 743.5 364.5 L 743.5 411.5 L 689.5 411.5 Z M 973.5 364.5 L 1026.5 364.5 L 1026.5 411.5 L 973.5 411.5 Z M 1122.5 405.5 L 1176.5 405.5 L 1176.5 438.5 L 1122.5 438.5 Z M 689.5 411.5 L 743.5 411.5 L 743.5 444.5 L 689.5 444.5 Z M 973.5 411.5 L 1026.5 411.5 L 1026.5 444.5 L 973.5 444.5 Z M 1122.5 438.5 L 1176.5 438.5 L 1176.5 482.5 L 1122.5 482.5 Z M 689.5 444.5 L 743.5 444.5 L 743.5 490.5 L 689.5 490.5 Z M 973.5 444.5 L 1026.5 444.5 L 1026.5 490.5 L 973.5 490.5 Z M 1122.5 482.5 L 1176.5 482.5 L 1176.5 514.5 L 1122.5 514.5 Z M 689.5 490.5 L 743.5 490.5 L 743.5 522.5 L 689.5 522.5 Z M 973.5 490.5 L 1026.5 490.5 L 1026.5 522.5 L 973.5 522.5 Z M 973.5 522.5 L 1026.5 522.5 L 1026.5 530.5 L 973.5 530.5 Z M 1122.5 514.5 L 1176.5 514.5 L 1176.5 530.5 L 1122.5 530.5 Z M 838.5 245.5 L 878.5 245.5 L 878.5 530.5 L 838.5 530.5 Z M 689.5 522.5 L 743.5 522.5 L 743.5 530.5 L 689.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1026.5 707.5 L 1122.5 707.5 L 1122.5 850.5 L 1026.5 850.5 Z M 726.5 707.5 L 821.5 707.5 L 821.5 850.5 L 726.5 850.5 Z M 878.5 707.5 L 973.5 707.5 L 973.5 850.5 L 878.5 850.5 Z M 878.5 707.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1026.5 245.5 L 1122.5 245.5 L 1122.5 530.5 L 1026.5 530.5 Z M 743.5 245.5 L 838.5 245.5 L 838.5 530.5 L 743.5 530.5 Z M 878.5 245.5 L 973.5 245.5 L 973.5 530.5 L 878.5 530.5 Z M 878.5 245.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 666.5 252.5 L 698.5 252.5 L 698.5 285.5 L 666.5 285.5 Z M 1208.5 252.5 L 1241.5 252.5 L 1241.5 285.5 L 1208.5 285.5 Z M 1140.5 252.5 L 1172.5 252.5 L 1172.5 285.5 L 1140.5 285.5 Z M 1071.5 252.5 L 1104.5 252.5 L 1104.5 285.5 L 1071.5 285.5 Z M 803.5 252.5 L 835.5 252.5 L 835.5 285.5 L 803.5 285.5 Z M 734.5 252.5 L 767.5 252.5 L 767.5 285.5 L 734.5 285.5 Z M 765.5 844.5 L 797.5 844.5 L 797.5 876.5 L 765.5 876.5 Z M 902.5 844.5 L 934.5 844.5 L 934.5 876.5 L 902.5 876.5 Z M 833.5 844.5 L 866.5 844.5 L 866.5 876.5 L 833.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface339">
+<g id="surface368">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -207,6 +207,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 966.210938 357.457031 L 966.210938 373.5 L 960.992188 373.5 L 960.992188 357.457031 L 945.230469 332.601562 L 951.679688 332.601562 L 963.6875 352.519531 L 975.355469 332.601562 L 981.582031 332.601562 Z M 966.210938 357.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 947 742 L 979 742 M 947 710 L 979 710 M 947 710 L 947 742 M 979 710 L 979 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 947 742 L 979 742 M 947 710 L 979 710 M 979 742 L 979 710 M 947 742 L 947 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22a/sky130_fd_sc_hvl__o22a_1.svg b/cells/o22a/sky130_fd_sc_hvl__o22a_1.svg
index 72a8942..3b5dc8d 100644
--- a/cells/o22a/sky130_fd_sc_hvl__o22a_1.svg
+++ b/cells/o22a/sky130_fd_sc_hvl__o22a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 396.5 98.5 L 1526.5 98.5 L 1526.5 593.5 L 396.5 593.5 Z M 396.5 98.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 458.5 161.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 487.5 707.5 L 1303.5 707.5 L 1303.5 715.5 L 487.5 715.5 Z M 487.5 715.5 L 1303.5 715.5 L 1303.5 747.5 L 487.5 747.5 Z M 487.5 747.5 L 1303.5 747.5 L 1303.5 810.5 L 487.5 810.5 Z M 487.5 810.5 L 1303.5 810.5 L 1303.5 842.5 L 487.5 842.5 Z M 487.5 842.5 L 1303.5 842.5 L 1303.5 850.5 L 487.5 850.5 Z M 487.5 842.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 487.5 245.5 L 541.5 245.5 L 541.5 252.5 L 487.5 252.5 Z M 1101.5 245.5 L 1154.5 245.5 L 1154.5 252.5 L 1101.5 252.5 Z M 636.5 245.5 L 870.5 245.5 L 870.5 252.5 L 636.5 252.5 Z M 1384.5 245.5 L 1435.5 245.5 L 1435.5 256.5 L 1384.5 256.5 Z M 636.5 252.5 L 870.5 252.5 L 870.5 285.5 L 636.5 285.5 Z M 487.5 252.5 L 541.5 252.5 L 541.5 285.5 L 487.5 285.5 Z M 1101.5 252.5 L 1154.5 252.5 L 1154.5 285.5 L 1101.5 285.5 Z M 1384.5 256.5 L 1435.5 256.5 L 1435.5 288.5 L 1384.5 288.5 Z M 487.5 285.5 L 541.5 285.5 L 541.5 331.5 L 487.5 331.5 Z M 1101.5 285.5 L 1154.5 285.5 L 1154.5 331.5 L 1101.5 331.5 Z M 1384.5 288.5 L 1435.5 288.5 L 1435.5 332.5 L 1384.5 332.5 Z M 636.5 285.5 L 870.5 285.5 L 870.5 334.5 L 636.5 334.5 Z M 1101.5 331.5 L 1154.5 331.5 L 1154.5 364.5 L 1101.5 364.5 Z M 487.5 331.5 L 541.5 331.5 L 541.5 364.5 L 487.5 364.5 Z M 1384.5 332.5 L 1435.5 332.5 L 1435.5 365.5 L 1384.5 365.5 Z M 636.5 334.5 L 870.5 334.5 L 870.5 366.5 L 636.5 366.5 Z M 1384.5 365.5 L 1435.5 365.5 L 1435.5 410.5 L 1384.5 410.5 Z M 1101.5 364.5 L 1154.5 364.5 L 1154.5 411.5 L 1101.5 411.5 Z M 487.5 364.5 L 541.5 364.5 L 541.5 411.5 L 487.5 411.5 Z M 636.5 366.5 L 870.5 366.5 L 870.5 415.5 L 636.5 415.5 Z M 1384.5 410.5 L 1435.5 410.5 L 1435.5 443.5 L 1384.5 443.5 Z M 487.5 411.5 L 541.5 411.5 L 541.5 444.5 L 487.5 444.5 Z M 1101.5 411.5 L 1154.5 411.5 L 1154.5 444.5 L 1101.5 444.5 Z M 636.5 415.5 L 870.5 415.5 L 870.5 447.5 L 636.5 447.5 Z M 1384.5 443.5 L 1435.5 443.5 L 1435.5 486.5 L 1384.5 486.5 Z M 487.5 444.5 L 541.5 444.5 L 541.5 490.5 L 487.5 490.5 Z M 1101.5 444.5 L 1154.5 444.5 L 1154.5 490.5 L 1101.5 490.5 Z M 1384.5 486.5 L 1435.5 486.5 L 1435.5 519.5 L 1384.5 519.5 Z M 487.5 490.5 L 541.5 490.5 L 541.5 522.5 L 487.5 522.5 Z M 1101.5 490.5 L 1154.5 490.5 L 1154.5 522.5 L 1101.5 522.5 Z M 1384.5 519.5 L 1435.5 519.5 L 1435.5 530.5 L 1384.5 530.5 Z M 1249.5 245.5 L 1289.5 245.5 L 1289.5 530.5 L 1249.5 530.5 Z M 1101.5 522.5 L 1154.5 522.5 L 1154.5 530.5 L 1101.5 530.5 Z M 487.5 522.5 L 541.5 522.5 L 541.5 530.5 L 487.5 530.5 Z M 636.5 447.5 L 870.5 447.5 L 870.5 530.5 L 636.5 530.5 Z M 966.5 245.5 L 1006.5 245.5 L 1006.5 530.5 L 966.5 530.5 Z M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1154.5 707.5 L 1249.5 707.5 L 1249.5 850.5 L 1154.5 850.5 Z M 541.5 707.5 L 636.5 707.5 L 636.5 850.5 L 541.5 850.5 Z M 700.5 707.5 L 795.5 707.5 L 795.5 850.5 L 700.5 850.5 Z M 849.5 707.5 L 944.5 707.5 L 944.5 850.5 L 849.5 850.5 Z M 1006.5 707.5 L 1101.5 707.5 L 1101.5 850.5 L 1006.5 850.5 Z M 1006.5 707.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1289.5 245.5 L 1384.5 245.5 L 1384.5 530.5 L 1289.5 530.5 Z M 541.5 245.5 L 636.5 245.5 L 636.5 530.5 L 541.5 530.5 Z M 870.5 245.5 L 966.5 245.5 L 966.5 530.5 L 870.5 530.5 Z M 1006.5 245.5 L 1101.5 245.5 L 1101.5 530.5 L 1006.5 530.5 Z M 1154.5 245.5 L 1249.5 245.5 L 1249.5 530.5 L 1154.5 530.5 Z M 1154.5 245.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 488.5 161.5 L 520.5 161.5 L 520.5 193.5 L 488.5 193.5 Z M 1401.5 161.5 L 1434.5 161.5 L 1434.5 193.5 L 1401.5 193.5 Z M 1310.5 161.5 L 1342.5 161.5 L 1342.5 193.5 L 1310.5 193.5 Z M 1219.5 161.5 L 1251.5 161.5 L 1251.5 193.5 L 1219.5 193.5 Z M 1127.5 161.5 L 1160.5 161.5 L 1160.5 193.5 L 1127.5 193.5 Z M 1036.5 161.5 L 1068.5 161.5 L 1068.5 193.5 L 1036.5 193.5 Z M 945.5 161.5 L 977.5 161.5 L 977.5 193.5 L 945.5 193.5 Z M 853.5 161.5 L 886.5 161.5 L 886.5 193.5 L 853.5 193.5 Z M 762.5 161.5 L 794.5 161.5 L 794.5 193.5 L 762.5 193.5 Z M 671.5 161.5 L 703.5 161.5 L 703.5 193.5 L 671.5 193.5 Z M 579.5 161.5 L 612.5 161.5 L 612.5 193.5 L 579.5 193.5 Z M 1404.5 252.5 L 1437.5 252.5 L 1437.5 256.5 L 1404.5 256.5 Z M 1404.5 256.5 L 1437.5 256.5 L 1437.5 285.5 L 1404.5 285.5 Z M 839.5 252.5 L 871.5 252.5 L 871.5 285.5 L 839.5 285.5 Z M 1336.5 252.5 L 1368.5 252.5 L 1368.5 285.5 L 1336.5 285.5 Z M 1267.5 252.5 L 1300.5 252.5 L 1300.5 285.5 L 1267.5 285.5 Z M 1199.5 252.5 L 1231.5 252.5 L 1231.5 285.5 L 1199.5 285.5 Z M 1045.5 252.5 L 1077.5 252.5 L 1077.5 285.5 L 1045.5 285.5 Z M 976.5 252.5 L 1008.5 252.5 L 1008.5 285.5 L 976.5 285.5 Z M 908.5 252.5 L 940.5 252.5 L 940.5 285.5 L 908.5 285.5 Z M 770.5 252.5 L 803.5 252.5 L 803.5 285.5 L 770.5 285.5 Z M 702.5 252.5 L 734.5 252.5 L 734.5 285.5 L 702.5 285.5 Z M 565.5 252.5 L 597.5 252.5 L 597.5 285.5 L 565.5 285.5 Z M 633.5 252.5 L 666.5 252.5 L 666.5 285.5 L 633.5 285.5 Z M 565.5 844.5 L 597.5 844.5 L 597.5 876.5 L 565.5 876.5 Z M 1409.5 844.5 L 1441.5 844.5 L 1441.5 876.5 L 1409.5 876.5 Z M 1340.5 844.5 L 1373.5 844.5 L 1373.5 876.5 L 1340.5 876.5 Z M 1272.5 844.5 L 1304.5 844.5 L 1304.5 876.5 L 1272.5 876.5 Z M 1203.5 844.5 L 1236.5 844.5 L 1236.5 876.5 L 1203.5 876.5 Z M 702.5 844.5 L 734.5 844.5 L 734.5 876.5 L 702.5 876.5 Z M 633.5 844.5 L 666.5 844.5 L 666.5 876.5 L 633.5 876.5 Z M 488.5 935.5 L 520.5 935.5 L 520.5 968.5 L 488.5 968.5 Z M 1401.5 935.5 L 1434.5 935.5 L 1434.5 968.5 L 1401.5 968.5 Z M 1310.5 935.5 L 1342.5 935.5 L 1342.5 968.5 L 1310.5 968.5 Z M 1219.5 935.5 L 1251.5 935.5 L 1251.5 968.5 L 1219.5 968.5 Z M 1127.5 935.5 L 1160.5 935.5 L 1160.5 968.5 L 1127.5 968.5 Z M 1036.5 935.5 L 1068.5 935.5 L 1068.5 968.5 L 1036.5 968.5 Z M 945.5 935.5 L 977.5 935.5 L 977.5 968.5 L 945.5 968.5 Z M 853.5 935.5 L 886.5 935.5 L 886.5 968.5 L 853.5 968.5 Z M 762.5 935.5 L 794.5 935.5 L 794.5 968.5 L 762.5 968.5 Z M 671.5 935.5 L 703.5 935.5 L 703.5 968.5 L 671.5 968.5 Z M 579.5 935.5 L 612.5 935.5 L 612.5 968.5 L 579.5 968.5 Z M 579.5 935.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface353">
+<g id="surface382">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -220,6 +220,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 508.433594 352.519531 L 522.910156 373.5 L 516.457031 373.5 L 505.292969 356.445312 L 494.074219 373.5 L 487.734375 373.5 L 502.207031 352.519531 L 488.632812 332.601562 L 494.972656 332.601562 L 505.460938 348.648438 L 516.007812 332.601562 L 522.234375 332.601562 Z M 508.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 488 742 L 520 742 M 488 710 L 520 710 M 488 710 L 488 742 M 520 710 L 520 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 488 742 L 520 742 M 488 710 L 520 710 M 520 742 L 520 710 M 488 742 L 488 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 458 122 L 458 131 M 453 127 L 462 127 M 457 128 L 459 128 M 457 126 L 459 126 M 457 126 L 457 128 M 459 126 L 459 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.svg b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.svg
index 695af06..8434725 100644
--- a/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.svg
+++ b/cells/o22ai/sky130_fd_sc_hvl__o22ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 535.5 98.5 L 1391.5 98.5 L 1391.5 593.5 L 535.5 593.5 Z M 535.5 98.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 597.5 161.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 632.5 701.5 L 1300.5 701.5 L 1300.5 709.5 L 632.5 709.5 Z M 632.5 709.5 L 1300.5 709.5 L 1300.5 741.5 L 632.5 741.5 Z M 632.5 741.5 L 1300.5 741.5 L 1300.5 804.5 L 632.5 804.5 Z M 632.5 804.5 L 1300.5 804.5 L 1300.5 836.5 L 632.5 836.5 Z M 632.5 836.5 L 1300.5 836.5 L 1300.5 844.5 L 632.5 844.5 Z M 632.5 836.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 645.5 245.5 L 699.5 245.5 L 699.5 252.5 L 645.5 252.5 Z M 929.5 245.5 L 997.5 245.5 L 997.5 252.5 L 929.5 252.5 Z M 1227.5 245.5 L 1281.5 245.5 L 1281.5 252.5 L 1227.5 252.5 Z M 929.5 252.5 L 997.5 252.5 L 997.5 285.5 L 929.5 285.5 Z M 1227.5 252.5 L 1281.5 252.5 L 1281.5 285.5 L 1227.5 285.5 Z M 645.5 252.5 L 699.5 252.5 L 699.5 285.5 L 645.5 285.5 Z M 1227.5 285.5 L 1281.5 285.5 L 1281.5 328.5 L 1227.5 328.5 Z M 645.5 285.5 L 699.5 285.5 L 699.5 329.5 L 645.5 329.5 Z M 929.5 285.5 L 997.5 285.5 L 997.5 331.5 L 929.5 331.5 Z M 1227.5 328.5 L 1281.5 328.5 L 1281.5 361.5 L 1227.5 361.5 Z M 645.5 329.5 L 699.5 329.5 L 699.5 362.5 L 645.5 362.5 Z M 929.5 331.5 L 997.5 331.5 L 997.5 364.5 L 929.5 364.5 Z M 1227.5 361.5 L 1281.5 361.5 L 1281.5 405.5 L 1227.5 405.5 Z M 645.5 362.5 L 699.5 362.5 L 699.5 408.5 L 645.5 408.5 Z M 929.5 364.5 L 997.5 364.5 L 997.5 411.5 L 929.5 411.5 Z M 1227.5 405.5 L 1281.5 405.5 L 1281.5 438.5 L 1227.5 438.5 Z M 645.5 408.5 L 699.5 408.5 L 699.5 441.5 L 645.5 441.5 Z M 929.5 411.5 L 997.5 411.5 L 997.5 444.5 L 929.5 444.5 Z M 1227.5 438.5 L 1281.5 438.5 L 1281.5 482.5 L 1227.5 482.5 Z M 645.5 441.5 L 699.5 441.5 L 699.5 485.5 L 645.5 485.5 Z M 929.5 444.5 L 997.5 444.5 L 997.5 490.5 L 929.5 490.5 Z M 1227.5 482.5 L 1281.5 482.5 L 1281.5 514.5 L 1227.5 514.5 Z M 645.5 485.5 L 699.5 485.5 L 699.5 518.5 L 645.5 518.5 Z M 929.5 490.5 L 997.5 490.5 L 997.5 522.5 L 929.5 522.5 Z M 929.5 522.5 L 997.5 522.5 L 997.5 530.5 L 929.5 530.5 Z M 645.5 518.5 L 699.5 518.5 L 699.5 530.5 L 645.5 530.5 Z M 794.5 245.5 L 834.5 245.5 L 834.5 530.5 L 794.5 530.5 Z M 1227.5 514.5 L 1281.5 514.5 L 1281.5 530.5 L 1227.5 530.5 Z M 1092.5 245.5 L 1132.5 245.5 L 1132.5 530.5 L 1092.5 530.5 Z M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1150.5 701.5 L 1245.5 701.5 L 1245.5 844.5 L 1150.5 844.5 Z M 686.5 701.5 L 781.5 701.5 L 781.5 844.5 L 686.5 844.5 Z M 834.5 701.5 L 929.5 701.5 L 929.5 844.5 L 834.5 844.5 Z M 983.5 701.5 L 1078.5 701.5 L 1078.5 844.5 L 983.5 844.5 Z M 983.5 701.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1132.5 245.5 L 1227.5 245.5 L 1227.5 530.5 L 1132.5 530.5 Z M 699.5 245.5 L 794.5 245.5 L 794.5 530.5 L 699.5 530.5 Z M 834.5 245.5 L 929.5 245.5 L 929.5 530.5 L 834.5 530.5 Z M 997.5 245.5 L 1092.5 245.5 L 1092.5 530.5 L 997.5 530.5 Z M 997.5 245.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 627.5 161.5 L 659.5 161.5 L 659.5 193.5 L 627.5 193.5 Z M 1266.5 161.5 L 1299.5 161.5 L 1299.5 193.5 L 1266.5 193.5 Z M 1175.5 161.5 L 1207.5 161.5 L 1207.5 193.5 L 1175.5 193.5 Z M 1084.5 161.5 L 1116.5 161.5 L 1116.5 193.5 L 1084.5 193.5 Z M 992.5 161.5 L 1025.5 161.5 L 1025.5 193.5 L 992.5 193.5 Z M 901.5 161.5 L 933.5 161.5 L 933.5 193.5 L 901.5 193.5 Z M 809.5 161.5 L 842.5 161.5 L 842.5 193.5 L 809.5 193.5 Z M 718.5 161.5 L 751.5 161.5 L 751.5 193.5 L 718.5 193.5 Z M 615.5 252.5 L 648.5 252.5 L 648.5 285.5 L 615.5 285.5 Z M 1247.5 252.5 L 1280.5 252.5 L 1280.5 285.5 L 1247.5 285.5 Z M 1179.5 252.5 L 1211.5 252.5 L 1211.5 285.5 L 1179.5 285.5 Z M 1110.5 252.5 L 1143.5 252.5 L 1143.5 285.5 L 1110.5 285.5 Z M 1042.5 252.5 L 1074.5 252.5 L 1074.5 285.5 L 1042.5 285.5 Z M 821.5 252.5 L 853.5 252.5 L 853.5 285.5 L 821.5 285.5 Z M 752.5 252.5 L 785.5 252.5 L 785.5 285.5 L 752.5 285.5 Z M 684.5 252.5 L 716.5 252.5 L 716.5 285.5 L 684.5 285.5 Z M 1016.5 844.5 L 1048.5 844.5 L 1048.5 876.5 L 1016.5 876.5 Z M 1153.5 844.5 L 1185.5 844.5 L 1185.5 876.5 L 1153.5 876.5 Z M 1084.5 844.5 L 1117.5 844.5 L 1117.5 876.5 L 1084.5 876.5 Z M 627.5 935.5 L 659.5 935.5 L 659.5 968.5 L 627.5 968.5 Z M 1266.5 935.5 L 1299.5 935.5 L 1299.5 968.5 L 1266.5 968.5 Z M 1175.5 935.5 L 1207.5 935.5 L 1207.5 968.5 L 1175.5 968.5 Z M 1084.5 935.5 L 1116.5 935.5 L 1116.5 968.5 L 1084.5 968.5 Z M 992.5 935.5 L 1025.5 935.5 L 1025.5 968.5 L 992.5 968.5 Z M 901.5 935.5 L 933.5 935.5 L 933.5 968.5 L 901.5 968.5 Z M 809.5 935.5 L 842.5 935.5 L 842.5 968.5 L 809.5 968.5 Z M 718.5 935.5 L 751.5 935.5 L 751.5 968.5 L 718.5 968.5 Z M 718.5 935.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface333">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -203,6 +203,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 921.210938 357.457031 L 921.210938 373.5 L 915.992188 373.5 L 915.992188 357.457031 L 900.230469 332.601562 L 906.679688 332.601562 L 918.6875 352.519531 L 930.355469 332.601562 L 936.582031 332.601562 Z M 921.210938 357.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 901 742 L 933 742 M 901 710 L 933 710 M 901 710 L 901 742 M 933 710 L 933 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 901 742 L 933 742 M 901 710 L 933 710 M 933 742 L 933 710 M 901 742 L 901 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 597 122 L 597 131 M 592 127 L 601 127 M 596 128 L 598 128 M 596 126 L 598 126 M 596 126 L 596 128 M 598 126 L 598 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2/sky130_fd_sc_hvl__or2_1.svg b/cells/or2/sky130_fd_sc_hvl__or2_1.svg
index 81ab305..42fcc35 100644
--- a/cells/or2/sky130_fd_sc_hvl__or2_1.svg
+++ b/cells/or2/sky130_fd_sc_hvl__or2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 580.5 98.5 L 1345.5 98.5 L 1345.5 593.5 L 580.5 593.5 Z M 580.5 98.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 643.5 161.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 643.5 161.5 L 1282.5 161.5 L 1282.5 193.5 L 643.5 193.5 Z M 1050.5 707.5 L 1254.5 707.5 L 1254.5 715.5 L 1050.5 715.5 Z M 1050.5 715.5 L 1254.5 715.5 L 1254.5 747.5 L 1050.5 747.5 Z M 1050.5 747.5 L 1254.5 747.5 L 1254.5 770.5 L 1050.5 770.5 Z M 723.5 770.5 L 1254.5 770.5 L 1254.5 794.5 L 723.5 794.5 Z M 723.5 794.5 L 1254.5 794.5 L 1254.5 826.5 L 723.5 826.5 Z M 723.5 826.5 L 1254.5 826.5 L 1254.5 850.5 L 723.5 850.5 Z M 723.5 826.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1050.5 245.5 L 1104.5 245.5 L 1104.5 252.5 L 1050.5 252.5 Z M 1200.5 245.5 L 1254.5 245.5 L 1254.5 252.5 L 1200.5 252.5 Z M 1200.5 252.5 L 1254.5 252.5 L 1254.5 285.5 L 1200.5 285.5 Z M 1050.5 252.5 L 1104.5 252.5 L 1104.5 285.5 L 1050.5 285.5 Z M 1200.5 285.5 L 1254.5 285.5 L 1254.5 331.5 L 1200.5 331.5 Z M 1050.5 285.5 L 1104.5 285.5 L 1104.5 331.5 L 1050.5 331.5 Z M 1050.5 331.5 L 1104.5 331.5 L 1104.5 364.5 L 1050.5 364.5 Z M 1200.5 331.5 L 1254.5 331.5 L 1254.5 364.5 L 1200.5 364.5 Z M 1200.5 364.5 L 1254.5 364.5 L 1254.5 411.5 L 1200.5 411.5 Z M 1050.5 364.5 L 1104.5 364.5 L 1104.5 411.5 L 1050.5 411.5 Z M 1200.5 411.5 L 1254.5 411.5 L 1254.5 444.5 L 1200.5 444.5 Z M 1050.5 411.5 L 1104.5 411.5 L 1104.5 444.5 L 1050.5 444.5 Z M 1050.5 444.5 L 1104.5 444.5 L 1104.5 450.5 L 1050.5 450.5 Z M 723.5 450.5 L 777.5 450.5 L 777.5 474.5 L 723.5 474.5 Z M 1007.5 450.5 L 1104.5 450.5 L 1104.5 490.5 L 1007.5 490.5 Z M 1200.5 444.5 L 1254.5 444.5 L 1254.5 490.5 L 1200.5 490.5 Z M 723.5 474.5 L 777.5 474.5 L 777.5 506.5 L 723.5 506.5 Z M 1007.5 490.5 L 1104.5 490.5 L 1104.5 522.5 L 1007.5 522.5 Z M 1200.5 490.5 L 1254.5 490.5 L 1254.5 522.5 L 1200.5 522.5 Z M 1200.5 522.5 L 1254.5 522.5 L 1254.5 530.5 L 1200.5 530.5 Z M 723.5 506.5 L 777.5 506.5 L 777.5 530.5 L 723.5 530.5 Z M 872.5 450.5 L 912.5 450.5 L 912.5 530.5 L 872.5 530.5 Z M 1007.5 522.5 L 1104.5 522.5 L 1104.5 530.5 L 1007.5 530.5 Z M 643.5 935.5 L 1282.5 935.5 L 1282.5 968.5 L 643.5 968.5 Z M 643.5 935.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1104.5 707.5 L 1200.5 707.5 L 1200.5 850.5 L 1104.5 850.5 Z M 777.5 770.5 L 872.5 770.5 L 872.5 850.5 L 777.5 850.5 Z M 926.5 770.5 L 1021.5 770.5 L 1021.5 850.5 L 926.5 850.5 Z M 926.5 770.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1104.5 245.5 L 1200.5 245.5 L 1200.5 530.5 L 1104.5 530.5 Z M 777.5 450.5 L 872.5 450.5 L 872.5 530.5 L 777.5 530.5 Z M 912.5 450.5 L 1007.5 450.5 L 1007.5 530.5 L 912.5 530.5 Z M 912.5 450.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 672.5 161.5 L 705.5 161.5 L 705.5 193.5 L 672.5 193.5 Z M 1221.5 161.5 L 1253.5 161.5 L 1253.5 193.5 L 1221.5 193.5 Z M 1129.5 161.5 L 1162.5 161.5 L 1162.5 193.5 L 1129.5 193.5 Z M 1038.5 161.5 L 1070.5 161.5 L 1070.5 193.5 L 1038.5 193.5 Z M 947.5 161.5 L 979.5 161.5 L 979.5 193.5 L 947.5 193.5 Z M 855.5 161.5 L 888.5 161.5 L 888.5 193.5 L 855.5 193.5 Z M 764.5 161.5 L 796.5 161.5 L 796.5 193.5 L 764.5 193.5 Z M 801.5 252.5 L 833.5 252.5 L 833.5 285.5 L 801.5 285.5 Z M 1143.5 252.5 L 1176.5 252.5 L 1176.5 285.5 L 1143.5 285.5 Z M 1075.5 252.5 L 1107.5 252.5 L 1107.5 285.5 L 1075.5 285.5 Z M 1006.5 252.5 L 1039.5 252.5 L 1039.5 285.5 L 1006.5 285.5 Z M 938.5 252.5 L 970.5 252.5 L 970.5 285.5 L 938.5 285.5 Z M 869.5 252.5 L 902.5 252.5 L 902.5 285.5 L 869.5 285.5 Z M 662.5 844.5 L 694.5 844.5 L 694.5 876.5 L 662.5 876.5 Z M 1105.5 844.5 L 1138.5 844.5 L 1138.5 876.5 L 1105.5 876.5 Z M 1037.5 844.5 L 1069.5 844.5 L 1069.5 876.5 L 1037.5 876.5 Z M 799.5 844.5 L 831.5 844.5 L 831.5 876.5 L 799.5 876.5 Z M 731.5 844.5 L 763.5 844.5 L 763.5 876.5 L 731.5 876.5 Z M 672.5 935.5 L 705.5 935.5 L 705.5 968.5 L 672.5 968.5 Z M 1221.5 935.5 L 1253.5 935.5 L 1253.5 968.5 L 1221.5 968.5 Z M 1129.5 935.5 L 1162.5 935.5 L 1162.5 968.5 L 1129.5 968.5 Z M 1038.5 935.5 L 1070.5 935.5 L 1070.5 968.5 L 1038.5 968.5 Z M 947.5 935.5 L 979.5 935.5 L 979.5 968.5 L 947.5 968.5 Z M 855.5 935.5 L 888.5 935.5 L 888.5 968.5 L 855.5 968.5 Z M 764.5 935.5 L 796.5 935.5 L 796.5 968.5 L 764.5 968.5 Z M 764.5 935.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -198,6 +198,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 798.449219 713.832031 L 798.339844 715.625 L 798.058594 717.253906 L 797.554688 718.769531 L 796.878906 720.113281 L 795.984375 721.40625 L 794.917969 722.527344 L 793.738281 723.480469 L 792.503906 724.210938 L 791.101562 724.769531 L 789.644531 725.21875 L 788.070312 725.445312 L 786.390625 725.5 L 767.933594 725.5 L 767.933594 684.601562 L 784.539062 684.601562 L 786.949219 684.769531 L 789.082031 685.164062 L 790.988281 685.835938 L 792.617188 686.789062 L 794.019531 688.023438 L 795.140625 689.539062 L 795.589844 690.378906 L 795.984375 691.277344 L 796.261719 692.121094 L 796.488281 693.074219 L 796.597656 694.027344 L 796.65625 694.980469 L 796.488281 697 L 795.984375 698.738281 L 795.195312 700.367188 L 794.074219 701.714844 L 792.671875 702.949219 L 790.988281 703.902344 L 792.617188 704.628906 L 794.019531 705.414062 L 795.253906 706.3125 L 796.261719 707.324219 L 797.046875 708.390625 L 797.664062 709.511719 L 797.890625 710.183594 L 798.058594 710.859375 L 798.226562 711.53125 L 798.339844 712.316406 L 798.394531 713.046875 Z M 791.4375 695.710938 L 791.269531 694.027344 L 790.765625 692.625 L 789.980469 691.390625 L 788.859375 690.492188 L 787.457031 689.820312 L 785.714844 689.371094 L 785.324219 689.371094 L 784.929688 689.316406 L 784.539062 689.257812 L 783.640625 689.257812 L 783.246094 689.203125 L 773.148438 689.203125 L 773.148438 702.21875 L 783.246094 702.21875 L 785.324219 702.105469 L 787.117188 701.769531 L 788.632812 701.152344 L 789.753906 700.3125 L 790.652344 699.1875 L 791.214844 697.84375 L 791.269531 697.5625 L 791.324219 697.226562 L 791.382812 696.886719 L 791.382812 696.101562 Z M 785.882812 720.898438 L 787.457031 720.84375 L 788.859375 720.507812 L 790.09375 719.945312 L 791.101562 719.214844 L 791.941406 718.261719 L 792.617188 717.085938 L 792.785156 716.636719 L 792.898438 716.132812 L 793.066406 715.570312 L 793.121094 715.066406 L 793.175781 714.503906 L 793.234375 713.886719 L 793.121094 712.652344 L 792.898438 711.476562 L 792.503906 710.464844 L 791.941406 709.511719 L 791.214844 708.726562 L 790.371094 707.996094 L 789.753906 707.660156 L 789.082031 707.378906 L 788.351562 707.15625 L 787.566406 706.988281 L 786.726562 706.875 L 785.882812 706.820312 L 773.148438 706.820312 L 773.148438 720.898438 Z M 785.882812 720.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 764 390 L 796 390 M 764 358 L 796 358 M 764 358 L 764 390 M 796 358 L 796 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 764 390 L 796 390 M 764 358 L 796 358 M 796 390 L 796 358 M 764 390 L 764 358 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 643 122 L 643 131 M 638 127 L 647 127 M 642 128 L 644 128 M 642 126 L 644 126 M 642 126 L 642 128 M 644 126 L 644 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3/sky130_fd_sc_hvl__or3_1.svg b/cells/or3/sky130_fd_sc_hvl__or3_1.svg
index e17e882..03d29dc 100644
--- a/cells/or3/sky130_fd_sc_hvl__or3_1.svg
+++ b/cells/or3/sky130_fd_sc_hvl__or3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 535.5 98.5 L 1391.5 98.5 L 1391.5 593.5 L 535.5 593.5 Z M 535.5 98.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 597.5 161.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 597.5 161.5 L 1328.5 161.5 L 1328.5 193.5 L 597.5 193.5 Z M 1100.5 707.5 L 1300.5 707.5 L 1300.5 715.5 L 1100.5 715.5 Z M 1100.5 715.5 L 1300.5 715.5 L 1300.5 747.5 L 1100.5 747.5 Z M 1100.5 747.5 L 1300.5 747.5 L 1300.5 770.5 L 1100.5 770.5 Z M 626.5 770.5 L 1300.5 770.5 L 1300.5 794.5 L 626.5 794.5 Z M 626.5 794.5 L 1300.5 794.5 L 1300.5 826.5 L 626.5 826.5 Z M 626.5 826.5 L 1300.5 826.5 L 1300.5 850.5 L 626.5 850.5 Z M 626.5 826.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1096.5 245.5 L 1150.5 245.5 L 1150.5 252.5 L 1096.5 252.5 Z M 1245.5 245.5 L 1300.5 245.5 L 1300.5 252.5 L 1245.5 252.5 Z M 1245.5 252.5 L 1300.5 252.5 L 1300.5 285.5 L 1245.5 285.5 Z M 1096.5 252.5 L 1150.5 252.5 L 1150.5 285.5 L 1096.5 285.5 Z M 1245.5 285.5 L 1300.5 285.5 L 1300.5 331.5 L 1245.5 331.5 Z M 1096.5 285.5 L 1150.5 285.5 L 1150.5 331.5 L 1096.5 331.5 Z M 1245.5 331.5 L 1300.5 331.5 L 1300.5 364.5 L 1245.5 364.5 Z M 1096.5 331.5 L 1150.5 331.5 L 1150.5 364.5 L 1096.5 364.5 Z M 1096.5 364.5 L 1150.5 364.5 L 1150.5 411.5 L 1096.5 411.5 Z M 1245.5 364.5 L 1300.5 364.5 L 1300.5 411.5 L 1245.5 411.5 Z M 1096.5 411.5 L 1150.5 411.5 L 1150.5 430.5 L 1096.5 430.5 Z M 1245.5 411.5 L 1300.5 411.5 L 1300.5 444.5 L 1245.5 444.5 Z M 1057.5 430.5 L 1150.5 430.5 L 1150.5 444.5 L 1057.5 444.5 Z M 629.5 430.5 L 683.5 430.5 L 683.5 454.5 L 629.5 454.5 Z M 629.5 454.5 L 683.5 454.5 L 683.5 486.5 L 629.5 486.5 Z M 1057.5 444.5 L 1150.5 444.5 L 1150.5 490.5 L 1057.5 490.5 Z M 1245.5 444.5 L 1300.5 444.5 L 1300.5 490.5 L 1245.5 490.5 Z M 778.5 430.5 L 827.5 430.5 L 827.5 510.5 L 778.5 510.5 Z M 1057.5 490.5 L 1150.5 490.5 L 1150.5 510.5 L 1057.5 510.5 Z M 922.5 430.5 L 962.5 430.5 L 962.5 510.5 L 922.5 510.5 Z M 629.5 486.5 L 683.5 486.5 L 683.5 510.5 L 629.5 510.5 Z M 1096.5 510.5 L 1150.5 510.5 L 1150.5 522.5 L 1096.5 522.5 Z M 1245.5 490.5 L 1300.5 490.5 L 1300.5 522.5 L 1245.5 522.5 Z M 1245.5 522.5 L 1300.5 522.5 L 1300.5 530.5 L 1245.5 530.5 Z M 1096.5 522.5 L 1150.5 522.5 L 1150.5 530.5 L 1096.5 530.5 Z M 597.5 935.5 L 1328.5 935.5 L 1328.5 968.5 L 597.5 968.5 Z M 597.5 935.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1154.5 707.5 L 1249.5 707.5 L 1249.5 850.5 L 1154.5 850.5 Z M 676.5 770.5 L 771.5 770.5 L 771.5 850.5 L 676.5 850.5 Z M 975.5 770.5 L 1070.5 770.5 L 1070.5 850.5 L 975.5 850.5 Z M 827.5 770.5 L 922.5 770.5 L 922.5 850.5 L 827.5 850.5 Z M 827.5 770.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image350"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 827.5 430.5 L 922.5 430.5 L 922.5 510.5 L 827.5 510.5 Z M 683.5 430.5 L 778.5 430.5 L 778.5 510.5 L 683.5 510.5 Z M 962.5 430.5 L 1057.5 430.5 L 1057.5 510.5 L 962.5 510.5 Z M 1150.5 245.5 L 1245.5 245.5 L 1245.5 530.5 L 1150.5 530.5 Z M 1150.5 245.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image351"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 627.5 161.5 L 659.5 161.5 L 659.5 193.5 L 627.5 193.5 Z M 1266.5 161.5 L 1299.5 161.5 L 1299.5 193.5 L 1266.5 193.5 Z M 1175.5 161.5 L 1207.5 161.5 L 1207.5 193.5 L 1175.5 193.5 Z M 1084.5 161.5 L 1116.5 161.5 L 1116.5 193.5 L 1084.5 193.5 Z M 992.5 161.5 L 1025.5 161.5 L 1025.5 193.5 L 992.5 193.5 Z M 901.5 161.5 L 933.5 161.5 L 933.5 193.5 L 901.5 193.5 Z M 809.5 161.5 L 842.5 161.5 L 842.5 193.5 L 809.5 193.5 Z M 718.5 161.5 L 751.5 161.5 L 751.5 193.5 L 718.5 193.5 Z M 915.5 252.5 L 947.5 252.5 L 947.5 285.5 L 915.5 285.5 Z M 1189.5 252.5 L 1222.5 252.5 L 1222.5 285.5 L 1189.5 285.5 Z M 1121.5 252.5 L 1153.5 252.5 L 1153.5 285.5 L 1121.5 285.5 Z M 1052.5 252.5 L 1084.5 252.5 L 1084.5 285.5 L 1052.5 285.5 Z M 984.5 252.5 L 1016.5 252.5 L 1016.5 285.5 L 984.5 285.5 Z M 708.5 844.5 L 740.5 844.5 L 740.5 876.5 L 708.5 876.5 Z M 1178.5 844.5 L 1210.5 844.5 L 1210.5 876.5 L 1178.5 876.5 Z M 1109.5 844.5 L 1142.5 844.5 L 1142.5 876.5 L 1109.5 876.5 Z M 819.5 844.5 L 851.5 844.5 L 851.5 876.5 L 819.5 876.5 Z M 627.5 935.5 L 659.5 935.5 L 659.5 968.5 L 627.5 968.5 Z M 1266.5 935.5 L 1299.5 935.5 L 1299.5 968.5 L 1266.5 968.5 Z M 1175.5 935.5 L 1207.5 935.5 L 1207.5 968.5 L 1175.5 968.5 Z M 1084.5 935.5 L 1116.5 935.5 L 1116.5 968.5 L 1084.5 968.5 Z M 992.5 935.5 L 1025.5 935.5 L 1025.5 968.5 L 992.5 968.5 Z M 901.5 935.5 L 933.5 935.5 L 933.5 968.5 L 901.5 968.5 Z M 809.5 935.5 L 842.5 935.5 L 842.5 968.5 L 809.5 968.5 Z M 718.5 935.5 L 751.5 935.5 L 751.5 968.5 L 718.5 968.5 Z M 718.5 935.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -225,6 +225,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1286.433594 352.519531 L 1300.910156 373.5 L 1294.457031 373.5 L 1283.292969 356.445312 L 1272.074219 373.5 L 1265.734375 373.5 L 1280.207031 352.519531 L 1266.632812 332.601562 L 1272.972656 332.601562 L 1283.460938 348.648438 L 1294.007812 332.601562 L 1300.234375 332.601562 Z M 1286.433594 352.519531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1266 742 L 1299 742 M 1266 710 L 1299 710 M 1266 710 L 1266 742 M 1299 710 L 1299 742 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1266 742 L 1299 742 M 1266 710 L 1299 710 M 1299 742 L 1299 710 M 1266 742 L 1266 710 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 597 122 L 597 131 M 592 127 L 601 127 M 596 128 L 598 128 M 596 126 L 598 126 M 596 126 L 596 128 M 598 126 L 598 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.svg b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.svg
index 9f2618c..1b47931 100644
--- a/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.svg
+++ b/cells/probe_p/sky130_fd_sc_hvl__probe_p_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 183.5 L 1744.5 183.5 L 1744.5 581.5 L 174.5 581.5 Z M 174.5 183.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 225.5 234.5 L 1693.5 234.5 L 1693.5 260.5 L 225.5 260.5 Z M 225.5 234.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 225.5 234.5 L 1693.5 234.5 L 1693.5 260.5 L 225.5 260.5 Z M 262.5 647.5 L 1659.5 647.5 L 1659.5 656.5 L 262.5 656.5 Z M 262.5 656.5 L 1659.5 656.5 L 1659.5 682.5 L 262.5 682.5 Z M 262.5 682.5 L 1659.5 682.5 L 1659.5 708.5 L 262.5 708.5 Z M 262.5 708.5 L 1659.5 708.5 L 1659.5 734.5 L 262.5 734.5 Z M 262.5 734.5 L 1659.5 734.5 L 1659.5 761.5 L 262.5 761.5 Z M 262.5 734.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 225.5 856.5 L 1693.5 856.5 L 1693.5 882.5 L 225.5 882.5 Z M 225.5 856.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 899.5 301.5 L 942.5 301.5 L 942.5 310.5 L 899.5 310.5 Z M 1138.5 301.5 L 1181.5 301.5 L 1181.5 310.5 L 1138.5 310.5 Z M 379.5 301.5 L 465.5 301.5 L 465.5 310.5 L 379.5 310.5 Z M 1376.5 301.5 L 1419.5 301.5 L 1419.5 310.5 L 1376.5 310.5 Z M 661.5 301.5 L 703.5 301.5 L 703.5 310.5 L 661.5 310.5 Z M 1615.5 301.5 L 1656.5 301.5 L 1656.5 310.5 L 1615.5 310.5 Z M 1376.5 310.5 L 1419.5 310.5 L 1419.5 336.5 L 1376.5 336.5 Z M 379.5 310.5 L 465.5 310.5 L 465.5 336.5 L 379.5 336.5 Z M 899.5 310.5 L 942.5 310.5 L 942.5 336.5 L 899.5 336.5 Z M 661.5 310.5 L 703.5 310.5 L 703.5 336.5 L 661.5 336.5 Z M 1615.5 310.5 L 1656.5 310.5 L 1656.5 336.5 L 1615.5 336.5 Z M 1138.5 310.5 L 1181.5 310.5 L 1181.5 336.5 L 1138.5 336.5 Z M 259.5 301.5 L 303.5 301.5 L 303.5 339.5 L 259.5 339.5 Z M 1257.5 301.5 L 1300.5 301.5 L 1300.5 342.5 L 1257.5 342.5 Z M 1496.5 301.5 L 1539.5 301.5 L 1539.5 342.5 L 1496.5 342.5 Z M 1019.5 301.5 L 1061.5 301.5 L 1061.5 342.5 L 1019.5 342.5 Z M 780.5 301.5 L 823.5 301.5 L 823.5 342.5 L 780.5 342.5 Z M 541.5 301.5 L 584.5 301.5 L 584.5 342.5 L 541.5 342.5 Z M 1376.5 336.5 L 1419.5 336.5 L 1419.5 362.5 L 1376.5 362.5 Z M 661.5 336.5 L 703.5 336.5 L 703.5 362.5 L 661.5 362.5 Z M 1615.5 336.5 L 1656.5 336.5 L 1656.5 362.5 L 1615.5 362.5 Z M 899.5 336.5 L 942.5 336.5 L 942.5 362.5 L 899.5 362.5 Z M 379.5 336.5 L 465.5 336.5 L 465.5 362.5 L 379.5 362.5 Z M 1138.5 336.5 L 1181.5 336.5 L 1181.5 362.5 L 1138.5 362.5 Z M 259.5 339.5 L 303.5 339.5 L 303.5 365.5 L 259.5 365.5 Z M 541.5 342.5 L 584.5 342.5 L 584.5 368.5 L 541.5 368.5 Z M 780.5 342.5 L 823.5 342.5 L 823.5 368.5 L 780.5 368.5 Z M 1019.5 342.5 L 1061.5 342.5 L 1061.5 368.5 L 1019.5 368.5 Z M 1257.5 342.5 L 1300.5 342.5 L 1300.5 368.5 L 1257.5 368.5 Z M 1496.5 342.5 L 1539.5 342.5 L 1539.5 368.5 L 1496.5 368.5 Z M 1376.5 362.5 L 1419.5 362.5 L 1419.5 388.5 L 1376.5 388.5 Z M 899.5 362.5 L 942.5 362.5 L 942.5 388.5 L 899.5 388.5 Z M 1615.5 362.5 L 1656.5 362.5 L 1656.5 388.5 L 1615.5 388.5 Z M 379.5 362.5 L 465.5 362.5 L 465.5 388.5 L 379.5 388.5 Z M 1138.5 362.5 L 1181.5 362.5 L 1181.5 388.5 L 1138.5 388.5 Z M 661.5 362.5 L 703.5 362.5 L 703.5 388.5 L 661.5 388.5 Z M 259.5 365.5 L 303.5 365.5 L 303.5 391.5 L 259.5 391.5 Z M 1019.5 368.5 L 1061.5 368.5 L 1061.5 394.5 L 1019.5 394.5 Z M 541.5 368.5 L 584.5 368.5 L 584.5 394.5 L 541.5 394.5 Z M 780.5 368.5 L 823.5 368.5 L 823.5 394.5 L 780.5 394.5 Z M 1496.5 368.5 L 1539.5 368.5 L 1539.5 394.5 L 1496.5 394.5 Z M 1257.5 368.5 L 1300.5 368.5 L 1300.5 394.5 L 1257.5 394.5 Z M 899.5 388.5 L 942.5 388.5 L 942.5 414.5 L 899.5 414.5 Z M 379.5 388.5 L 465.5 388.5 L 465.5 414.5 L 379.5 414.5 Z M 661.5 388.5 L 703.5 388.5 L 703.5 414.5 L 661.5 414.5 Z M 1615.5 388.5 L 1656.5 388.5 L 1656.5 414.5 L 1615.5 414.5 Z M 1376.5 388.5 L 1419.5 388.5 L 1419.5 414.5 L 1376.5 414.5 Z M 1138.5 388.5 L 1181.5 388.5 L 1181.5 414.5 L 1138.5 414.5 Z M 259.5 391.5 L 303.5 391.5 L 303.5 417.5 L 259.5 417.5 Z M 1496.5 394.5 L 1539.5 394.5 L 1539.5 420.5 L 1496.5 420.5 Z M 1257.5 394.5 L 1300.5 394.5 L 1300.5 420.5 L 1257.5 420.5 Z M 780.5 394.5 L 823.5 394.5 L 823.5 420.5 L 780.5 420.5 Z M 541.5 394.5 L 584.5 394.5 L 584.5 420.5 L 541.5 420.5 Z M 1019.5 394.5 L 1061.5 394.5 L 1061.5 420.5 L 1019.5 420.5 Z M 1138.5 414.5 L 1181.5 414.5 L 1181.5 440.5 L 1138.5 440.5 Z M 1376.5 414.5 L 1419.5 414.5 L 1419.5 440.5 L 1376.5 440.5 Z M 379.5 414.5 L 465.5 414.5 L 465.5 440.5 L 379.5 440.5 Z M 661.5 414.5 L 703.5 414.5 L 703.5 440.5 L 661.5 440.5 Z M 899.5 414.5 L 942.5 414.5 L 942.5 440.5 L 899.5 440.5 Z M 1615.5 414.5 L 1656.5 414.5 L 1656.5 440.5 L 1615.5 440.5 Z M 259.5 417.5 L 303.5 417.5 L 303.5 443.5 L 259.5 443.5 Z M 1496.5 420.5 L 1539.5 420.5 L 1539.5 446.5 L 1496.5 446.5 Z M 780.5 420.5 L 823.5 420.5 L 823.5 446.5 L 780.5 446.5 Z M 541.5 420.5 L 584.5 420.5 L 584.5 446.5 L 541.5 446.5 Z M 1019.5 420.5 L 1061.5 420.5 L 1061.5 446.5 L 1019.5 446.5 Z M 1257.5 420.5 L 1300.5 420.5 L 1300.5 446.5 L 1257.5 446.5 Z M 661.5 440.5 L 703.5 440.5 L 703.5 466.5 L 661.5 466.5 Z M 379.5 440.5 L 465.5 440.5 L 465.5 466.5 L 379.5 466.5 Z M 1138.5 440.5 L 1181.5 440.5 L 1181.5 466.5 L 1138.5 466.5 Z M 1376.5 440.5 L 1419.5 440.5 L 1419.5 466.5 L 1376.5 466.5 Z M 899.5 440.5 L 942.5 440.5 L 942.5 466.5 L 899.5 466.5 Z M 1615.5 440.5 L 1656.5 440.5 L 1656.5 466.5 L 1615.5 466.5 Z M 259.5 443.5 L 303.5 443.5 L 303.5 469.5 L 259.5 469.5 Z M 1257.5 446.5 L 1300.5 446.5 L 1300.5 472.5 L 1257.5 472.5 Z M 1496.5 446.5 L 1539.5 446.5 L 1539.5 472.5 L 1496.5 472.5 Z M 541.5 446.5 L 584.5 446.5 L 584.5 472.5 L 541.5 472.5 Z M 780.5 446.5 L 823.5 446.5 L 823.5 472.5 L 780.5 472.5 Z M 1019.5 446.5 L 1061.5 446.5 L 1061.5 472.5 L 1019.5 472.5 Z M 1376.5 466.5 L 1419.5 466.5 L 1419.5 492.5 L 1376.5 492.5 Z M 899.5 466.5 L 942.5 466.5 L 942.5 492.5 L 899.5 492.5 Z M 1138.5 466.5 L 1181.5 466.5 L 1181.5 492.5 L 1138.5 492.5 Z M 1615.5 466.5 L 1656.5 466.5 L 1656.5 492.5 L 1615.5 492.5 Z M 661.5 466.5 L 703.5 466.5 L 703.5 492.5 L 661.5 492.5 Z M 379.5 466.5 L 465.5 466.5 L 465.5 492.5 L 379.5 492.5 Z M 259.5 469.5 L 303.5 469.5 L 303.5 495.5 L 259.5 495.5 Z M 1257.5 472.5 L 1300.5 472.5 L 1300.5 498.5 L 1257.5 498.5 Z M 1496.5 472.5 L 1539.5 472.5 L 1539.5 498.5 L 1496.5 498.5 Z M 541.5 472.5 L 584.5 472.5 L 584.5 498.5 L 541.5 498.5 Z M 1019.5 472.5 L 1061.5 472.5 L 1061.5 498.5 L 1019.5 498.5 Z M 780.5 472.5 L 823.5 472.5 L 823.5 498.5 L 780.5 498.5 Z M 259.5 495.5 L 303.5 495.5 L 303.5 521.5 L 259.5 521.5 Z M 541.5 498.5 L 584.5 498.5 L 584.5 524.5 L 541.5 524.5 Z M 780.5 498.5 L 823.5 498.5 L 823.5 524.5 L 780.5 524.5 Z M 1257.5 498.5 L 1300.5 498.5 L 1300.5 524.5 L 1257.5 524.5 Z M 1019.5 498.5 L 1061.5 498.5 L 1061.5 524.5 L 1019.5 524.5 Z M 1496.5 498.5 L 1539.5 498.5 L 1539.5 524.5 L 1496.5 524.5 Z M 379.5 492.5 L 465.5 492.5 L 465.5 530.5 L 379.5 530.5 Z M 899.5 492.5 L 942.5 492.5 L 942.5 530.5 L 899.5 530.5 Z M 661.5 492.5 L 703.5 492.5 L 703.5 530.5 L 661.5 530.5 Z M 780.5 524.5 L 823.5 524.5 L 823.5 530.5 L 780.5 530.5 Z M 1257.5 524.5 L 1300.5 524.5 L 1300.5 530.5 L 1257.5 530.5 Z M 541.5 524.5 L 584.5 524.5 L 584.5 530.5 L 541.5 530.5 Z M 1615.5 492.5 L 1656.5 492.5 L 1656.5 530.5 L 1615.5 530.5 Z M 1376.5 492.5 L 1419.5 492.5 L 1419.5 530.5 L 1376.5 530.5 Z M 1138.5 492.5 L 1181.5 492.5 L 1181.5 530.5 L 1138.5 530.5 Z M 1496.5 524.5 L 1539.5 524.5 L 1539.5 530.5 L 1496.5 530.5 Z M 259.5 521.5 L 303.5 521.5 L 303.5 530.5 L 259.5 530.5 Z M 1019.5 524.5 L 1061.5 524.5 L 1061.5 530.5 L 1019.5 530.5 Z M 225.5 856.5 L 1693.5 856.5 L 1693.5 882.5 L 225.5 882.5 Z M 225.5 856.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1539.5 647.5 L 1615.5 647.5 L 1615.5 761.5 L 1539.5 761.5 Z M 306.5 647.5 L 382.5 647.5 L 382.5 761.5 L 306.5 761.5 Z M 465.5 647.5 L 541.5 647.5 L 541.5 761.5 L 465.5 761.5 Z M 584.5 647.5 L 661.5 647.5 L 661.5 761.5 L 584.5 761.5 Z M 703.5 647.5 L 780.5 647.5 L 780.5 761.5 L 703.5 761.5 Z M 823.5 647.5 L 899.5 647.5 L 899.5 761.5 L 823.5 761.5 Z M 942.5 647.5 L 1019.5 647.5 L 1019.5 761.5 L 942.5 761.5 Z M 1061.5 647.5 L 1138.5 647.5 L 1138.5 761.5 L 1061.5 761.5 Z M 1181.5 647.5 L 1257.5 647.5 L 1257.5 761.5 L 1181.5 761.5 Z M 1300.5 647.5 L 1376.5 647.5 L 1376.5 761.5 L 1300.5 761.5 Z M 1419.5 647.5 L 1496.5 647.5 L 1496.5 761.5 L 1419.5 761.5 Z M 1419.5 647.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image434"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1539.5 301.5 L 1615.5 301.5 L 1615.5 530.5 L 1539.5 530.5 Z M 303.5 301.5 L 379.5 301.5 L 379.5 530.5 L 303.5 530.5 Z M 465.5 301.5 L 541.5 301.5 L 541.5 530.5 L 465.5 530.5 Z M 584.5 301.5 L 661.5 301.5 L 661.5 530.5 L 584.5 530.5 Z M 703.5 301.5 L 780.5 301.5 L 780.5 530.5 L 703.5 530.5 Z M 823.5 301.5 L 899.5 301.5 L 899.5 530.5 L 823.5 530.5 Z M 942.5 301.5 L 1019.5 301.5 L 1019.5 530.5 L 942.5 530.5 Z M 1061.5 301.5 L 1138.5 301.5 L 1138.5 530.5 L 1061.5 530.5 Z M 1181.5 301.5 L 1257.5 301.5 L 1257.5 530.5 L 1181.5 530.5 Z M 1300.5 301.5 L 1376.5 301.5 L 1376.5 530.5 L 1300.5 530.5 Z M 1419.5 301.5 L 1496.5 301.5 L 1496.5 530.5 L 1419.5 530.5 Z M 1419.5 301.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image435"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -85,9 +85,9 @@
 <clipPath id="clip12">
   <path d="M 728.5 468.5 L 1190.5 468.5 L 1190.5 469.5 L 728.5 469.5 Z M 728.5 468.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
+<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image406"/>
+  <use xlink:href="#image436"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
@@ -101,9 +101,9 @@
 <clipPath id="clip15">
   <path d="M 248.5 234.5 L 274.5 234.5 L 274.5 260.5 L 248.5 260.5 Z M 1643.5 234.5 L 1669.5 234.5 L 1669.5 260.5 L 1643.5 260.5 Z M 1570.5 234.5 L 1596.5 234.5 L 1596.5 260.5 L 1570.5 260.5 Z M 1496.5 234.5 L 1522.5 234.5 L 1522.5 260.5 L 1496.5 260.5 Z M 1423.5 234.5 L 1449.5 234.5 L 1449.5 260.5 L 1423.5 260.5 Z M 1350.5 234.5 L 1376.5 234.5 L 1376.5 260.5 L 1350.5 260.5 Z M 1276.5 234.5 L 1302.5 234.5 L 1302.5 260.5 L 1276.5 260.5 Z M 1203.5 234.5 L 1229.5 234.5 L 1229.5 260.5 L 1203.5 260.5 Z M 1129.5 234.5 L 1155.5 234.5 L 1155.5 260.5 L 1129.5 260.5 Z M 1056.5 234.5 L 1082.5 234.5 L 1082.5 260.5 L 1056.5 260.5 Z M 983.5 234.5 L 1009.5 234.5 L 1009.5 260.5 L 983.5 260.5 Z M 909.5 234.5 L 935.5 234.5 L 935.5 260.5 L 909.5 260.5 Z M 836.5 234.5 L 862.5 234.5 L 862.5 260.5 L 836.5 260.5 Z M 762.5 234.5 L 788.5 234.5 L 788.5 260.5 L 762.5 260.5 Z M 689.5 234.5 L 715.5 234.5 L 715.5 260.5 L 689.5 260.5 Z M 615.5 234.5 L 641.5 234.5 L 641.5 260.5 L 615.5 260.5 Z M 542.5 234.5 L 568.5 234.5 L 568.5 260.5 L 542.5 260.5 Z M 469.5 234.5 L 495.5 234.5 L 495.5 260.5 L 469.5 260.5 Z M 395.5 234.5 L 421.5 234.5 L 421.5 260.5 L 395.5 260.5 Z M 322.5 234.5 L 348.5 234.5 L 348.5 260.5 L 322.5 260.5 Z M 374.5 312.5 L 400.5 312.5 L 400.5 336.5 L 374.5 336.5 Z M 1146.5 312.5 L 1172.5 312.5 L 1172.5 336.5 L 1146.5 336.5 Z M 1642.5 312.5 L 1668.5 312.5 L 1668.5 336.5 L 1642.5 336.5 Z M 908.5 312.5 L 934.5 312.5 L 934.5 336.5 L 908.5 336.5 Z M 648.5 312.5 L 674.5 312.5 L 674.5 336.5 L 648.5 336.5 Z M 319.5 312.5 L 345.5 312.5 L 345.5 338.5 L 319.5 338.5 Z M 1440.5 312.5 L 1466.5 312.5 L 1466.5 338.5 L 1440.5 338.5 Z M 1091.5 312.5 L 1117.5 312.5 L 1117.5 338.5 L 1091.5 338.5 Z M 963.5 312.5 L 989.5 312.5 L 989.5 338.5 L 963.5 338.5 Z M 1331.5 312.5 L 1357.5 312.5 L 1357.5 338.5 L 1331.5 338.5 Z M 484.5 312.5 L 510.5 312.5 L 510.5 338.5 L 484.5 338.5 Z M 853.5 312.5 L 879.5 312.5 L 879.5 338.5 L 853.5 338.5 Z M 703.5 312.5 L 729.5 312.5 L 729.5 338.5 L 703.5 338.5 Z M 1146.5 336.5 L 1172.5 336.5 L 1172.5 338.5 L 1146.5 338.5 Z M 1642.5 336.5 L 1668.5 336.5 L 1668.5 338.5 L 1642.5 338.5 Z M 1587.5 312.5 L 1613.5 312.5 L 1613.5 338.5 L 1587.5 338.5 Z M 374.5 336.5 L 400.5 336.5 L 400.5 338.5 L 374.5 338.5 Z M 429.5 312.5 L 455.5 312.5 L 455.5 338.5 L 429.5 338.5 Z M 908.5 336.5 L 934.5 336.5 L 934.5 338.5 L 908.5 338.5 Z M 1201.5 312.5 L 1227.5 312.5 L 1227.5 338.5 L 1201.5 338.5 Z M 648.5 336.5 L 674.5 336.5 L 674.5 338.5 L 648.5 338.5 Z M 1253.5 532.5 L 1279.5 532.5 L 1279.5 558.5 L 1253.5 558.5 Z M 1308.5 532.5 L 1334.5 532.5 L 1334.5 558.5 L 1308.5 558.5 Z M 328.5 785.5 L 354.5 785.5 L 354.5 811.5 L 328.5 811.5 Z M 1653.5 785.5 L 1679.5 785.5 L 1679.5 811.5 L 1653.5 811.5 Z M 1597.5 785.5 L 1623.5 785.5 L 1623.5 811.5 L 1597.5 811.5 Z M 1441.5 785.5 L 1467.5 785.5 L 1467.5 811.5 L 1441.5 811.5 Z M 1386.5 785.5 L 1412.5 785.5 L 1412.5 811.5 L 1386.5 811.5 Z M 1331.5 785.5 L 1357.5 785.5 L 1357.5 811.5 L 1331.5 811.5 Z M 1202.5 785.5 L 1228.5 785.5 L 1228.5 811.5 L 1202.5 811.5 Z M 1147.5 785.5 L 1173.5 785.5 L 1173.5 811.5 L 1147.5 811.5 Z M 1092.5 785.5 L 1118.5 785.5 L 1118.5 811.5 L 1092.5 811.5 Z M 957.5 785.5 L 983.5 785.5 L 983.5 811.5 L 957.5 811.5 Z M 902.5 785.5 L 928.5 785.5 L 928.5 811.5 L 902.5 811.5 Z M 847.5 785.5 L 873.5 785.5 L 873.5 811.5 L 847.5 811.5 Z M 733.5 785.5 L 759.5 785.5 L 759.5 811.5 L 733.5 811.5 Z M 678.5 785.5 L 704.5 785.5 L 704.5 811.5 L 678.5 811.5 Z M 623.5 785.5 L 649.5 785.5 L 649.5 811.5 L 623.5 811.5 Z M 493.5 785.5 L 519.5 785.5 L 519.5 811.5 L 493.5 811.5 Z M 438.5 785.5 L 464.5 785.5 L 464.5 811.5 L 438.5 811.5 Z M 383.5 785.5 L 409.5 785.5 L 409.5 811.5 L 383.5 811.5 Z M 248.5 856.5 L 274.5 856.5 L 274.5 882.5 L 248.5 882.5 Z M 1643.5 856.5 L 1669.5 856.5 L 1669.5 882.5 L 1643.5 882.5 Z M 1570.5 856.5 L 1596.5 856.5 L 1596.5 882.5 L 1570.5 882.5 Z M 1496.5 856.5 L 1522.5 856.5 L 1522.5 882.5 L 1496.5 882.5 Z M 1423.5 856.5 L 1449.5 856.5 L 1449.5 882.5 L 1423.5 882.5 Z M 1350.5 856.5 L 1376.5 856.5 L 1376.5 882.5 L 1350.5 882.5 Z M 1276.5 856.5 L 1302.5 856.5 L 1302.5 882.5 L 1276.5 882.5 Z M 1203.5 856.5 L 1229.5 856.5 L 1229.5 882.5 L 1203.5 882.5 Z M 1129.5 856.5 L 1155.5 856.5 L 1155.5 882.5 L 1129.5 882.5 Z M 1056.5 856.5 L 1082.5 856.5 L 1082.5 882.5 L 1056.5 882.5 Z M 983.5 856.5 L 1009.5 856.5 L 1009.5 882.5 L 983.5 882.5 Z M 909.5 856.5 L 935.5 856.5 L 935.5 882.5 L 909.5 882.5 Z M 836.5 856.5 L 862.5 856.5 L 862.5 882.5 L 836.5 882.5 Z M 762.5 856.5 L 788.5 856.5 L 788.5 882.5 L 762.5 882.5 Z M 689.5 856.5 L 715.5 856.5 L 715.5 882.5 L 689.5 882.5 Z M 615.5 856.5 L 641.5 856.5 L 641.5 882.5 L 615.5 882.5 Z M 542.5 856.5 L 568.5 856.5 L 568.5 882.5 L 542.5 882.5 Z M 469.5 856.5 L 495.5 856.5 L 495.5 882.5 L 469.5 882.5 Z M 395.5 856.5 L 421.5 856.5 L 421.5 882.5 L 395.5 882.5 Z M 322.5 856.5 L 348.5 856.5 L 348.5 882.5 L 322.5 882.5 Z M 322.5 856.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern8" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask8">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern8);stroke:none;"/>
@@ -114,9 +114,9 @@
 <clipPath id="clip17">
   <path d="M 1120.5 527.5 L 1160.5 527.5 L 1160.5 567.5 L 1120.5 567.5 Z M 1071.5 527.5 L 1111.5 527.5 L 1111.5 567.5 L 1071.5 567.5 Z M 1071.5 527.5 "/>
 </clipPath>
-<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <pattern id="pattern9" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image408"/>
+  <use xlink:href="#image438"/>
 </pattern>
 <mask id="mask9">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern9);stroke:none;"/>
@@ -128,7 +128,7 @@
   <path d="M 1064.5 534.5 L 1106.5 534.5 L 1106.5 567.5 L 1064.5 567.5 Z M 1125.5 534.5 L 1168.5 534.5 L 1168.5 567.5 L 1125.5 567.5 Z M 1125.5 567.5 L 1168.5 567.5 L 1168.5 577.5 L 1125.5 577.5 Z M 1064.5 567.5 L 1106.5 567.5 L 1106.5 577.5 L 1064.5 577.5 Z M 1064.5 567.5 "/>
 </clipPath>
 <pattern id="pattern10" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask10">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern10);stroke:none;"/>
@@ -139,9 +139,9 @@
 <clipPath id="clip21">
   <path d="M 1061.5 531.5 L 1110.5 531.5 L 1110.5 534.5 L 1061.5 534.5 Z M 1122.5 531.5 L 1171.5 531.5 L 1171.5 534.5 L 1122.5 534.5 Z M 1122.5 534.5 L 1171.5 534.5 L 1171.5 577.5 L 1122.5 577.5 Z M 1061.5 534.5 L 1110.5 534.5 L 1110.5 577.5 L 1061.5 577.5 Z M 1122.5 577.5 L 1171.5 577.5 L 1171.5 580.5 L 1122.5 580.5 Z M 1061.5 577.5 L 1110.5 577.5 L 1110.5 580.5 L 1061.5 580.5 Z M 1061.5 577.5 "/>
 </clipPath>
-<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7dAxCoAAEAPBCfj/L8dCrPQQrK9YtkkRNhpKBtOWzlaq/+1rd0Cu5aujhGbw/XMk22E7bIcHJ/xmPzD2v5kuAAAAAElFTkSuQmCC"/>
+<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7dAxCoAAEAPBCfj/L8dCrPQQrK9YtkkRNhpKBtOWzlaq/+1rd0Cu5aujhGbw/XMk22E7bIcHJ/xmPzD2v5kuAAAAAElFTkSuQmCC"/>
 <pattern id="pattern11" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image409"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask11">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern11);stroke:none;"/>
@@ -153,13 +153,13 @@
   <path d="M 991.5 482.5 L 1171.5 482.5 L 1171.5 531.5 L 991.5 531.5 Z M 991.5 531.5 L 1171.5 531.5 L 1171.5 580.5 L 991.5 580.5 Z M 746.5 482.5 L 927.5 482.5 L 927.5 662.5 L 746.5 662.5 Z M 991.5 580.5 L 1171.5 580.5 L 1171.5 662.5 L 991.5 662.5 Z M 991.5 580.5 "/>
 </clipPath>
 <pattern id="pattern12" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask12">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern12);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface397">
+<g id="surface427">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -286,6 +286,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 562.773438 621.671875 L 550.160156 621.671875 L 546.707031 631.5 L 542.261719 631.5 L 553.933594 598.78125 L 559.316406 598.78125 L 570.808594 631.5 L 566.140625 631.5 Z M 561.605469 618.171875 L 556.578125 603.269531 L 551.195312 618.171875 Z M 561.605469 618.171875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 542 477 L 568 477 M 542 451 L 568 451 M 542 451 L 542 477 M 568 451 L 568 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 542 477 L 568 477 M 542 451 L 568 451 M 568 477 L 568 451 M 542 477 L 542 451 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 225 205 L 225 214 M 220 210 L 229 210 M 224 211 L 226 211 M 224 209 L 226 209 M 224 209 L 224 211 M 226 209 L 226 211 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.svg b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.svg
index f0f0299..f0cb3a8 100644
--- a/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.svg
+++ b/cells/probec_p/sky130_fd_sc_hvl__probec_p_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 181.5 L 1673.5 181.5 L 1673.5 560.5 L 174.5 560.5 Z M 174.5 181.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 222.5 229.5 L 1625.5 229.5 L 1625.5 254.5 L 222.5 254.5 Z M 222.5 229.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 222.5 229.5 L 1625.5 229.5 L 1625.5 254.5 L 222.5 254.5 Z M 258.5 623.5 L 1592.5 623.5 L 1592.5 632.5 L 258.5 632.5 Z M 258.5 632.5 L 1592.5 632.5 L 1592.5 657.5 L 258.5 657.5 Z M 258.5 657.5 L 1592.5 657.5 L 1592.5 682.5 L 258.5 682.5 Z M 258.5 682.5 L 1592.5 682.5 L 1592.5 707.5 L 258.5 707.5 Z M 258.5 707.5 L 1592.5 707.5 L 1592.5 733.5 L 258.5 733.5 Z M 258.5 707.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 222.5 824.5 L 1625.5 824.5 L 1625.5 848.5 L 222.5 848.5 Z M 222.5 824.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 866.5 293.5 L 907.5 293.5 L 907.5 302.5 L 866.5 302.5 Z M 1094.5 293.5 L 1135.5 293.5 L 1135.5 302.5 L 1094.5 302.5 Z M 370.5 293.5 L 451.5 293.5 L 451.5 302.5 L 370.5 302.5 Z M 1322.5 293.5 L 1363.5 293.5 L 1363.5 302.5 L 1322.5 302.5 Z M 638.5 293.5 L 679.5 293.5 L 679.5 302.5 L 638.5 302.5 Z M 1550.5 293.5 L 1589.5 293.5 L 1589.5 302.5 L 1550.5 302.5 Z M 1322.5 302.5 L 1363.5 302.5 L 1363.5 327.5 L 1322.5 327.5 Z M 370.5 302.5 L 451.5 302.5 L 451.5 327.5 L 370.5 327.5 Z M 866.5 302.5 L 907.5 302.5 L 907.5 327.5 L 866.5 327.5 Z M 638.5 302.5 L 679.5 302.5 L 679.5 327.5 L 638.5 327.5 Z M 1550.5 302.5 L 1589.5 302.5 L 1589.5 327.5 L 1550.5 327.5 Z M 1094.5 302.5 L 1135.5 302.5 L 1135.5 327.5 L 1094.5 327.5 Z M 255.5 293.5 L 296.5 293.5 L 296.5 330.5 L 255.5 330.5 Z M 1208.5 293.5 L 1249.5 293.5 L 1249.5 333.5 L 1208.5 333.5 Z M 1436.5 293.5 L 1477.5 293.5 L 1477.5 333.5 L 1436.5 333.5 Z M 980.5 293.5 L 1021.5 293.5 L 1021.5 333.5 L 980.5 333.5 Z M 752.5 293.5 L 793.5 293.5 L 793.5 333.5 L 752.5 333.5 Z M 524.5 293.5 L 565.5 293.5 L 565.5 333.5 L 524.5 333.5 Z M 1322.5 327.5 L 1363.5 327.5 L 1363.5 352.5 L 1322.5 352.5 Z M 638.5 327.5 L 679.5 327.5 L 679.5 352.5 L 638.5 352.5 Z M 1550.5 327.5 L 1589.5 327.5 L 1589.5 352.5 L 1550.5 352.5 Z M 866.5 327.5 L 907.5 327.5 L 907.5 352.5 L 866.5 352.5 Z M 370.5 327.5 L 451.5 327.5 L 451.5 352.5 L 370.5 352.5 Z M 1094.5 327.5 L 1135.5 327.5 L 1135.5 352.5 L 1094.5 352.5 Z M 255.5 330.5 L 296.5 330.5 L 296.5 354.5 L 255.5 354.5 Z M 524.5 333.5 L 565.5 333.5 L 565.5 357.5 L 524.5 357.5 Z M 752.5 333.5 L 793.5 333.5 L 793.5 357.5 L 752.5 357.5 Z M 980.5 333.5 L 1021.5 333.5 L 1021.5 357.5 L 980.5 357.5 Z M 1208.5 333.5 L 1249.5 333.5 L 1249.5 357.5 L 1208.5 357.5 Z M 1436.5 333.5 L 1477.5 333.5 L 1477.5 357.5 L 1436.5 357.5 Z M 1322.5 352.5 L 1363.5 352.5 L 1363.5 376.5 L 1322.5 376.5 Z M 866.5 352.5 L 907.5 352.5 L 907.5 376.5 L 866.5 376.5 Z M 1550.5 352.5 L 1589.5 352.5 L 1589.5 376.5 L 1550.5 376.5 Z M 370.5 352.5 L 451.5 352.5 L 451.5 376.5 L 370.5 376.5 Z M 1094.5 352.5 L 1135.5 352.5 L 1135.5 376.5 L 1094.5 376.5 Z M 638.5 352.5 L 679.5 352.5 L 679.5 376.5 L 638.5 376.5 Z M 255.5 354.5 L 296.5 354.5 L 296.5 379.5 L 255.5 379.5 Z M 980.5 357.5 L 1021.5 357.5 L 1021.5 382.5 L 980.5 382.5 Z M 524.5 357.5 L 565.5 357.5 L 565.5 382.5 L 524.5 382.5 Z M 752.5 357.5 L 793.5 357.5 L 793.5 382.5 L 752.5 382.5 Z M 1436.5 357.5 L 1477.5 357.5 L 1477.5 382.5 L 1436.5 382.5 Z M 1208.5 357.5 L 1249.5 357.5 L 1249.5 382.5 L 1208.5 382.5 Z M 866.5 376.5 L 907.5 376.5 L 907.5 401.5 L 866.5 401.5 Z M 370.5 376.5 L 451.5 376.5 L 451.5 401.5 L 370.5 401.5 Z M 638.5 376.5 L 679.5 376.5 L 679.5 401.5 L 638.5 401.5 Z M 1550.5 376.5 L 1589.5 376.5 L 1589.5 401.5 L 1550.5 401.5 Z M 1322.5 376.5 L 1363.5 376.5 L 1363.5 401.5 L 1322.5 401.5 Z M 1094.5 376.5 L 1135.5 376.5 L 1135.5 401.5 L 1094.5 401.5 Z M 255.5 379.5 L 296.5 379.5 L 296.5 404.5 L 255.5 404.5 Z M 1436.5 382.5 L 1477.5 382.5 L 1477.5 407.5 L 1436.5 407.5 Z M 1208.5 382.5 L 1249.5 382.5 L 1249.5 407.5 L 1208.5 407.5 Z M 752.5 382.5 L 793.5 382.5 L 793.5 407.5 L 752.5 407.5 Z M 524.5 382.5 L 565.5 382.5 L 565.5 407.5 L 524.5 407.5 Z M 980.5 382.5 L 1021.5 382.5 L 1021.5 407.5 L 980.5 407.5 Z M 1094.5 401.5 L 1135.5 401.5 L 1135.5 426.5 L 1094.5 426.5 Z M 1322.5 401.5 L 1363.5 401.5 L 1363.5 426.5 L 1322.5 426.5 Z M 370.5 401.5 L 451.5 401.5 L 451.5 426.5 L 370.5 426.5 Z M 638.5 401.5 L 679.5 401.5 L 679.5 426.5 L 638.5 426.5 Z M 866.5 401.5 L 907.5 401.5 L 907.5 426.5 L 866.5 426.5 Z M 1550.5 401.5 L 1589.5 401.5 L 1589.5 426.5 L 1550.5 426.5 Z M 255.5 404.5 L 296.5 404.5 L 296.5 429.5 L 255.5 429.5 Z M 1436.5 407.5 L 1477.5 407.5 L 1477.5 432.5 L 1436.5 432.5 Z M 752.5 407.5 L 793.5 407.5 L 793.5 432.5 L 752.5 432.5 Z M 524.5 407.5 L 565.5 407.5 L 565.5 432.5 L 524.5 432.5 Z M 980.5 407.5 L 1021.5 407.5 L 1021.5 432.5 L 980.5 432.5 Z M 1208.5 407.5 L 1249.5 407.5 L 1249.5 432.5 L 1208.5 432.5 Z M 638.5 426.5 L 679.5 426.5 L 679.5 451.5 L 638.5 451.5 Z M 370.5 426.5 L 451.5 426.5 L 451.5 451.5 L 370.5 451.5 Z M 1094.5 426.5 L 1135.5 426.5 L 1135.5 451.5 L 1094.5 451.5 Z M 1322.5 426.5 L 1363.5 426.5 L 1363.5 451.5 L 1322.5 451.5 Z M 866.5 426.5 L 907.5 426.5 L 907.5 451.5 L 866.5 451.5 Z M 1550.5 426.5 L 1589.5 426.5 L 1589.5 451.5 L 1550.5 451.5 Z M 255.5 429.5 L 296.5 429.5 L 296.5 454.5 L 255.5 454.5 Z M 1208.5 432.5 L 1249.5 432.5 L 1249.5 457.5 L 1208.5 457.5 Z M 1436.5 432.5 L 1477.5 432.5 L 1477.5 457.5 L 1436.5 457.5 Z M 524.5 432.5 L 565.5 432.5 L 565.5 457.5 L 524.5 457.5 Z M 752.5 432.5 L 793.5 432.5 L 793.5 457.5 L 752.5 457.5 Z M 980.5 432.5 L 1021.5 432.5 L 1021.5 457.5 L 980.5 457.5 Z M 1322.5 451.5 L 1363.5 451.5 L 1363.5 476.5 L 1322.5 476.5 Z M 866.5 451.5 L 907.5 451.5 L 907.5 476.5 L 866.5 476.5 Z M 1094.5 451.5 L 1135.5 451.5 L 1135.5 476.5 L 1094.5 476.5 Z M 1550.5 451.5 L 1589.5 451.5 L 1589.5 476.5 L 1550.5 476.5 Z M 638.5 451.5 L 679.5 451.5 L 679.5 476.5 L 638.5 476.5 Z M 370.5 451.5 L 451.5 451.5 L 451.5 476.5 L 370.5 476.5 Z M 255.5 454.5 L 296.5 454.5 L 296.5 479.5 L 255.5 479.5 Z M 1208.5 457.5 L 1249.5 457.5 L 1249.5 482.5 L 1208.5 482.5 Z M 1436.5 457.5 L 1477.5 457.5 L 1477.5 482.5 L 1436.5 482.5 Z M 524.5 457.5 L 565.5 457.5 L 565.5 482.5 L 524.5 482.5 Z M 980.5 457.5 L 1021.5 457.5 L 1021.5 482.5 L 980.5 482.5 Z M 752.5 457.5 L 793.5 457.5 L 793.5 482.5 L 752.5 482.5 Z M 255.5 479.5 L 296.5 479.5 L 296.5 504.5 L 255.5 504.5 Z M 524.5 482.5 L 565.5 482.5 L 565.5 506.5 L 524.5 506.5 Z M 752.5 482.5 L 793.5 482.5 L 793.5 506.5 L 752.5 506.5 Z M 1208.5 482.5 L 1249.5 482.5 L 1249.5 506.5 L 1208.5 506.5 Z M 980.5 482.5 L 1021.5 482.5 L 1021.5 506.5 L 980.5 506.5 Z M 1436.5 482.5 L 1477.5 482.5 L 1477.5 506.5 L 1436.5 506.5 Z M 370.5 476.5 L 451.5 476.5 L 451.5 512.5 L 370.5 512.5 Z M 866.5 476.5 L 907.5 476.5 L 907.5 512.5 L 866.5 512.5 Z M 638.5 476.5 L 679.5 476.5 L 679.5 512.5 L 638.5 512.5 Z M 752.5 506.5 L 793.5 506.5 L 793.5 512.5 L 752.5 512.5 Z M 1208.5 506.5 L 1249.5 506.5 L 1249.5 512.5 L 1208.5 512.5 Z M 524.5 506.5 L 565.5 506.5 L 565.5 512.5 L 524.5 512.5 Z M 1550.5 476.5 L 1589.5 476.5 L 1589.5 512.5 L 1550.5 512.5 Z M 1322.5 476.5 L 1363.5 476.5 L 1363.5 512.5 L 1322.5 512.5 Z M 1094.5 476.5 L 1135.5 476.5 L 1135.5 512.5 L 1094.5 512.5 Z M 1436.5 506.5 L 1477.5 506.5 L 1477.5 512.5 L 1436.5 512.5 Z M 255.5 504.5 L 296.5 504.5 L 296.5 512.5 L 255.5 512.5 Z M 980.5 506.5 L 1021.5 506.5 L 1021.5 512.5 L 980.5 512.5 Z M 222.5 824.5 L 1625.5 824.5 L 1625.5 848.5 L 222.5 848.5 Z M 222.5 824.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1477.5 623.5 L 1550.5 623.5 L 1550.5 733.5 L 1477.5 733.5 Z M 299.5 623.5 L 372.5 623.5 L 372.5 733.5 L 299.5 733.5 Z M 451.5 623.5 L 524.5 623.5 L 524.5 733.5 L 451.5 733.5 Z M 565.5 623.5 L 638.5 623.5 L 638.5 733.5 L 565.5 733.5 Z M 679.5 623.5 L 752.5 623.5 L 752.5 733.5 L 679.5 733.5 Z M 793.5 623.5 L 866.5 623.5 L 866.5 733.5 L 793.5 733.5 Z M 907.5 623.5 L 980.5 623.5 L 980.5 733.5 L 907.5 733.5 Z M 1021.5 623.5 L 1094.5 623.5 L 1094.5 733.5 L 1021.5 733.5 Z M 1135.5 623.5 L 1208.5 623.5 L 1208.5 733.5 L 1135.5 733.5 Z M 1249.5 623.5 L 1322.5 623.5 L 1322.5 733.5 L 1249.5 733.5 Z M 1363.5 623.5 L 1436.5 623.5 L 1436.5 733.5 L 1363.5 733.5 Z M 1363.5 623.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image434"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1477.5 293.5 L 1550.5 293.5 L 1550.5 512.5 L 1477.5 512.5 Z M 296.5 293.5 L 370.5 293.5 L 370.5 512.5 L 296.5 512.5 Z M 451.5 293.5 L 524.5 293.5 L 524.5 512.5 L 451.5 512.5 Z M 565.5 293.5 L 638.5 293.5 L 638.5 512.5 L 565.5 512.5 Z M 679.5 293.5 L 752.5 293.5 L 752.5 512.5 L 679.5 512.5 Z M 793.5 293.5 L 866.5 293.5 L 866.5 512.5 L 793.5 512.5 Z M 907.5 293.5 L 980.5 293.5 L 980.5 512.5 L 907.5 512.5 Z M 1021.5 293.5 L 1094.5 293.5 L 1094.5 512.5 L 1021.5 512.5 Z M 1135.5 293.5 L 1208.5 293.5 L 1208.5 512.5 L 1135.5 512.5 Z M 1249.5 293.5 L 1322.5 293.5 L 1322.5 512.5 L 1249.5 512.5 Z M 1363.5 293.5 L 1436.5 293.5 L 1436.5 512.5 L 1363.5 512.5 Z M 1363.5 293.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image435"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -85,9 +85,9 @@
 <clipPath id="clip12">
   <path d="M 830.5 422.5 L 844.5 422.5 L 844.5 655.5 L 830.5 655.5 Z M 830.5 422.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
+<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image406"/>
+  <use xlink:href="#image436"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
@@ -101,9 +101,9 @@
 <clipPath id="clip15">
   <path d="M 245.5 229.5 L 269.5 229.5 L 269.5 254.5 L 245.5 254.5 Z M 1577.5 229.5 L 1602.5 229.5 L 1602.5 254.5 L 1577.5 254.5 Z M 1507.5 229.5 L 1532.5 229.5 L 1532.5 254.5 L 1507.5 254.5 Z M 1437.5 229.5 L 1462.5 229.5 L 1462.5 254.5 L 1437.5 254.5 Z M 1367.5 229.5 L 1392.5 229.5 L 1392.5 254.5 L 1367.5 254.5 Z M 1297.5 229.5 L 1322.5 229.5 L 1322.5 254.5 L 1297.5 254.5 Z M 1227.5 229.5 L 1251.5 229.5 L 1251.5 254.5 L 1227.5 254.5 Z M 1156.5 229.5 L 1181.5 229.5 L 1181.5 254.5 L 1156.5 254.5 Z M 1086.5 229.5 L 1111.5 229.5 L 1111.5 254.5 L 1086.5 254.5 Z M 1016.5 229.5 L 1041.5 229.5 L 1041.5 254.5 L 1016.5 254.5 Z M 946.5 229.5 L 971.5 229.5 L 971.5 254.5 L 946.5 254.5 Z M 876.5 229.5 L 901.5 229.5 L 901.5 254.5 L 876.5 254.5 Z M 806.5 229.5 L 831.5 229.5 L 831.5 254.5 L 806.5 254.5 Z M 736.5 229.5 L 760.5 229.5 L 760.5 254.5 L 736.5 254.5 Z M 665.5 229.5 L 690.5 229.5 L 690.5 254.5 L 665.5 254.5 Z M 595.5 229.5 L 620.5 229.5 L 620.5 254.5 L 595.5 254.5 Z M 525.5 229.5 L 550.5 229.5 L 550.5 254.5 L 525.5 254.5 Z M 455.5 229.5 L 480.5 229.5 L 480.5 254.5 L 455.5 254.5 Z M 385.5 229.5 L 410.5 229.5 L 410.5 254.5 L 385.5 254.5 Z M 315.5 229.5 L 340.5 229.5 L 340.5 254.5 L 315.5 254.5 Z M 364.5 303.5 L 389.5 303.5 L 389.5 327.5 L 364.5 327.5 Z M 1102.5 303.5 L 1127.5 303.5 L 1127.5 327.5 L 1102.5 327.5 Z M 1576.5 303.5 L 1601.5 303.5 L 1601.5 327.5 L 1576.5 327.5 Z M 874.5 303.5 L 899.5 303.5 L 899.5 327.5 L 874.5 327.5 Z M 627.5 303.5 L 652.5 303.5 L 652.5 327.5 L 627.5 327.5 Z M 312.5 303.5 L 337.5 303.5 L 337.5 328.5 L 312.5 328.5 Z M 1383.5 303.5 L 1408.5 303.5 L 1408.5 328.5 L 1383.5 328.5 Z M 1050.5 303.5 L 1075.5 303.5 L 1075.5 328.5 L 1050.5 328.5 Z M 927.5 303.5 L 952.5 303.5 L 952.5 328.5 L 927.5 328.5 Z M 1278.5 303.5 L 1303.5 303.5 L 1303.5 328.5 L 1278.5 328.5 Z M 470.5 303.5 L 494.5 303.5 L 494.5 328.5 L 470.5 328.5 Z M 822.5 303.5 L 847.5 303.5 L 847.5 328.5 L 822.5 328.5 Z M 679.5 303.5 L 704.5 303.5 L 704.5 328.5 L 679.5 328.5 Z M 1102.5 327.5 L 1127.5 327.5 L 1127.5 328.5 L 1102.5 328.5 Z M 1576.5 327.5 L 1601.5 327.5 L 1601.5 328.5 L 1576.5 328.5 Z M 1523.5 303.5 L 1548.5 303.5 L 1548.5 328.5 L 1523.5 328.5 Z M 364.5 327.5 L 389.5 327.5 L 389.5 328.5 L 364.5 328.5 Z M 417.5 303.5 L 442.5 303.5 L 442.5 328.5 L 417.5 328.5 Z M 874.5 327.5 L 899.5 327.5 L 899.5 328.5 L 874.5 328.5 Z M 1155.5 303.5 L 1180.5 303.5 L 1180.5 328.5 L 1155.5 328.5 Z M 627.5 327.5 L 652.5 327.5 L 652.5 328.5 L 627.5 328.5 Z M 1043.5 526.5 L 1068.5 526.5 L 1068.5 551.5 L 1043.5 551.5 Z M 1096.5 526.5 L 1121.5 526.5 L 1121.5 551.5 L 1096.5 551.5 Z M 321.5 756.5 L 345.5 756.5 L 345.5 780.5 L 321.5 780.5 Z M 1586.5 756.5 L 1611.5 756.5 L 1611.5 780.5 L 1586.5 780.5 Z M 1533.5 756.5 L 1558.5 756.5 L 1558.5 780.5 L 1533.5 780.5 Z M 1384.5 756.5 L 1409.5 756.5 L 1409.5 780.5 L 1384.5 780.5 Z M 1332.5 756.5 L 1357.5 756.5 L 1357.5 780.5 L 1332.5 780.5 Z M 1279.5 756.5 L 1304.5 756.5 L 1304.5 780.5 L 1279.5 780.5 Z M 1156.5 756.5 L 1181.5 756.5 L 1181.5 780.5 L 1156.5 780.5 Z M 1103.5 756.5 L 1128.5 756.5 L 1128.5 780.5 L 1103.5 780.5 Z M 1051.5 756.5 L 1075.5 756.5 L 1075.5 780.5 L 1051.5 780.5 Z M 922.5 756.5 L 947.5 756.5 L 947.5 780.5 L 922.5 780.5 Z M 869.5 756.5 L 894.5 756.5 L 894.5 780.5 L 869.5 780.5 Z M 817.5 756.5 L 842.5 756.5 L 842.5 780.5 L 817.5 780.5 Z M 708.5 756.5 L 733.5 756.5 L 733.5 780.5 L 708.5 780.5 Z M 655.5 756.5 L 680.5 756.5 L 680.5 780.5 L 655.5 780.5 Z M 603.5 756.5 L 627.5 756.5 L 627.5 780.5 L 603.5 780.5 Z M 478.5 756.5 L 503.5 756.5 L 503.5 780.5 L 478.5 780.5 Z M 426.5 756.5 L 451.5 756.5 L 451.5 780.5 L 426.5 780.5 Z M 373.5 756.5 L 398.5 756.5 L 398.5 780.5 L 373.5 780.5 Z M 245.5 824.5 L 269.5 824.5 L 269.5 848.5 L 245.5 848.5 Z M 1577.5 824.5 L 1602.5 824.5 L 1602.5 848.5 L 1577.5 848.5 Z M 1507.5 824.5 L 1532.5 824.5 L 1532.5 848.5 L 1507.5 848.5 Z M 1437.5 824.5 L 1462.5 824.5 L 1462.5 848.5 L 1437.5 848.5 Z M 1367.5 824.5 L 1392.5 824.5 L 1392.5 848.5 L 1367.5 848.5 Z M 1297.5 824.5 L 1322.5 824.5 L 1322.5 848.5 L 1297.5 848.5 Z M 1227.5 824.5 L 1251.5 824.5 L 1251.5 848.5 L 1227.5 848.5 Z M 1156.5 824.5 L 1181.5 824.5 L 1181.5 848.5 L 1156.5 848.5 Z M 1086.5 824.5 L 1111.5 824.5 L 1111.5 848.5 L 1086.5 848.5 Z M 1016.5 824.5 L 1041.5 824.5 L 1041.5 848.5 L 1016.5 848.5 Z M 946.5 824.5 L 971.5 824.5 L 971.5 848.5 L 946.5 848.5 Z M 876.5 824.5 L 901.5 824.5 L 901.5 848.5 L 876.5 848.5 Z M 806.5 824.5 L 831.5 824.5 L 831.5 848.5 L 806.5 848.5 Z M 736.5 824.5 L 760.5 824.5 L 760.5 848.5 L 736.5 848.5 Z M 665.5 824.5 L 690.5 824.5 L 690.5 848.5 L 665.5 848.5 Z M 595.5 824.5 L 620.5 824.5 L 620.5 848.5 L 595.5 848.5 Z M 525.5 824.5 L 550.5 824.5 L 550.5 848.5 L 525.5 848.5 Z M 455.5 824.5 L 480.5 824.5 L 480.5 848.5 L 455.5 848.5 Z M 385.5 824.5 L 410.5 824.5 L 410.5 848.5 L 385.5 848.5 Z M 315.5 824.5 L 340.5 824.5 L 340.5 848.5 L 315.5 848.5 Z M 315.5 824.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern8" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask8">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern8);stroke:none;"/>
@@ -114,9 +114,9 @@
 <clipPath id="clip17">
   <path d="M 1582.5 286.5 L 1620.5 286.5 L 1620.5 303.5 L 1582.5 303.5 Z M 1582.5 303.5 L 1620.5 303.5 L 1620.5 324.5 L 1582.5 324.5 Z M 1629.5 286.5 L 1667.5 286.5 L 1667.5 324.5 L 1629.5 324.5 Z M 1040.5 520.5 L 1078.5 520.5 L 1078.5 526.5 L 1040.5 526.5 Z M 1087.5 520.5 L 1125.5 520.5 L 1125.5 526.5 L 1087.5 526.5 Z M 1087.5 526.5 L 1125.5 526.5 L 1125.5 551.5 L 1087.5 551.5 Z M 1040.5 526.5 L 1078.5 526.5 L 1078.5 551.5 L 1040.5 551.5 Z M 1087.5 551.5 L 1125.5 551.5 L 1125.5 558.5 L 1087.5 558.5 Z M 1040.5 551.5 L 1078.5 551.5 L 1078.5 558.5 L 1040.5 558.5 Z M 1582.5 753.5 L 1620.5 753.5 L 1620.5 756.5 L 1582.5 756.5 Z M 1582.5 756.5 L 1620.5 756.5 L 1620.5 780.5 L 1582.5 780.5 Z M 1629.5 753.5 L 1667.5 753.5 L 1667.5 791.5 L 1629.5 791.5 Z M 1582.5 780.5 L 1620.5 780.5 L 1620.5 791.5 L 1582.5 791.5 Z M 1582.5 780.5 "/>
 </clipPath>
-<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <pattern id="pattern9" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image408"/>
+  <use xlink:href="#image438"/>
 </pattern>
 <mask id="mask9">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern9);stroke:none;"/>
@@ -128,7 +128,7 @@
   <path d="M 1575.5 283.5 L 1616.5 283.5 L 1616.5 286.5 L 1575.5 286.5 Z M 1634.5 283.5 L 1675.5 283.5 L 1675.5 286.5 L 1634.5 286.5 Z M 1634.5 286.5 L 1675.5 286.5 L 1675.5 324.5 L 1634.5 324.5 Z M 1575.5 286.5 L 1616.5 286.5 L 1616.5 324.5 L 1575.5 324.5 Z M 1023.5 518.5 L 1064.5 518.5 L 1064.5 520.5 L 1023.5 520.5 Z M 1082.5 518.5 L 1123.5 518.5 L 1123.5 520.5 L 1082.5 520.5 Z M 1082.5 520.5 L 1123.5 520.5 L 1123.5 558.5 L 1082.5 558.5 Z M 1023.5 520.5 L 1064.5 520.5 L 1064.5 558.5 L 1023.5 558.5 Z M 1082.5 558.5 L 1123.5 558.5 L 1123.5 559.5 L 1082.5 559.5 Z M 1023.5 558.5 L 1064.5 558.5 L 1064.5 559.5 L 1023.5 559.5 Z M 1575.5 753.5 L 1616.5 753.5 L 1616.5 791.5 L 1575.5 791.5 Z M 1634.5 753.5 L 1675.5 753.5 L 1675.5 791.5 L 1634.5 791.5 Z M 1634.5 791.5 L 1675.5 791.5 L 1675.5 794.5 L 1634.5 794.5 Z M 1575.5 791.5 L 1616.5 791.5 L 1616.5 794.5 L 1575.5 794.5 Z M 1575.5 791.5 "/>
 </clipPath>
 <pattern id="pattern10" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask10">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern10);stroke:none;"/>
@@ -139,9 +139,9 @@
 <clipPath id="clip21">
   <path d="M 1572.5 280.5 L 1619.5 280.5 L 1619.5 283.5 L 1572.5 283.5 Z M 1631.5 280.5 L 1677.5 280.5 L 1677.5 283.5 L 1631.5 283.5 Z M 1631.5 283.5 L 1677.5 283.5 L 1677.5 324.5 L 1631.5 324.5 Z M 1572.5 283.5 L 1619.5 283.5 L 1619.5 324.5 L 1572.5 324.5 Z M 1631.5 324.5 L 1677.5 324.5 L 1677.5 327.5 L 1631.5 327.5 Z M 1572.5 324.5 L 1619.5 324.5 L 1619.5 327.5 L 1572.5 327.5 Z M 1021.5 515.5 L 1067.5 515.5 L 1067.5 518.5 L 1021.5 518.5 Z M 1079.5 515.5 L 1126.5 515.5 L 1126.5 518.5 L 1079.5 518.5 Z M 1079.5 518.5 L 1126.5 518.5 L 1126.5 559.5 L 1079.5 559.5 Z M 1021.5 518.5 L 1067.5 518.5 L 1067.5 559.5 L 1021.5 559.5 Z M 1021.5 559.5 L 1067.5 559.5 L 1067.5 562.5 L 1021.5 562.5 Z M 1079.5 559.5 L 1126.5 559.5 L 1126.5 562.5 L 1079.5 562.5 Z M 641.5 515.5 L 687.5 515.5 L 687.5 562.5 L 641.5 562.5 Z M 699.5 515.5 L 746.5 515.5 L 746.5 562.5 L 699.5 562.5 Z M 1572.5 750.5 L 1619.5 750.5 L 1619.5 753.5 L 1572.5 753.5 Z M 1631.5 750.5 L 1677.5 750.5 L 1677.5 753.5 L 1631.5 753.5 Z M 1631.5 753.5 L 1677.5 753.5 L 1677.5 794.5 L 1631.5 794.5 Z M 1572.5 753.5 L 1619.5 753.5 L 1619.5 794.5 L 1572.5 794.5 Z M 1631.5 794.5 L 1677.5 794.5 L 1677.5 797.5 L 1631.5 797.5 Z M 1572.5 794.5 L 1619.5 794.5 L 1619.5 797.5 L 1572.5 797.5 Z M 1572.5 794.5 "/>
 </clipPath>
-<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7dAxCoAAEAPBCfj/L8dCrPQQrK9YtkkRNhpKBtOWzlaq/+1rd0Cu5aujhGbw/XMk22E7bIcHJ/xmPzD2v5kuAAAAAElFTkSuQmCC"/>
+<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7dAxCoAAEAPBCfj/L8dCrPQQrK9YtkkRNhpKBtOWzlaq/+1rd0Cu5aujhGbw/XMk22E7bIcHJ/xmPzD2v5kuAAAAAElFTkSuQmCC"/>
 <pattern id="pattern11" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image409"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask11">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern11);stroke:none;"/>
@@ -153,13 +153,13 @@
   <path d="M 1539.5 219.5 L 1711.5 219.5 L 1711.5 280.5 L 1539.5 280.5 Z M 1539.5 280.5 L 1711.5 280.5 L 1711.5 327.5 L 1539.5 327.5 Z M 1539.5 327.5 L 1711.5 327.5 L 1711.5 391.5 L 1539.5 391.5 Z M 574.5 452.5 L 747.5 452.5 L 747.5 515.5 L 574.5 515.5 Z M 954.5 452.5 L 1127.5 452.5 L 1127.5 515.5 L 954.5 515.5 Z M 574.5 515.5 L 747.5 515.5 L 747.5 562.5 L 574.5 562.5 Z M 954.5 515.5 L 1127.5 515.5 L 1127.5 562.5 L 954.5 562.5 Z M 574.5 562.5 L 747.5 562.5 L 747.5 625.5 L 574.5 625.5 Z M 954.5 562.5 L 1127.5 562.5 L 1127.5 625.5 L 954.5 625.5 Z M 1539.5 686.5 L 1711.5 686.5 L 1711.5 750.5 L 1539.5 750.5 Z M 1539.5 750.5 L 1711.5 750.5 L 1711.5 797.5 L 1539.5 797.5 Z M 1539.5 797.5 L 1711.5 797.5 L 1711.5 859.5 L 1539.5 859.5 Z M 1539.5 797.5 "/>
 </clipPath>
 <pattern id="pattern12" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask12">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern12);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface397">
+<g id="surface427">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -286,6 +286,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 545.109375 598.976562 L 532.890625 598.976562 L 529.542969 608.5 L 525.238281 608.5 L 536.542969 576.804688 L 541.761719 576.804688 L 552.890625 608.5 L 548.371094 608.5 Z M 543.976562 595.585938 L 539.109375 581.152344 L 533.890625 595.585938 Z M 543.976562 595.585938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 525 499 L 550 499 M 525 474 L 550 474 M 525 474 L 525 499 M 550 474 L 550 499 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 525 499 L 550 499 M 525 474 L 550 474 M 550 499 L 550 474 M 525 499 L 525 474 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 222 238 L 222 247 M 217 243 L 226 243 M 221 244 L 223 244 M 221 242 L 223 242 M 221 242 L 221 244 M 223 242 L 223 244 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.svg b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.svg
index 072f4de..7b54f8a 100644
--- a/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.svg
+++ b/cells/schmittbuf/sky130_fd_sc_hvl__schmittbuf_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 396.5 98.5 L 1526.5 98.5 L 1526.5 576.5 L 396.5 576.5 Z M 1198.5 576.5 L 1526.5 576.5 L 1526.5 593.5 L 1198.5 593.5 Z M 396.5 576.5 L 713.5 576.5 L 713.5 593.5 L 396.5 593.5 Z M 396.5 576.5 "/>
 </clipPath>
-<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image494" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image465"/>
+  <use xlink:href="#image494"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 458.5 161.5 "/>
 </clipPath>
-<image id="image466" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image495" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image466"/>
+  <use xlink:href="#image495"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 772.5 658.5 L 1114.5 658.5 L 1114.5 669.5 L 772.5 669.5 Z M 772.5 669.5 L 1114.5 669.5 L 1114.5 677.5 L 772.5 677.5 Z M 519.5 675.5 L 715.5 675.5 L 715.5 697.5 L 519.5 697.5 Z M 772.5 677.5 L 1183.5 677.5 L 1183.5 701.5 L 772.5 701.5 Z M 772.5 701.5 L 1183.5 701.5 L 1183.5 707.5 L 772.5 707.5 Z M 519.5 697.5 L 715.5 697.5 L 715.5 729.5 L 519.5 729.5 Z M 772.5 707.5 L 1435.5 707.5 L 1435.5 738.5 L 772.5 738.5 Z M 1084.5 738.5 L 1435.5 738.5 L 1435.5 755.5 L 1084.5 755.5 Z M 519.5 729.5 L 715.5 729.5 L 715.5 755.5 L 519.5 755.5 Z M 1084.5 755.5 L 1435.5 755.5 L 1435.5 787.5 L 1084.5 787.5 Z M 1084.5 787.5 L 1435.5 787.5 L 1435.5 795.5 L 1084.5 795.5 Z M 786.5 795.5 L 1435.5 795.5 L 1435.5 806.5 L 786.5 806.5 Z M 786.5 806.5 L 1435.5 806.5 L 1435.5 838.5 L 786.5 838.5 Z M 786.5 838.5 L 1435.5 838.5 L 1435.5 850.5 L 786.5 850.5 Z M 786.5 838.5 "/>
 </clipPath>
-<image id="image467" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image496" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image467"/>
+  <use xlink:href="#image496"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image466"/>
+  <use xlink:href="#image495"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 607.5 245.5 L 1289.5 245.5 L 1289.5 256.5 L 607.5 256.5 Z M 1384.5 245.5 L 1435.5 245.5 L 1435.5 260.5 L 1384.5 260.5 Z M 607.5 256.5 L 1289.5 256.5 L 1289.5 288.5 L 607.5 288.5 Z M 1384.5 260.5 L 1435.5 260.5 L 1435.5 292.5 L 1384.5 292.5 Z M 607.5 288.5 L 1289.5 288.5 L 1289.5 300.5 L 607.5 300.5 Z M 1239.5 300.5 L 1289.5 300.5 L 1289.5 326.5 L 1239.5 326.5 Z M 1384.5 292.5 L 1435.5 292.5 L 1435.5 331.5 L 1384.5 331.5 Z M 1239.5 326.5 L 1289.5 326.5 L 1289.5 359.5 L 1239.5 359.5 Z M 1384.5 331.5 L 1435.5 331.5 L 1435.5 364.5 L 1384.5 364.5 Z M 1239.5 359.5 L 1289.5 359.5 L 1289.5 368.5 L 1239.5 368.5 Z M 931.5 368.5 L 985.5 368.5 L 985.5 376.5 L 931.5 376.5 Z M 1080.5 368.5 L 1289.5 368.5 L 1289.5 376.5 L 1080.5 376.5 Z M 533.5 368.5 L 583.5 368.5 L 583.5 380.5 L 533.5 380.5 Z M 678.5 368.5 L 729.5 368.5 L 729.5 380.5 L 678.5 380.5 Z M 786.5 368.5 L 836.5 368.5 L 836.5 384.5 L 786.5 384.5 Z M 1384.5 364.5 L 1435.5 364.5 L 1435.5 408.5 L 1384.5 408.5 Z M 1080.5 376.5 L 1289.5 376.5 L 1289.5 408.5 L 1080.5 408.5 Z M 931.5 376.5 L 985.5 376.5 L 985.5 408.5 L 931.5 408.5 Z M 678.5 380.5 L 729.5 380.5 L 729.5 412.5 L 678.5 412.5 Z M 533.5 380.5 L 583.5 380.5 L 583.5 412.5 L 533.5 412.5 Z M 786.5 384.5 L 836.5 384.5 L 836.5 416.5 L 786.5 416.5 Z M 1080.5 408.5 L 1289.5 408.5 L 1289.5 429.5 L 1080.5 429.5 Z M 1384.5 408.5 L 1435.5 408.5 L 1435.5 441.5 L 1384.5 441.5 Z M 533.5 412.5 L 583.5 412.5 L 583.5 467.5 L 533.5 467.5 Z M 678.5 412.5 L 729.5 412.5 L 729.5 467.5 L 678.5 467.5 Z M 786.5 416.5 L 836.5 416.5 L 836.5 467.5 L 786.5 467.5 Z M 931.5 408.5 L 985.5 408.5 L 985.5 469.5 L 931.5 469.5 Z M 1080.5 429.5 L 1289.5 429.5 L 1289.5 471.5 L 1080.5 471.5 Z M 1384.5 441.5 L 1435.5 441.5 L 1435.5 484.5 L 1384.5 484.5 Z M 678.5 467.5 L 729.5 467.5 L 729.5 500.5 L 678.5 500.5 Z M 533.5 467.5 L 583.5 467.5 L 583.5 500.5 L 533.5 500.5 Z M 786.5 467.5 L 836.5 467.5 L 836.5 500.5 L 786.5 500.5 Z M 931.5 469.5 L 985.5 469.5 L 985.5 502.5 L 931.5 502.5 Z M 1080.5 471.5 L 1289.5 471.5 L 1289.5 503.5 L 1080.5 503.5 Z M 1080.5 503.5 L 1289.5 503.5 L 1289.5 511.5 L 1080.5 511.5 Z M 931.5 502.5 L 985.5 502.5 L 985.5 511.5 L 931.5 511.5 Z M 786.5 500.5 L 836.5 500.5 L 836.5 511.5 L 786.5 511.5 Z M 533.5 500.5 L 583.5 500.5 L 583.5 511.5 L 533.5 511.5 Z M 678.5 500.5 L 729.5 500.5 L 729.5 511.5 L 678.5 511.5 Z M 1384.5 484.5 L 1435.5 484.5 L 1435.5 517.5 L 1384.5 517.5 Z M 1241.5 511.5 L 1289.5 511.5 L 1289.5 530.5 L 1241.5 530.5 Z M 1384.5 517.5 L 1435.5 517.5 L 1435.5 530.5 L 1384.5 530.5 Z M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
-<image id="image468" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image497" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image468"/>
+  <use xlink:href="#image497"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 971.5 658.5 L 1066.5 658.5 L 1066.5 738.5 L 971.5 738.5 Z M 823.5 658.5 L 918.5 658.5 L 918.5 738.5 L 823.5 738.5 Z M 570.5 675.5 L 665.5 675.5 L 665.5 755.5 L 570.5 755.5 Z M 1289.5 707.5 L 1384.5 707.5 L 1384.5 850.5 L 1289.5 850.5 Z M 1289.5 707.5 "/>
 </clipPath>
-<image id="image469" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image498" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image469"/>
+  <use xlink:href="#image498"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 836.5 368.5 L 931.5 368.5 L 931.5 511.5 L 836.5 511.5 Z M 583.5 368.5 L 678.5 368.5 L 678.5 511.5 L 583.5 511.5 Z M 985.5 368.5 L 1080.5 368.5 L 1080.5 511.5 L 985.5 511.5 Z M 1289.5 245.5 L 1384.5 245.5 L 1384.5 530.5 L 1289.5 530.5 Z M 1289.5 245.5 "/>
 </clipPath>
-<image id="image470" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image499" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image470"/>
+  <use xlink:href="#image499"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -86,7 +86,7 @@
   <path d="M 826.5 795.5 L 1084.5 795.5 L 1084.5 850.5 L 826.5 850.5 Z M 826.5 795.5 "/>
 </clipPath>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image467"/>
+  <use xlink:href="#image496"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
@@ -95,7 +95,7 @@
   <path d="M 647.5 245.5 L 1239.5 245.5 L 1239.5 300.5 L 647.5 300.5 Z M 647.5 245.5 "/>
 </clipPath>
 <pattern id="pattern8" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image468"/>
+  <use xlink:href="#image497"/>
 </pattern>
 <mask id="mask8">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern8);stroke:none;"/>
@@ -109,15 +109,15 @@
 <clipPath id="clip16">
   <path d="M 488.5 161.5 L 520.5 161.5 L 520.5 193.5 L 488.5 193.5 Z M 1401.5 161.5 L 1434.5 161.5 L 1434.5 193.5 L 1401.5 193.5 Z M 1310.5 161.5 L 1342.5 161.5 L 1342.5 193.5 L 1310.5 193.5 Z M 1219.5 161.5 L 1251.5 161.5 L 1251.5 193.5 L 1219.5 193.5 Z M 1127.5 161.5 L 1160.5 161.5 L 1160.5 193.5 L 1127.5 193.5 Z M 1036.5 161.5 L 1068.5 161.5 L 1068.5 193.5 L 1036.5 193.5 Z M 945.5 161.5 L 977.5 161.5 L 977.5 193.5 L 945.5 193.5 Z M 853.5 161.5 L 886.5 161.5 L 886.5 193.5 L 853.5 193.5 Z M 762.5 161.5 L 794.5 161.5 L 794.5 193.5 L 762.5 193.5 Z M 671.5 161.5 L 703.5 161.5 L 703.5 193.5 L 671.5 193.5 Z M 579.5 161.5 L 612.5 161.5 L 612.5 193.5 L 579.5 193.5 Z M 1278.5 258.5 L 1310.5 258.5 L 1310.5 288.5 L 1278.5 288.5 Z M 1072.5 258.5 L 1104.5 258.5 L 1104.5 290.5 L 1072.5 290.5 Z M 1141.5 258.5 L 1173.5 258.5 L 1173.5 290.5 L 1141.5 290.5 Z M 1209.5 258.5 L 1241.5 258.5 L 1241.5 290.5 L 1209.5 290.5 Z M 1278.5 288.5 L 1310.5 288.5 L 1310.5 290.5 L 1278.5 290.5 Z M 1069.5 838.5 L 1102.5 838.5 L 1102.5 871.5 L 1069.5 871.5 Z M 1298.5 838.5 L 1330.5 838.5 L 1330.5 871.5 L 1298.5 871.5 Z M 1216.5 838.5 L 1248.5 838.5 L 1248.5 871.5 L 1216.5 871.5 Z M 1138.5 838.5 L 1170.5 838.5 L 1170.5 871.5 L 1138.5 871.5 Z M 488.5 935.5 L 520.5 935.5 L 520.5 968.5 L 488.5 968.5 Z M 1401.5 935.5 L 1434.5 935.5 L 1434.5 968.5 L 1401.5 968.5 Z M 1310.5 935.5 L 1342.5 935.5 L 1342.5 968.5 L 1310.5 968.5 Z M 1219.5 935.5 L 1251.5 935.5 L 1251.5 968.5 L 1219.5 968.5 Z M 1127.5 935.5 L 1160.5 935.5 L 1160.5 968.5 L 1127.5 968.5 Z M 1036.5 935.5 L 1068.5 935.5 L 1068.5 968.5 L 1036.5 968.5 Z M 945.5 935.5 L 977.5 935.5 L 977.5 968.5 L 945.5 968.5 Z M 853.5 935.5 L 886.5 935.5 L 886.5 968.5 L 853.5 968.5 Z M 762.5 935.5 L 794.5 935.5 L 794.5 968.5 L 762.5 968.5 Z M 671.5 935.5 L 703.5 935.5 L 703.5 968.5 L 671.5 968.5 Z M 579.5 935.5 L 612.5 935.5 L 612.5 968.5 L 579.5 968.5 Z M 579.5 935.5 "/>
 </clipPath>
-<image id="image471" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image500" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern9" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image471"/>
+  <use xlink:href="#image500"/>
 </pattern>
 <mask id="mask9">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern9);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface462">
+<g id="surface491">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -267,6 +267,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1018.261719 949.832031 L 1018.152344 951.625 L 1017.871094 953.253906 L 1017.367188 954.769531 L 1016.691406 956.113281 L 1015.792969 957.40625 L 1014.730469 958.527344 L 1013.550781 959.480469 L 1012.316406 960.210938 L 1010.914062 960.769531 L 1009.457031 961.21875 L 1007.882812 961.445312 L 1006.203125 961.5 L 987.742188 961.5 L 987.742188 920.601562 L 1004.351562 920.601562 L 1006.761719 920.769531 L 1008.894531 921.164062 L 1010.800781 921.835938 L 1012.429688 922.789062 L 1013.832031 924.023438 L 1014.953125 925.539062 L 1015.402344 926.378906 L 1015.792969 927.277344 L 1016.074219 928.121094 L 1016.300781 929.074219 L 1016.410156 930.027344 L 1016.46875 930.980469 L 1016.300781 933 L 1015.792969 934.738281 L 1015.007812 936.367188 L 1013.886719 937.714844 L 1012.484375 938.949219 L 1010.800781 939.902344 L 1012.429688 940.628906 L 1013.832031 941.414062 L 1015.066406 942.3125 L 1016.074219 943.324219 L 1016.859375 944.390625 L 1017.476562 945.511719 L 1017.703125 946.183594 L 1017.871094 946.859375 L 1018.039062 947.53125 L 1018.152344 948.316406 L 1018.207031 949.046875 Z M 1011.25 931.710938 L 1011.082031 930.027344 L 1010.578125 928.625 L 1009.792969 927.390625 L 1008.667969 926.492188 L 1007.265625 925.820312 L 1005.527344 925.371094 L 1005.136719 925.371094 L 1004.742188 925.316406 L 1004.351562 925.257812 L 1003.453125 925.257812 L 1003.058594 925.203125 L 992.960938 925.203125 L 992.960938 938.21875 L 1003.058594 938.21875 L 1005.136719 938.105469 L 1006.929688 937.769531 L 1008.445312 937.152344 L 1009.566406 936.3125 L 1010.464844 935.1875 L 1011.027344 933.84375 L 1011.082031 933.5625 L 1011.136719 933.226562 L 1011.195312 932.886719 L 1011.195312 932.101562 Z M 1005.695312 956.898438 L 1007.265625 956.84375 L 1008.667969 956.507812 L 1009.902344 955.945312 L 1010.914062 955.214844 L 1011.753906 954.261719 L 1012.429688 953.085938 L 1012.597656 952.636719 L 1012.707031 952.132812 L 1012.878906 951.570312 L 1012.933594 951.066406 L 1012.988281 950.503906 L 1013.046875 949.886719 L 1012.933594 948.652344 L 1012.707031 947.476562 L 1012.316406 946.464844 L 1011.753906 945.511719 L 1011.027344 944.726562 L 1010.183594 943.996094 L 1009.566406 943.660156 L 1008.894531 943.378906 L 1008.164062 943.15625 L 1007.378906 942.988281 L 1006.539062 942.875 L 1005.695312 942.820312 L 992.960938 942.820312 L 992.960938 956.898438 Z M 1005.695312 956.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 961 134 L 961 141 M 957 138 L 964 138 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 961 138 L 961 138 M 961 138 L 961 138 M 961 138 L 961 138 M 961 138 L 961 138 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 458 122 L 458 131 M 453 127 L 462 127 M 457 128 L 459 128 M 457 126 L 459 126 M 457 126 L 457 128 M 459 126 L 459 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.svg b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.svg
index 25e4a4f..a89bbd9 100644
--- a/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.svg
+++ b/cells/sdfrbp/sky130_fd_sc_hvl__sdfrbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 360.5 L 1743.5 360.5 L 1743.5 556.5 L 174.5 556.5 Z M 1435.5 556.5 L 1563.5 556.5 L 1563.5 569.5 L 1435.5 569.5 Z M 1435.5 556.5 "/>
 </clipPath>
-<image id="image647" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image676" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image647"/>
+  <use xlink:href="#image676"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 199.5 385.5 L 1718.5 385.5 L 1718.5 398.5 L 199.5 398.5 Z M 199.5 385.5 "/>
 </clipPath>
-<image id="image648" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image677" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image648"/>
+  <use xlink:href="#image677"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 199.5 385.5 L 1718.5 385.5 L 1718.5 398.5 L 199.5 398.5 Z M 1629.5 589.5 L 1706.5 589.5 L 1706.5 593.5 L 1629.5 593.5 Z M 1629.5 593.5 L 1706.5 593.5 L 1706.5 606.5 L 1629.5 606.5 Z M 1462.5 601.5 L 1540.5 601.5 L 1540.5 606.5 L 1462.5 606.5 Z M 1629.5 606.5 L 1706.5 606.5 L 1706.5 613.5 L 1629.5 613.5 Z M 1462.5 606.5 L 1540.5 606.5 L 1540.5 619.5 L 1462.5 619.5 Z M 1072.5 601.5 L 1208.5 601.5 L 1208.5 619.5 L 1072.5 619.5 Z M 1563.5 613.5 L 1706.5 613.5 L 1706.5 623.5 L 1563.5 623.5 Z M 566.5 619.5 L 706.5 619.5 L 706.5 626.5 L 566.5 626.5 Z M 834.5 619.5 L 1208.5 619.5 L 1208.5 626.5 L 834.5 626.5 Z M 223.5 617.5 L 304.5 617.5 L 304.5 627.5 L 223.5 627.5 Z M 834.5 626.5 L 1440.5 626.5 L 1440.5 628.5 L 834.5 628.5 Z M 731.5 619.5 L 812.5 619.5 L 812.5 629.5 L 731.5 629.5 Z M 1563.5 623.5 L 1706.5 623.5 L 1706.5 636.5 L 1563.5 636.5 Z M 335.5 626.5 L 706.5 626.5 L 706.5 636.5 L 335.5 636.5 Z M 223.5 627.5 L 304.5 627.5 L 304.5 639.5 L 223.5 639.5 Z M 1462.5 619.5 L 1540.5 619.5 L 1540.5 641.5 L 1462.5 641.5 Z M 834.5 628.5 L 1440.5 628.5 L 1440.5 641.5 L 834.5 641.5 Z M 731.5 629.5 L 812.5 629.5 L 812.5 642.5 L 731.5 642.5 Z M 1563.5 636.5 L 1706.5 636.5 L 1706.5 645.5 L 1563.5 645.5 Z M 335.5 636.5 L 706.5 636.5 L 706.5 648.5 L 335.5 648.5 Z M 223.5 639.5 L 304.5 639.5 L 304.5 649.5 L 223.5 649.5 Z M 731.5 642.5 L 812.5 642.5 L 812.5 651.5 L 731.5 651.5 Z M 834.5 641.5 L 1440.5 641.5 L 1440.5 651.5 L 834.5 651.5 Z M 335.5 648.5 L 706.5 648.5 L 706.5 651.5 L 335.5 651.5 Z M 1462.5 641.5 L 1540.5 641.5 L 1540.5 653.5 L 1462.5 653.5 Z M 1065.5 651.5 L 1440.5 651.5 L 1440.5 655.5 L 1065.5 655.5 Z M 1462.5 653.5 L 1540.5 653.5 L 1540.5 658.5 L 1462.5 658.5 Z M 335.5 651.5 L 583.5 651.5 L 583.5 658.5 L 335.5 658.5 Z M 1065.5 655.5 L 1440.5 655.5 L 1440.5 658.5 L 1065.5 658.5 Z M 1065.5 655.5 "/>
 </clipPath>
-<image id="image649" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image678" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image649"/>
+  <use xlink:href="#image678"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 199.5 692.5 L 1718.5 692.5 L 1718.5 705.5 L 199.5 705.5 Z M 199.5 692.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image648"/>
+  <use xlink:href="#image677"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 626.5 418.5 L 647.5 418.5 L 647.5 420.5 L 626.5 420.5 Z M 1626.5 418.5 L 1648.5 418.5 L 1648.5 421.5 L 1626.5 421.5 Z M 1155.5 418.5 L 1176.5 418.5 L 1176.5 421.5 L 1155.5 421.5 Z M 1686.5 418.5 L 1707.5 418.5 L 1707.5 421.5 L 1686.5 421.5 Z M 1213.5 418.5 L 1235.5 418.5 L 1235.5 421.5 L 1213.5 421.5 Z M 1097.5 418.5 L 1117.5 418.5 L 1117.5 423.5 L 1097.5 423.5 Z M 613.5 420.5 L 647.5 420.5 L 647.5 426.5 L 613.5 426.5 Z M 439.5 420.5 L 460.5 420.5 L 460.5 427.5 L 439.5 427.5 Z M 883.5 418.5 L 904.5 418.5 L 904.5 428.5 L 883.5 428.5 Z M 824.5 418.5 L 846.5 418.5 L 846.5 428.5 L 824.5 428.5 Z M 1054.5 418.5 L 1074.5 418.5 L 1074.5 428.5 L 1054.5 428.5 Z M 996.5 418.5 L 1017.5 418.5 L 1017.5 428.5 L 996.5 428.5 Z M 327.5 420.5 L 348.5 420.5 L 348.5 429.5 L 327.5 429.5 Z M 552.5 420.5 L 576.5 420.5 L 576.5 429.5 L 552.5 429.5 Z M 283.5 422.5 L 304.5 422.5 L 304.5 431.5 L 283.5 431.5 Z M 223.5 422.5 L 245.5 422.5 L 245.5 431.5 L 223.5 431.5 Z M 1213.5 421.5 L 1235.5 421.5 L 1235.5 434.5 L 1213.5 434.5 Z M 1155.5 421.5 L 1176.5 421.5 L 1176.5 434.5 L 1155.5 434.5 Z M 1686.5 421.5 L 1707.5 421.5 L 1707.5 434.5 L 1686.5 434.5 Z M 1626.5 421.5 L 1648.5 421.5 L 1648.5 434.5 L 1626.5 434.5 Z M 1518.5 431.5 L 1538.5 431.5 L 1538.5 435.5 L 1518.5 435.5 Z M 1460.5 431.5 L 1480.5 431.5 L 1480.5 435.5 L 1460.5 435.5 Z M 1097.5 423.5 L 1117.5 423.5 L 1117.5 436.5 L 1097.5 436.5 Z M 613.5 426.5 L 647.5 426.5 L 647.5 439.5 L 613.5 439.5 Z M 439.5 427.5 L 460.5 427.5 L 460.5 440.5 L 439.5 440.5 Z M 824.5 428.5 L 846.5 428.5 L 846.5 440.5 L 824.5 440.5 Z M 1054.5 428.5 L 1074.5 428.5 L 1074.5 440.5 L 1054.5 440.5 Z M 883.5 428.5 L 904.5 428.5 L 904.5 440.5 L 883.5 440.5 Z M 996.5 428.5 L 1017.5 428.5 L 1017.5 440.5 L 996.5 440.5 Z M 552.5 429.5 L 576.5 429.5 L 576.5 442.5 L 552.5 442.5 Z M 327.5 429.5 L 348.5 429.5 L 348.5 442.5 L 327.5 442.5 Z M 283.5 431.5 L 304.5 431.5 L 304.5 444.5 L 283.5 444.5 Z M 223.5 431.5 L 245.5 431.5 L 245.5 444.5 L 223.5 444.5 Z M 1460.5 435.5 L 1480.5 435.5 L 1480.5 448.5 L 1460.5 448.5 Z M 1518.5 435.5 L 1538.5 435.5 L 1538.5 448.5 L 1518.5 448.5 Z M 1155.5 434.5 L 1176.5 434.5 L 1176.5 449.5 L 1155.5 449.5 Z M 824.5 440.5 L 846.5 440.5 L 846.5 450.5 L 824.5 450.5 Z M 996.5 440.5 L 1017.5 440.5 L 1017.5 450.5 L 996.5 450.5 Z M 1054.5 440.5 L 1074.5 440.5 L 1074.5 450.5 L 1054.5 450.5 Z M 883.5 440.5 L 904.5 440.5 L 904.5 450.5 L 883.5 450.5 Z M 942.5 418.5 L 958.5 418.5 L 958.5 450.5 L 942.5 450.5 Z M 613.5 439.5 L 647.5 439.5 L 647.5 451.5 L 613.5 451.5 Z M 552.5 442.5 L 576.5 442.5 L 576.5 451.5 L 552.5 451.5 Z M 386.5 420.5 L 402.5 420.5 L 402.5 451.5 L 386.5 451.5 Z M 327.5 442.5 L 348.5 442.5 L 348.5 451.5 L 327.5 451.5 Z M 439.5 440.5 L 460.5 440.5 L 460.5 451.5 L 439.5 451.5 Z M 685.5 418.5 L 706.5 418.5 L 706.5 451.5 L 685.5 451.5 Z M 498.5 420.5 L 514.5 420.5 L 514.5 451.5 L 498.5 451.5 Z M 1686.5 434.5 L 1707.5 434.5 L 1707.5 452.5 L 1686.5 452.5 Z M 1097.5 436.5 L 1117.5 436.5 L 1117.5 452.5 L 1097.5 452.5 Z M 1626.5 434.5 L 1648.5 434.5 L 1648.5 452.5 L 1626.5 452.5 Z M 283.5 444.5 L 304.5 444.5 L 304.5 454.5 L 283.5 454.5 Z M 223.5 444.5 L 245.5 444.5 L 245.5 454.5 L 223.5 454.5 Z M 1213.5 434.5 L 1235.5 434.5 L 1235.5 462.5 L 1213.5 462.5 Z M 1460.5 448.5 L 1480.5 448.5 L 1480.5 462.5 L 1460.5 462.5 Z M 1155.5 449.5 L 1176.5 449.5 L 1176.5 462.5 L 1155.5 462.5 Z M 1452.5 462.5 L 1480.5 462.5 L 1480.5 463.5 L 1452.5 463.5 Z M 685.5 451.5 L 706.5 451.5 L 706.5 464.5 L 685.5 464.5 Z M 1626.5 452.5 L 1648.5 452.5 L 1648.5 465.5 L 1626.5 465.5 Z M 1686.5 452.5 L 1707.5 452.5 L 1707.5 465.5 L 1686.5 465.5 Z M 1518.5 448.5 L 1538.5 448.5 L 1538.5 465.5 L 1518.5 465.5 Z M 1097.5 452.5 L 1117.5 452.5 L 1117.5 465.5 L 1097.5 465.5 Z M 1213.5 462.5 L 1243.5 462.5 L 1243.5 469.5 L 1213.5 469.5 Z M 1393.5 462.5 L 1414.5 462.5 L 1414.5 471.5 L 1393.5 471.5 Z M 1334.5 462.5 L 1355.5 462.5 L 1355.5 471.5 L 1334.5 471.5 Z M 685.5 464.5 L 706.5 464.5 L 706.5 475.5 L 685.5 475.5 Z M 1626.5 465.5 L 1648.5 465.5 L 1648.5 475.5 L 1626.5 475.5 Z M 626.5 451.5 L 647.5 451.5 L 647.5 475.5 L 626.5 475.5 Z M 737.5 472.5 L 759.5 472.5 L 759.5 475.5 L 737.5 475.5 Z M 1452.5 463.5 L 1480.5 463.5 L 1480.5 476.5 L 1452.5 476.5 Z M 797.5 472.5 L 817.5 472.5 L 817.5 477.5 L 797.5 477.5 Z M 1155.5 462.5 L 1176.5 462.5 L 1176.5 478.5 L 1155.5 478.5 Z M 1518.5 465.5 L 1538.5 465.5 L 1538.5 478.5 L 1518.5 478.5 Z M 1560.5 475.5 L 1580.5 475.5 L 1580.5 479.5 L 1560.5 479.5 Z M 1213.5 469.5 L 1243.5 469.5 L 1243.5 482.5 L 1213.5 482.5 Z M 1393.5 471.5 L 1414.5 471.5 L 1414.5 484.5 L 1393.5 484.5 Z M 1686.5 465.5 L 1707.5 465.5 L 1707.5 484.5 L 1686.5 484.5 Z M 1334.5 471.5 L 1355.5 471.5 L 1355.5 484.5 L 1334.5 484.5 Z M 1618.5 475.5 L 1648.5 475.5 L 1648.5 484.5 L 1618.5 484.5 Z M 737.5 475.5 L 759.5 475.5 L 759.5 488.5 L 737.5 488.5 Z M 797.5 477.5 L 817.5 477.5 L 817.5 490.5 L 797.5 490.5 Z M 1155.5 478.5 L 1176.5 478.5 L 1176.5 491.5 L 1155.5 491.5 Z M 1452.5 476.5 L 1480.5 476.5 L 1480.5 492.5 L 1452.5 492.5 Z M 1560.5 479.5 L 1580.5 479.5 L 1580.5 492.5 L 1560.5 492.5 Z M 1452.5 492.5 L 1480.5 492.5 L 1480.5 494.5 L 1452.5 494.5 Z M 1155.5 491.5 L 1176.5 491.5 L 1176.5 494.5 L 1155.5 494.5 Z M 1281.5 462.5 L 1297.5 462.5 L 1297.5 494.5 L 1281.5 494.5 Z M 1213.5 482.5 L 1243.5 482.5 L 1243.5 494.5 L 1213.5 494.5 Z M 1334.5 484.5 L 1355.5 484.5 L 1355.5 494.5 L 1334.5 494.5 Z M 1393.5 484.5 L 1414.5 484.5 L 1414.5 494.5 L 1393.5 494.5 Z M 1097.5 465.5 L 1117.5 465.5 L 1117.5 494.5 L 1097.5 494.5 Z M 1518.5 478.5 L 1538.5 478.5 L 1538.5 496.5 L 1518.5 496.5 Z M 1618.5 484.5 L 1648.5 484.5 L 1648.5 497.5 L 1618.5 497.5 Z M 1686.5 484.5 L 1707.5 484.5 L 1707.5 497.5 L 1686.5 497.5 Z M 1460.5 494.5 L 1480.5 494.5 L 1480.5 505.5 L 1460.5 505.5 Z M 1518.5 496.5 L 1538.5 496.5 L 1538.5 509.5 L 1518.5 509.5 Z M 797.5 490.5 L 817.5 490.5 L 817.5 512.5 L 797.5 512.5 Z M 737.5 488.5 L 759.5 488.5 L 759.5 513.5 L 737.5 513.5 Z M 1560.5 492.5 L 1580.5 492.5 L 1580.5 514.5 L 1560.5 514.5 Z M 1618.5 497.5 L 1648.5 497.5 L 1648.5 515.5 L 1618.5 515.5 Z M 1686.5 497.5 L 1707.5 497.5 L 1707.5 515.5 L 1686.5 515.5 Z M 1460.5 505.5 L 1480.5 505.5 L 1480.5 521.5 L 1460.5 521.5 Z M 797.5 512.5 L 817.5 512.5 L 817.5 524.5 L 797.5 524.5 Z M 737.5 513.5 L 759.5 513.5 L 759.5 526.5 L 737.5 526.5 Z M 1518.5 509.5 L 1538.5 509.5 L 1538.5 526.5 L 1518.5 526.5 Z M 1560.5 514.5 L 1580.5 514.5 L 1580.5 527.5 L 1560.5 527.5 Z M 1686.5 515.5 L 1707.5 515.5 L 1707.5 528.5 L 1686.5 528.5 Z M 1618.5 515.5 L 1648.5 515.5 L 1648.5 528.5 L 1618.5 528.5 Z M 797.5 524.5 L 817.5 524.5 L 817.5 529.5 L 797.5 529.5 Z M 737.5 526.5 L 759.5 526.5 L 759.5 529.5 L 737.5 529.5 Z M 1686.5 528.5 L 1707.5 528.5 L 1707.5 531.5 L 1686.5 531.5 Z M 1618.5 528.5 L 1648.5 528.5 L 1648.5 531.5 L 1618.5 531.5 Z M 1560.5 527.5 L 1580.5 527.5 L 1580.5 531.5 L 1560.5 531.5 Z M 1460.5 521.5 L 1480.5 521.5 L 1480.5 534.5 L 1460.5 534.5 Z M 1518.5 526.5 L 1538.5 526.5 L 1538.5 539.5 L 1518.5 539.5 Z M 1460.5 534.5 L 1480.5 534.5 L 1480.5 544.5 L 1460.5 544.5 Z M 1518.5 539.5 L 1538.5 539.5 L 1538.5 544.5 L 1518.5 544.5 Z M 199.5 692.5 L 1718.5 692.5 L 1718.5 705.5 L 199.5 705.5 Z M 199.5 692.5 "/>
 </clipPath>
-<image id="image650" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image679" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image650"/>
+  <use xlink:href="#image679"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1649.5 589.5 L 1686.5 589.5 L 1686.5 645.5 L 1649.5 645.5 Z M 1583.5 613.5 L 1620.5 613.5 L 1620.5 645.5 L 1583.5 645.5 Z M 245.5 617.5 L 283.5 617.5 L 283.5 649.5 L 245.5 649.5 Z M 752.5 619.5 L 790.5 619.5 L 790.5 651.5 L 752.5 651.5 Z M 856.5 619.5 L 893.5 619.5 L 893.5 651.5 L 856.5 651.5 Z M 914.5 619.5 L 952.5 619.5 L 952.5 651.5 L 914.5 651.5 Z M 968.5 619.5 L 1006.5 619.5 L 1006.5 651.5 L 968.5 651.5 Z M 1022.5 619.5 L 1059.5 619.5 L 1059.5 651.5 L 1022.5 651.5 Z M 647.5 619.5 L 685.5 619.5 L 685.5 651.5 L 647.5 651.5 Z M 589.5 619.5 L 626.5 619.5 L 626.5 651.5 L 589.5 651.5 Z M 1482.5 601.5 L 1520.5 601.5 L 1520.5 658.5 L 1482.5 658.5 Z M 1382.5 626.5 L 1420.5 626.5 L 1420.5 658.5 L 1382.5 658.5 Z M 1150.5 601.5 L 1188.5 601.5 L 1188.5 658.5 L 1150.5 658.5 Z M 522.5 626.5 L 560.5 626.5 L 560.5 658.5 L 522.5 658.5 Z M 1091.5 601.5 L 1129.5 601.5 L 1129.5 658.5 L 1091.5 658.5 Z M 356.5 626.5 L 394.5 626.5 L 394.5 658.5 L 356.5 658.5 Z M 1216.5 626.5 L 1254.5 626.5 L 1254.5 658.5 L 1216.5 658.5 Z M 1329.5 626.5 L 1366.5 626.5 L 1366.5 658.5 L 1329.5 658.5 Z M 410.5 626.5 L 448.5 626.5 L 448.5 658.5 L 410.5 658.5 Z M 469.5 626.5 L 506.5 626.5 L 506.5 658.5 L 469.5 658.5 Z M 1269.5 626.5 L 1307.5 626.5 L 1307.5 658.5 L 1269.5 658.5 Z M 1269.5 626.5 "/>
 </clipPath>
-<image id="image651" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image680" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image651"/>
+  <use xlink:href="#image680"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1017.5 418.5 L 1054.5 418.5 L 1054.5 450.5 L 1017.5 450.5 Z M 958.5 418.5 L 996.5 418.5 L 996.5 450.5 L 958.5 450.5 Z M 846.5 418.5 L 883.5 418.5 L 883.5 450.5 L 846.5 450.5 Z M 904.5 418.5 L 942.5 418.5 L 942.5 450.5 L 904.5 450.5 Z M 576.5 420.5 L 613.5 420.5 L 613.5 451.5 L 576.5 451.5 Z M 460.5 420.5 L 498.5 420.5 L 498.5 451.5 L 460.5 451.5 Z M 402.5 420.5 L 439.5 420.5 L 439.5 451.5 L 402.5 451.5 Z M 514.5 420.5 L 552.5 420.5 L 552.5 451.5 L 514.5 451.5 Z M 348.5 420.5 L 386.5 420.5 L 386.5 451.5 L 348.5 451.5 Z M 245.5 422.5 L 283.5 422.5 L 283.5 454.5 L 245.5 454.5 Z M 647.5 418.5 L 685.5 418.5 L 685.5 475.5 L 647.5 475.5 Z M 1176.5 418.5 L 1213.5 418.5 L 1213.5 494.5 L 1176.5 494.5 Z M 1243.5 462.5 L 1281.5 462.5 L 1281.5 494.5 L 1243.5 494.5 Z M 1297.5 462.5 L 1334.5 462.5 L 1334.5 494.5 L 1297.5 494.5 Z M 1117.5 418.5 L 1155.5 418.5 L 1155.5 494.5 L 1117.5 494.5 Z M 1355.5 462.5 L 1393.5 462.5 L 1393.5 494.5 L 1355.5 494.5 Z M 1414.5 462.5 L 1452.5 462.5 L 1452.5 494.5 L 1414.5 494.5 Z M 759.5 472.5 L 797.5 472.5 L 797.5 529.5 L 759.5 529.5 Z M 1580.5 475.5 L 1618.5 475.5 L 1618.5 531.5 L 1580.5 531.5 Z M 1648.5 418.5 L 1686.5 418.5 L 1686.5 531.5 L 1648.5 531.5 Z M 1480.5 431.5 L 1518.5 431.5 L 1518.5 544.5 L 1480.5 544.5 Z M 1480.5 431.5 "/>
 </clipPath>
-<image id="image652" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image681" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image652"/>
+  <use xlink:href="#image681"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 211.5 385.5 L 223.5 385.5 L 223.5 398.5 L 211.5 398.5 Z M 1694.5 385.5 L 1707.5 385.5 L 1707.5 398.5 L 1694.5 398.5 Z M 1658.5 385.5 L 1670.5 385.5 L 1670.5 398.5 L 1658.5 398.5 Z M 1621.5 385.5 L 1634.5 385.5 L 1634.5 398.5 L 1621.5 398.5 Z M 1585.5 385.5 L 1598.5 385.5 L 1598.5 398.5 L 1585.5 398.5 Z M 1549.5 385.5 L 1562.5 385.5 L 1562.5 398.5 L 1549.5 398.5 Z M 1513.5 385.5 L 1526.5 385.5 L 1526.5 398.5 L 1513.5 398.5 Z M 1477.5 385.5 L 1490.5 385.5 L 1490.5 398.5 L 1477.5 398.5 Z M 1441.5 385.5 L 1453.5 385.5 L 1453.5 398.5 L 1441.5 398.5 Z M 1404.5 385.5 L 1417.5 385.5 L 1417.5 398.5 L 1404.5 398.5 Z M 1368.5 385.5 L 1381.5 385.5 L 1381.5 398.5 L 1368.5 398.5 Z M 1332.5 385.5 L 1345.5 385.5 L 1345.5 398.5 L 1332.5 398.5 Z M 1296.5 385.5 L 1309.5 385.5 L 1309.5 398.5 L 1296.5 398.5 Z M 1260.5 385.5 L 1272.5 385.5 L 1272.5 398.5 L 1260.5 398.5 Z M 1224.5 385.5 L 1236.5 385.5 L 1236.5 398.5 L 1224.5 398.5 Z M 1187.5 385.5 L 1200.5 385.5 L 1200.5 398.5 L 1187.5 398.5 Z M 1151.5 385.5 L 1164.5 385.5 L 1164.5 398.5 L 1151.5 398.5 Z M 1115.5 385.5 L 1128.5 385.5 L 1128.5 398.5 L 1115.5 398.5 Z M 1079.5 385.5 L 1092.5 385.5 L 1092.5 398.5 L 1079.5 398.5 Z M 1043.5 385.5 L 1055.5 385.5 L 1055.5 398.5 L 1043.5 398.5 Z M 1006.5 385.5 L 1019.5 385.5 L 1019.5 398.5 L 1006.5 398.5 Z M 970.5 385.5 L 983.5 385.5 L 983.5 398.5 L 970.5 398.5 Z M 934.5 385.5 L 947.5 385.5 L 947.5 398.5 L 934.5 398.5 Z M 898.5 385.5 L 911.5 385.5 L 911.5 398.5 L 898.5 398.5 Z M 862.5 385.5 L 875.5 385.5 L 875.5 398.5 L 862.5 398.5 Z M 826.5 385.5 L 838.5 385.5 L 838.5 398.5 L 826.5 398.5 Z M 789.5 385.5 L 802.5 385.5 L 802.5 398.5 L 789.5 398.5 Z M 753.5 385.5 L 766.5 385.5 L 766.5 398.5 L 753.5 398.5 Z M 717.5 385.5 L 730.5 385.5 L 730.5 398.5 L 717.5 398.5 Z M 681.5 385.5 L 694.5 385.5 L 694.5 398.5 L 681.5 398.5 Z M 645.5 385.5 L 657.5 385.5 L 657.5 398.5 L 645.5 398.5 Z M 608.5 385.5 L 621.5 385.5 L 621.5 398.5 L 608.5 398.5 Z M 572.5 385.5 L 585.5 385.5 L 585.5 398.5 L 572.5 398.5 Z M 536.5 385.5 L 549.5 385.5 L 549.5 398.5 L 536.5 398.5 Z M 500.5 385.5 L 513.5 385.5 L 513.5 398.5 L 500.5 398.5 Z M 464.5 385.5 L 477.5 385.5 L 477.5 398.5 L 464.5 398.5 Z M 428.5 385.5 L 440.5 385.5 L 440.5 398.5 L 428.5 398.5 Z M 391.5 385.5 L 404.5 385.5 L 404.5 398.5 L 391.5 398.5 Z M 355.5 385.5 L 368.5 385.5 L 368.5 398.5 L 355.5 398.5 Z M 319.5 385.5 L 332.5 385.5 L 332.5 398.5 L 319.5 398.5 Z M 283.5 385.5 L 296.5 385.5 L 296.5 398.5 L 283.5 398.5 Z M 247.5 385.5 L 260.5 385.5 L 260.5 398.5 L 247.5 398.5 Z M 1102.5 421.5 L 1115.5 421.5 L 1115.5 423.5 L 1102.5 423.5 Z M 636.5 421.5 L 649.5 421.5 L 649.5 426.5 L 636.5 426.5 Z M 447.5 421.5 L 460.5 421.5 L 460.5 427.5 L 447.5 427.5 Z M 1003.5 421.5 L 1016.5 421.5 L 1016.5 428.5 L 1003.5 428.5 Z M 233.5 421.5 L 246.5 421.5 L 246.5 431.5 L 233.5 431.5 Z M 233.5 431.5 L 246.5 431.5 L 246.5 434.5 L 233.5 434.5 Z M 636.5 426.5 L 649.5 426.5 L 649.5 434.5 L 636.5 434.5 Z M 1102.5 423.5 L 1115.5 423.5 L 1115.5 434.5 L 1102.5 434.5 Z M 949.5 421.5 L 962.5 421.5 L 962.5 434.5 L 949.5 434.5 Z M 1315.5 421.5 L 1328.5 421.5 L 1328.5 434.5 L 1315.5 434.5 Z M 976.5 421.5 L 989.5 421.5 L 989.5 434.5 L 976.5 434.5 Z M 1343.5 421.5 L 1355.5 421.5 L 1355.5 434.5 L 1343.5 434.5 Z M 1652.5 421.5 L 1665.5 421.5 L 1665.5 434.5 L 1652.5 434.5 Z M 1598.5 421.5 L 1611.5 421.5 L 1611.5 434.5 L 1598.5 434.5 Z M 1129.5 421.5 L 1142.5 421.5 L 1142.5 434.5 L 1129.5 434.5 Z M 1370.5 421.5 L 1383.5 421.5 L 1383.5 434.5 L 1370.5 434.5 Z M 1485.5 421.5 L 1498.5 421.5 L 1498.5 434.5 L 1485.5 434.5 Z M 1458.5 421.5 L 1471.5 421.5 L 1471.5 434.5 L 1458.5 434.5 Z M 1431.5 421.5 L 1444.5 421.5 L 1444.5 434.5 L 1431.5 434.5 Z M 393.5 421.5 L 406.5 421.5 L 406.5 434.5 L 393.5 434.5 Z M 609.5 421.5 L 622.5 421.5 L 622.5 434.5 L 609.5 434.5 Z M 582.5 421.5 L 595.5 421.5 L 595.5 434.5 L 582.5 434.5 Z M 1625.5 421.5 L 1638.5 421.5 L 1638.5 434.5 L 1625.5 434.5 Z M 206.5 421.5 L 219.5 421.5 L 219.5 434.5 L 206.5 434.5 Z M 742.5 421.5 L 755.5 421.5 L 755.5 434.5 L 742.5 434.5 Z M 420.5 421.5 L 433.5 421.5 L 433.5 434.5 L 420.5 434.5 Z M 260.5 421.5 L 273.5 421.5 L 273.5 434.5 L 260.5 434.5 Z M 1003.5 428.5 L 1016.5 428.5 L 1016.5 434.5 L 1003.5 434.5 Z M 447.5 427.5 L 460.5 427.5 L 460.5 434.5 L 447.5 434.5 Z M 1006.5 538.5 L 1019.5 538.5 L 1019.5 551.5 L 1006.5 551.5 Z M 1332.5 538.5 L 1345.5 538.5 L 1345.5 551.5 L 1332.5 551.5 Z M 608.5 538.5 L 621.5 538.5 L 621.5 551.5 L 608.5 551.5 Z M 1040.5 656.5 L 1053.5 656.5 L 1053.5 668.5 L 1040.5 668.5 Z M 1655.5 656.5 L 1667.5 656.5 L 1667.5 668.5 L 1655.5 668.5 Z M 1627.5 656.5 L 1640.5 656.5 L 1640.5 668.5 L 1627.5 668.5 Z M 1600.5 656.5 L 1613.5 656.5 L 1613.5 668.5 L 1600.5 668.5 Z M 1487.5 656.5 L 1499.5 656.5 L 1499.5 668.5 L 1487.5 668.5 Z M 1459.5 656.5 L 1472.5 656.5 L 1472.5 668.5 L 1459.5 668.5 Z M 1344.5 656.5 L 1357.5 656.5 L 1357.5 668.5 L 1344.5 668.5 Z M 1317.5 656.5 L 1330.5 656.5 L 1330.5 668.5 L 1317.5 668.5 Z M 1290.5 656.5 L 1303.5 656.5 L 1303.5 668.5 L 1290.5 668.5 Z M 626.5 656.5 L 639.5 656.5 L 639.5 668.5 L 626.5 668.5 Z M 599.5 656.5 L 612.5 656.5 L 612.5 668.5 L 599.5 668.5 Z M 762.5 656.5 L 775.5 656.5 L 775.5 668.5 L 762.5 668.5 Z M 723.5 656.5 L 735.5 656.5 L 735.5 668.5 L 723.5 668.5 Z M 233.5 656.5 L 246.5 656.5 L 246.5 668.5 L 233.5 668.5 Z M 206.5 656.5 L 219.5 656.5 L 219.5 668.5 L 206.5 668.5 Z M 653.5 656.5 L 666.5 656.5 L 666.5 668.5 L 653.5 668.5 Z M 1013.5 656.5 L 1026.5 656.5 L 1026.5 668.5 L 1013.5 668.5 Z M 1067.5 656.5 L 1080.5 656.5 L 1080.5 668.5 L 1067.5 668.5 Z M 211.5 692.5 L 223.5 692.5 L 223.5 705.5 L 211.5 705.5 Z M 1694.5 692.5 L 1707.5 692.5 L 1707.5 705.5 L 1694.5 705.5 Z M 1658.5 692.5 L 1670.5 692.5 L 1670.5 705.5 L 1658.5 705.5 Z M 1621.5 692.5 L 1634.5 692.5 L 1634.5 705.5 L 1621.5 705.5 Z M 1585.5 692.5 L 1598.5 692.5 L 1598.5 705.5 L 1585.5 705.5 Z M 1549.5 692.5 L 1562.5 692.5 L 1562.5 705.5 L 1549.5 705.5 Z M 1513.5 692.5 L 1526.5 692.5 L 1526.5 705.5 L 1513.5 705.5 Z M 1477.5 692.5 L 1490.5 692.5 L 1490.5 705.5 L 1477.5 705.5 Z M 1441.5 692.5 L 1453.5 692.5 L 1453.5 705.5 L 1441.5 705.5 Z M 1404.5 692.5 L 1417.5 692.5 L 1417.5 705.5 L 1404.5 705.5 Z M 1368.5 692.5 L 1381.5 692.5 L 1381.5 705.5 L 1368.5 705.5 Z M 1332.5 692.5 L 1345.5 692.5 L 1345.5 705.5 L 1332.5 705.5 Z M 1296.5 692.5 L 1309.5 692.5 L 1309.5 705.5 L 1296.5 705.5 Z M 1260.5 692.5 L 1272.5 692.5 L 1272.5 705.5 L 1260.5 705.5 Z M 1224.5 692.5 L 1236.5 692.5 L 1236.5 705.5 L 1224.5 705.5 Z M 1187.5 692.5 L 1200.5 692.5 L 1200.5 705.5 L 1187.5 705.5 Z M 1151.5 692.5 L 1164.5 692.5 L 1164.5 705.5 L 1151.5 705.5 Z M 1115.5 692.5 L 1128.5 692.5 L 1128.5 705.5 L 1115.5 705.5 Z M 1079.5 692.5 L 1092.5 692.5 L 1092.5 705.5 L 1079.5 705.5 Z M 1043.5 692.5 L 1055.5 692.5 L 1055.5 705.5 L 1043.5 705.5 Z M 1006.5 692.5 L 1019.5 692.5 L 1019.5 705.5 L 1006.5 705.5 Z M 970.5 692.5 L 983.5 692.5 L 983.5 705.5 L 970.5 705.5 Z M 934.5 692.5 L 947.5 692.5 L 947.5 705.5 L 934.5 705.5 Z M 898.5 692.5 L 911.5 692.5 L 911.5 705.5 L 898.5 705.5 Z M 862.5 692.5 L 875.5 692.5 L 875.5 705.5 L 862.5 705.5 Z M 826.5 692.5 L 838.5 692.5 L 838.5 705.5 L 826.5 705.5 Z M 789.5 692.5 L 802.5 692.5 L 802.5 705.5 L 789.5 705.5 Z M 753.5 692.5 L 766.5 692.5 L 766.5 705.5 L 753.5 705.5 Z M 717.5 692.5 L 730.5 692.5 L 730.5 705.5 L 717.5 705.5 Z M 681.5 692.5 L 694.5 692.5 L 694.5 705.5 L 681.5 705.5 Z M 645.5 692.5 L 657.5 692.5 L 657.5 705.5 L 645.5 705.5 Z M 608.5 692.5 L 621.5 692.5 L 621.5 705.5 L 608.5 705.5 Z M 572.5 692.5 L 585.5 692.5 L 585.5 705.5 L 572.5 705.5 Z M 536.5 692.5 L 549.5 692.5 L 549.5 705.5 L 536.5 705.5 Z M 500.5 692.5 L 513.5 692.5 L 513.5 705.5 L 500.5 705.5 Z M 464.5 692.5 L 477.5 692.5 L 477.5 705.5 L 464.5 705.5 Z M 428.5 692.5 L 440.5 692.5 L 440.5 705.5 L 428.5 705.5 Z M 391.5 692.5 L 404.5 692.5 L 404.5 705.5 L 391.5 705.5 Z M 355.5 692.5 L 368.5 692.5 L 368.5 705.5 L 355.5 705.5 Z M 319.5 692.5 L 332.5 692.5 L 332.5 705.5 L 319.5 705.5 Z M 283.5 692.5 L 296.5 692.5 L 296.5 705.5 L 283.5 705.5 Z M 247.5 692.5 L 260.5 692.5 L 260.5 705.5 L 247.5 705.5 Z M 247.5 692.5 "/>
 </clipPath>
-<image id="image653" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image682" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image653"/>
+  <use xlink:href="#image682"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface644">
+<g id="surface673">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -333,6 +333,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1542.886719 453.191406 L 1542.886719 469.550781 L 1540.53125 469.550781 L 1532.070312 456.289062 L 1532.070312 469.550781 L 1530.097656 469.550781 L 1530.097656 453.191406 L 1532.363281 453.191406 L 1540.914062 466.566406 L 1540.914062 453.191406 Z M 1542.886719 453.191406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1513 624 L 1526 624 M 1513 611 L 1526 611 M 1513 611 L 1513 624 M 1526 611 L 1526 624 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1513 624 L 1526 624 M 1513 611 L 1526 611 M 1526 624 L 1526 611 M 1513 624 L 1513 611 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 199 376 L 199 385 M 194 381 L 203 381 M 198 382 L 200 382 M 198 380 L 200 380 M 198 380 L 198 382 M 200 380 L 200 382 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.svg b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.svg
index 799ab0f..373958c 100644
--- a/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.svg
+++ b/cells/sdfrtp/sky130_fd_sc_hvl__sdfrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 352.5 L 1743.5 352.5 L 1743.5 557.5 L 174.5 557.5 Z M 174.5 352.5 "/>
 </clipPath>
-<image id="image467" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image495" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image467"/>
+  <use xlink:href="#image495"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 200.5 378.5 L 1717.5 378.5 L 1717.5 391.5 L 200.5 391.5 Z M 200.5 378.5 "/>
 </clipPath>
-<image id="image468" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image496" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image468"/>
+  <use xlink:href="#image496"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 200.5 378.5 L 1717.5 378.5 L 1717.5 391.5 L 200.5 391.5 Z M 938.5 602.5 L 1424.5 602.5 L 1424.5 611.5 L 938.5 611.5 Z M 1553.5 605.5 L 1705.5 605.5 L 1705.5 621.5 L 1553.5 621.5 Z M 938.5 611.5 L 1424.5 611.5 L 1424.5 625.5 L 938.5 625.5 Z M 254.5 623.5 L 634.5 623.5 L 634.5 633.5 L 254.5 633.5 Z M 658.5 623.5 L 915.5 623.5 L 915.5 633.5 L 658.5 633.5 Z M 1553.5 621.5 L 1705.5 621.5 L 1705.5 635.5 L 1553.5 635.5 Z M 938.5 625.5 L 1424.5 625.5 L 1424.5 635.5 L 938.5 635.5 Z M 1553.5 635.5 L 1705.5 635.5 L 1705.5 638.5 L 1553.5 638.5 Z M 1448.5 629.5 L 1529.5 629.5 L 1529.5 639.5 L 1448.5 639.5 Z M 1008.5 635.5 L 1155.5 635.5 L 1155.5 643.5 L 1008.5 643.5 Z M 1624.5 638.5 L 1705.5 638.5 L 1705.5 646.5 L 1624.5 646.5 Z M 254.5 633.5 L 634.5 633.5 L 634.5 647.5 L 254.5 647.5 Z M 658.5 633.5 L 915.5 633.5 L 915.5 647.5 L 658.5 647.5 Z M 1448.5 639.5 L 1529.5 639.5 L 1529.5 652.5 L 1448.5 652.5 Z M 1008.5 643.5 L 1155.5 643.5 L 1155.5 656.5 L 1008.5 656.5 Z M 254.5 647.5 L 634.5 647.5 L 634.5 656.5 L 254.5 656.5 Z M 658.5 647.5 L 915.5 647.5 L 915.5 656.5 L 658.5 656.5 Z M 1624.5 646.5 L 1705.5 646.5 L 1705.5 659.5 L 1624.5 659.5 Z M 1008.5 656.5 L 1155.5 656.5 L 1155.5 661.5 L 1008.5 661.5 Z M 1448.5 652.5 L 1529.5 652.5 L 1529.5 662.5 L 1448.5 662.5 Z M 1624.5 659.5 L 1705.5 659.5 L 1705.5 664.5 L 1624.5 664.5 Z M 1624.5 659.5 "/>
 </clipPath>
-<image id="image469" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image497" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image469"/>
+  <use xlink:href="#image497"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 200.5 699.5 L 1717.5 699.5 L 1717.5 713.5 L 200.5 713.5 Z M 200.5 699.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image468"/>
+  <use xlink:href="#image496"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1621.5 413.5 L 1643.5 413.5 L 1643.5 416.5 L 1621.5 416.5 Z M 1683.5 413.5 L 1705.5 413.5 L 1705.5 416.5 L 1683.5 416.5 Z M 1019.5 413.5 L 1040.5 413.5 L 1040.5 417.5 L 1019.5 417.5 Z M 344.5 417.5 L 368.5 417.5 L 368.5 420.5 L 344.5 420.5 Z M 525.5 417.5 L 570.5 417.5 L 570.5 422.5 L 525.5 422.5 Z M 836.5 420.5 L 865.5 420.5 L 865.5 423.5 L 836.5 423.5 Z M 226.5 417.5 L 248.5 417.5 L 248.5 427.5 L 226.5 427.5 Z M 463.5 417.5 L 485.5 417.5 L 485.5 427.5 L 463.5 427.5 Z M 1279.5 423.5 L 1302.5 423.5 L 1302.5 427.5 L 1279.5 427.5 Z M 1683.5 416.5 L 1705.5 416.5 L 1705.5 429.5 L 1683.5 429.5 Z M 1621.5 416.5 L 1643.5 416.5 L 1643.5 429.5 L 1621.5 429.5 Z M 656.5 420.5 L 679.5 420.5 L 679.5 430.5 L 656.5 430.5 Z M 1019.5 417.5 L 1040.5 417.5 L 1040.5 431.5 L 1019.5 431.5 Z M 1019.5 431.5 L 1040.5 431.5 L 1040.5 432.5 L 1019.5 432.5 Z M 609.5 417.5 L 632.5 417.5 L 632.5 433.5 L 609.5 433.5 Z M 344.5 420.5 L 368.5 420.5 L 368.5 433.5 L 344.5 433.5 Z M 718.5 420.5 L 741.5 420.5 L 741.5 435.5 L 718.5 435.5 Z M 904.5 420.5 L 927.5 420.5 L 927.5 435.5 L 904.5 435.5 Z M 525.5 422.5 L 570.5 422.5 L 570.5 435.5 L 525.5 435.5 Z M 1425.5 432.5 L 1448.5 432.5 L 1448.5 436.5 L 1425.5 436.5 Z M 1487.5 432.5 L 1510.5 432.5 L 1510.5 436.5 L 1487.5 436.5 Z M 836.5 423.5 L 865.5 423.5 L 865.5 436.5 L 836.5 436.5 Z M 950.5 432.5 L 971.5 432.5 L 971.5 437.5 L 950.5 437.5 Z M 463.5 427.5 L 485.5 427.5 L 485.5 440.5 L 463.5 440.5 Z M 226.5 427.5 L 248.5 427.5 L 248.5 440.5 L 226.5 440.5 Z M 1279.5 427.5 L 1302.5 427.5 L 1302.5 440.5 L 1279.5 440.5 Z M 656.5 430.5 L 679.5 430.5 L 679.5 443.5 L 656.5 443.5 Z M 609.5 433.5 L 632.5 433.5 L 632.5 447.5 L 609.5 447.5 Z M 718.5 435.5 L 741.5 435.5 L 741.5 448.5 L 718.5 448.5 Z M 904.5 435.5 L 927.5 435.5 L 927.5 448.5 L 904.5 448.5 Z M 1621.5 429.5 L 1643.5 429.5 L 1643.5 449.5 L 1621.5 449.5 Z M 1487.5 436.5 L 1510.5 436.5 L 1510.5 449.5 L 1487.5 449.5 Z M 1683.5 429.5 L 1705.5 429.5 L 1705.5 449.5 L 1683.5 449.5 Z M 1425.5 436.5 L 1448.5 436.5 L 1448.5 449.5 L 1425.5 449.5 Z M 525.5 435.5 L 570.5 435.5 L 570.5 450.5 L 525.5 450.5 Z M 407.5 417.5 L 424.5 417.5 L 424.5 450.5 L 407.5 450.5 Z M 226.5 440.5 L 248.5 440.5 L 248.5 450.5 L 226.5 450.5 Z M 609.5 447.5 L 632.5 447.5 L 632.5 450.5 L 609.5 450.5 Z M 344.5 433.5 L 368.5 433.5 L 368.5 450.5 L 344.5 450.5 Z M 288.5 417.5 L 304.5 417.5 L 304.5 450.5 L 288.5 450.5 Z M 463.5 440.5 L 485.5 440.5 L 485.5 450.5 L 463.5 450.5 Z M 950.5 437.5 L 971.5 437.5 L 971.5 451.5 L 950.5 451.5 Z M 836.5 436.5 L 865.5 436.5 L 865.5 453.5 L 836.5 453.5 Z M 656.5 443.5 L 679.5 443.5 L 679.5 453.5 L 656.5 453.5 Z M 718.5 448.5 L 741.5 448.5 L 741.5 453.5 L 718.5 453.5 Z M 904.5 448.5 L 927.5 448.5 L 927.5 453.5 L 904.5 453.5 Z M 780.5 420.5 L 797.5 420.5 L 797.5 453.5 L 780.5 453.5 Z M 1425.5 449.5 L 1448.5 449.5 L 1448.5 459.5 L 1425.5 459.5 Z M 1279.5 440.5 L 1302.5 440.5 L 1302.5 459.5 L 1279.5 459.5 Z M 1142.5 413.5 L 1169.5 413.5 L 1169.5 459.5 L 1142.5 459.5 Z M 1621.5 449.5 L 1643.5 449.5 L 1643.5 462.5 L 1621.5 462.5 Z M 1683.5 449.5 L 1705.5 449.5 L 1705.5 462.5 L 1683.5 462.5 Z M 1347.5 459.5 L 1369.5 459.5 L 1369.5 468.5 L 1347.5 468.5 Z M 1621.5 462.5 L 1643.5 462.5 L 1643.5 472.5 L 1621.5 472.5 Z M 1142.5 459.5 L 1177.5 459.5 L 1177.5 473.5 L 1142.5 473.5 Z M 950.5 451.5 L 971.5 451.5 L 971.5 474.5 L 950.5 474.5 Z M 1080.5 413.5 L 1102.5 413.5 L 1102.5 474.5 L 1080.5 474.5 Z M 1487.5 449.5 L 1510.5 449.5 L 1510.5 475.5 L 1487.5 475.5 Z M 1409.5 459.5 L 1448.5 459.5 L 1448.5 475.5 L 1409.5 475.5 Z M 1550.5 472.5 L 1572.5 472.5 L 1572.5 475.5 L 1550.5 475.5 Z M 1683.5 462.5 L 1705.5 462.5 L 1705.5 482.5 L 1683.5 482.5 Z M 1347.5 468.5 L 1369.5 468.5 L 1369.5 482.5 L 1347.5 482.5 Z M 1612.5 472.5 L 1643.5 472.5 L 1643.5 482.5 L 1612.5 482.5 Z M 1142.5 473.5 L 1177.5 473.5 L 1177.5 487.5 L 1142.5 487.5 Z M 1080.5 474.5 L 1102.5 474.5 L 1102.5 487.5 L 1080.5 487.5 Z M 950.5 474.5 L 971.5 474.5 L 971.5 487.5 L 950.5 487.5 Z M 1409.5 475.5 L 1448.5 475.5 L 1448.5 489.5 L 1409.5 489.5 Z M 1550.5 475.5 L 1572.5 475.5 L 1572.5 489.5 L 1550.5 489.5 Z M 1487.5 475.5 L 1510.5 475.5 L 1510.5 489.5 L 1487.5 489.5 Z M 1409.5 489.5 L 1448.5 489.5 L 1448.5 492.5 L 1409.5 492.5 Z M 1080.5 487.5 L 1102.5 487.5 L 1102.5 492.5 L 1080.5 492.5 Z M 950.5 487.5 L 971.5 487.5 L 971.5 492.5 L 950.5 492.5 Z M 1347.5 482.5 L 1369.5 482.5 L 1369.5 492.5 L 1347.5 492.5 Z M 1273.5 459.5 L 1308.5 459.5 L 1308.5 492.5 L 1273.5 492.5 Z M 1217.5 459.5 L 1234.5 459.5 L 1234.5 492.5 L 1217.5 492.5 Z M 1011.5 432.5 L 1040.5 432.5 L 1040.5 492.5 L 1011.5 492.5 Z M 1487.5 489.5 L 1510.5 489.5 L 1510.5 492.5 L 1487.5 492.5 Z M 1142.5 487.5 L 1177.5 487.5 L 1177.5 492.5 L 1142.5 492.5 Z M 1683.5 482.5 L 1705.5 482.5 L 1705.5 495.5 L 1683.5 495.5 Z M 1612.5 482.5 L 1643.5 482.5 L 1643.5 495.5 L 1612.5 495.5 Z M 1550.5 489.5 L 1572.5 489.5 L 1572.5 511.5 L 1550.5 511.5 Z M 1612.5 495.5 L 1643.5 495.5 L 1643.5 515.5 L 1612.5 515.5 Z M 1683.5 495.5 L 1705.5 495.5 L 1705.5 515.5 L 1683.5 515.5 Z M 1550.5 511.5 L 1572.5 511.5 L 1572.5 524.5 L 1550.5 524.5 Z M 1683.5 515.5 L 1705.5 515.5 L 1705.5 528.5 L 1683.5 528.5 Z M 1612.5 515.5 L 1643.5 515.5 L 1643.5 528.5 L 1612.5 528.5 Z M 1683.5 528.5 L 1705.5 528.5 L 1705.5 531.5 L 1683.5 531.5 Z M 1550.5 524.5 L 1572.5 524.5 L 1572.5 531.5 L 1550.5 531.5 Z M 1612.5 528.5 L 1643.5 528.5 L 1643.5 531.5 L 1612.5 531.5 Z M 200.5 699.5 L 1717.5 699.5 L 1717.5 713.5 L 200.5 713.5 Z M 200.5 699.5 "/>
 </clipPath>
-<image id="image470" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image498" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image470"/>
+  <use xlink:href="#image498"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1308.5 602.5 L 1347.5 602.5 L 1347.5 635.5 L 1308.5 635.5 Z M 1364.5 602.5 L 1403.5 602.5 L 1403.5 635.5 L 1364.5 635.5 Z M 1245.5 602.5 L 1285.5 602.5 L 1285.5 635.5 L 1245.5 635.5 Z M 1164.5 602.5 L 1203.5 602.5 L 1203.5 635.5 L 1164.5 635.5 Z M 959.5 602.5 L 999.5 602.5 L 999.5 635.5 L 959.5 635.5 Z M 1576.5 605.5 L 1615.5 605.5 L 1615.5 638.5 L 1576.5 638.5 Z M 679.5 623.5 L 718.5 623.5 L 718.5 656.5 L 679.5 656.5 Z M 451.5 623.5 L 490.5 623.5 L 490.5 656.5 L 451.5 656.5 Z M 797.5 623.5 L 836.5 623.5 L 836.5 656.5 L 797.5 656.5 Z M 277.5 623.5 L 316.5 623.5 L 316.5 656.5 L 277.5 656.5 Z M 741.5 623.5 L 780.5 623.5 L 780.5 656.5 L 741.5 656.5 Z M 512.5 623.5 L 552.5 623.5 L 552.5 656.5 L 512.5 656.5 Z M 853.5 623.5 L 892.5 623.5 L 892.5 656.5 L 853.5 656.5 Z M 333.5 623.5 L 372.5 623.5 L 372.5 656.5 L 333.5 656.5 Z M 394.5 623.5 L 434.5 623.5 L 434.5 656.5 L 394.5 656.5 Z M 574.5 623.5 L 613.5 623.5 L 613.5 656.5 L 574.5 656.5 Z M 1093.5 602.5 L 1132.5 602.5 L 1132.5 661.5 L 1093.5 661.5 Z M 1031.5 602.5 L 1071.5 602.5 L 1071.5 661.5 L 1031.5 661.5 Z M 1469.5 629.5 L 1508.5 629.5 L 1508.5 662.5 L 1469.5 662.5 Z M 1645.5 605.5 L 1684.5 605.5 L 1684.5 664.5 L 1645.5 664.5 Z M 1645.5 605.5 "/>
 </clipPath>
-<image id="image471" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image499" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image471"/>
+  <use xlink:href="#image499"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 424.5 417.5 L 463.5 417.5 L 463.5 450.5 L 424.5 450.5 Z M 368.5 417.5 L 407.5 417.5 L 407.5 450.5 L 368.5 450.5 Z M 248.5 417.5 L 288.5 417.5 L 288.5 450.5 L 248.5 450.5 Z M 485.5 417.5 L 525.5 417.5 L 525.5 450.5 L 485.5 450.5 Z M 570.5 417.5 L 609.5 417.5 L 609.5 450.5 L 570.5 450.5 Z M 304.5 417.5 L 344.5 417.5 L 344.5 450.5 L 304.5 450.5 Z M 679.5 420.5 L 718.5 420.5 L 718.5 453.5 L 679.5 453.5 Z M 865.5 420.5 L 904.5 420.5 L 904.5 453.5 L 865.5 453.5 Z M 797.5 420.5 L 836.5 420.5 L 836.5 453.5 L 797.5 453.5 Z M 741.5 420.5 L 780.5 420.5 L 780.5 453.5 L 741.5 453.5 Z M 1448.5 432.5 L 1487.5 432.5 L 1487.5 492.5 L 1448.5 492.5 Z M 971.5 432.5 L 1011.5 432.5 L 1011.5 492.5 L 971.5 492.5 Z M 1234.5 459.5 L 1273.5 459.5 L 1273.5 492.5 L 1234.5 492.5 Z M 1177.5 459.5 L 1217.5 459.5 L 1217.5 492.5 L 1177.5 492.5 Z M 1369.5 459.5 L 1409.5 459.5 L 1409.5 492.5 L 1369.5 492.5 Z M 1308.5 459.5 L 1347.5 459.5 L 1347.5 492.5 L 1308.5 492.5 Z M 1040.5 413.5 L 1080.5 413.5 L 1080.5 492.5 L 1040.5 492.5 Z M 1102.5 413.5 L 1142.5 413.5 L 1142.5 492.5 L 1102.5 492.5 Z M 1572.5 472.5 L 1612.5 472.5 L 1612.5 531.5 L 1572.5 531.5 Z M 1643.5 413.5 L 1683.5 413.5 L 1683.5 531.5 L 1643.5 531.5 Z M 1643.5 413.5 "/>
 </clipPath>
-<image id="image472" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image500" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image472"/>
+  <use xlink:href="#image500"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 212.5 378.5 L 226.5 378.5 L 226.5 391.5 L 212.5 391.5 Z M 1691.5 378.5 L 1705.5 378.5 L 1705.5 391.5 L 1691.5 391.5 Z M 1653.5 378.5 L 1667.5 378.5 L 1667.5 391.5 L 1653.5 391.5 Z M 1616.5 378.5 L 1629.5 378.5 L 1629.5 391.5 L 1616.5 391.5 Z M 1578.5 378.5 L 1591.5 378.5 L 1591.5 391.5 L 1578.5 391.5 Z M 1540.5 378.5 L 1553.5 378.5 L 1553.5 391.5 L 1540.5 391.5 Z M 1502.5 378.5 L 1515.5 378.5 L 1515.5 391.5 L 1502.5 391.5 Z M 1464.5 378.5 L 1477.5 378.5 L 1477.5 391.5 L 1464.5 391.5 Z M 1426.5 378.5 L 1439.5 378.5 L 1439.5 391.5 L 1426.5 391.5 Z M 1388.5 378.5 L 1401.5 378.5 L 1401.5 391.5 L 1388.5 391.5 Z M 1350.5 378.5 L 1364.5 378.5 L 1364.5 391.5 L 1350.5 391.5 Z M 1312.5 378.5 L 1326.5 378.5 L 1326.5 391.5 L 1312.5 391.5 Z M 1274.5 378.5 L 1288.5 378.5 L 1288.5 391.5 L 1274.5 391.5 Z M 1236.5 378.5 L 1250.5 378.5 L 1250.5 391.5 L 1236.5 391.5 Z M 1198.5 378.5 L 1212.5 378.5 L 1212.5 391.5 L 1198.5 391.5 Z M 1160.5 378.5 L 1174.5 378.5 L 1174.5 391.5 L 1160.5 391.5 Z M 1123.5 378.5 L 1136.5 378.5 L 1136.5 391.5 L 1123.5 391.5 Z M 1085.5 378.5 L 1098.5 378.5 L 1098.5 391.5 L 1085.5 391.5 Z M 1047.5 378.5 L 1060.5 378.5 L 1060.5 391.5 L 1047.5 391.5 Z M 1009.5 378.5 L 1022.5 378.5 L 1022.5 391.5 L 1009.5 391.5 Z M 971.5 378.5 L 984.5 378.5 L 984.5 391.5 L 971.5 391.5 Z M 933.5 378.5 L 946.5 378.5 L 946.5 391.5 L 933.5 391.5 Z M 895.5 378.5 L 908.5 378.5 L 908.5 391.5 L 895.5 391.5 Z M 857.5 378.5 L 871.5 378.5 L 871.5 391.5 L 857.5 391.5 Z M 819.5 378.5 L 833.5 378.5 L 833.5 391.5 L 819.5 391.5 Z M 781.5 378.5 L 795.5 378.5 L 795.5 391.5 L 781.5 391.5 Z M 743.5 378.5 L 757.5 378.5 L 757.5 391.5 L 743.5 391.5 Z M 705.5 378.5 L 719.5 378.5 L 719.5 391.5 L 705.5 391.5 Z M 667.5 378.5 L 681.5 378.5 L 681.5 391.5 L 667.5 391.5 Z M 630.5 378.5 L 643.5 378.5 L 643.5 391.5 L 630.5 391.5 Z M 592.5 378.5 L 605.5 378.5 L 605.5 391.5 L 592.5 391.5 Z M 554.5 378.5 L 567.5 378.5 L 567.5 391.5 L 554.5 391.5 Z M 516.5 378.5 L 529.5 378.5 L 529.5 391.5 L 516.5 391.5 Z M 478.5 378.5 L 491.5 378.5 L 491.5 391.5 L 478.5 391.5 Z M 440.5 378.5 L 453.5 378.5 L 453.5 391.5 L 440.5 391.5 Z M 402.5 378.5 L 415.5 378.5 L 415.5 391.5 L 402.5 391.5 Z M 364.5 378.5 L 378.5 378.5 L 378.5 391.5 L 364.5 391.5 Z M 326.5 378.5 L 340.5 378.5 L 340.5 391.5 L 326.5 391.5 Z M 288.5 378.5 L 302.5 378.5 L 302.5 391.5 L 288.5 391.5 Z M 250.5 378.5 L 264.5 378.5 L 264.5 391.5 L 250.5 391.5 Z M 1018.5 415.5 L 1032.5 415.5 L 1032.5 417.5 L 1018.5 417.5 Z M 343.5 416.5 L 357.5 416.5 L 357.5 420.5 L 343.5 420.5 Z M 524.5 416.5 L 537.5 416.5 L 537.5 422.5 L 524.5 422.5 Z M 844.5 416.5 L 858.5 416.5 L 858.5 423.5 L 844.5 423.5 Z M 1288.5 416.5 L 1301.5 416.5 L 1301.5 427.5 L 1288.5 427.5 Z M 1288.5 427.5 L 1301.5 427.5 L 1301.5 429.5 L 1288.5 429.5 Z M 844.5 423.5 L 858.5 423.5 L 858.5 429.5 L 844.5 429.5 Z M 343.5 420.5 L 357.5 420.5 L 357.5 429.5 L 343.5 429.5 Z M 1018.5 417.5 L 1032.5 417.5 L 1032.5 429.5 L 1018.5 429.5 Z M 1630.5 416.5 L 1644.5 416.5 L 1644.5 429.5 L 1630.5 429.5 Z M 315.5 416.5 L 328.5 416.5 L 328.5 429.5 L 315.5 429.5 Z M 552.5 416.5 L 566.5 416.5 L 566.5 429.5 L 552.5 429.5 Z M 1259.5 416.5 L 1273.5 416.5 L 1273.5 429.5 L 1259.5 429.5 Z M 1231.5 416.5 L 1244.5 416.5 L 1244.5 429.5 L 1231.5 429.5 Z M 1407.5 416.5 L 1420.5 416.5 L 1420.5 429.5 L 1407.5 429.5 Z M 816.5 416.5 L 829.5 416.5 L 829.5 429.5 L 816.5 429.5 Z M 788.5 416.5 L 801.5 416.5 L 801.5 429.5 L 788.5 429.5 Z M 372.5 416.5 L 385.5 416.5 L 385.5 429.5 L 372.5 429.5 Z M 1659.5 416.5 L 1672.5 416.5 L 1672.5 429.5 L 1659.5 429.5 Z M 990.5 415.5 L 1003.5 415.5 L 1003.5 429.5 L 990.5 429.5 Z M 1464.5 416.5 L 1477.5 416.5 L 1477.5 429.5 L 1464.5 429.5 Z M 1435.5 416.5 L 1449.5 416.5 L 1449.5 429.5 L 1435.5 429.5 Z M 1047.5 415.5 L 1060.5 415.5 L 1060.5 429.5 L 1047.5 429.5 Z M 495.5 416.5 L 509.5 416.5 L 509.5 429.5 L 495.5 429.5 Z M 524.5 422.5 L 537.5 422.5 L 537.5 429.5 L 524.5 429.5 Z M 1602.5 416.5 L 1615.5 416.5 L 1615.5 429.5 L 1602.5 429.5 Z M 1312.5 509.5 L 1326.5 509.5 L 1326.5 513.5 L 1312.5 513.5 Z M 1312.5 513.5 L 1326.5 513.5 L 1326.5 523.5 L 1312.5 523.5 Z M 554.5 509.5 L 567.5 509.5 L 567.5 523.5 L 554.5 523.5 Z M 857.5 509.5 L 871.5 509.5 L 871.5 523.5 L 857.5 523.5 Z M 1008.5 662.5 L 1022.5 662.5 L 1022.5 675.5 L 1008.5 675.5 Z M 1659.5 662.5 L 1672.5 662.5 L 1672.5 675.5 L 1659.5 675.5 Z M 1630.5 662.5 L 1644.5 662.5 L 1644.5 675.5 L 1630.5 675.5 Z M 1602.5 662.5 L 1615.5 662.5 L 1615.5 675.5 L 1602.5 675.5 Z M 1517.5 662.5 L 1530.5 662.5 L 1530.5 675.5 L 1517.5 675.5 Z M 1488.5 662.5 L 1502.5 662.5 L 1502.5 675.5 L 1488.5 675.5 Z M 559.5 662.5 L 573.5 662.5 L 573.5 675.5 L 559.5 675.5 Z M 531.5 662.5 L 544.5 662.5 L 544.5 675.5 L 531.5 675.5 Z M 844.5 662.5 L 857.5 662.5 L 857.5 675.5 L 844.5 675.5 Z M 980.5 662.5 L 993.5 662.5 L 993.5 675.5 L 980.5 675.5 Z M 588.5 662.5 L 601.5 662.5 L 601.5 675.5 L 588.5 675.5 Z M 872.5 662.5 L 886.5 662.5 L 886.5 675.5 L 872.5 675.5 Z M 1236.5 662.5 L 1250.5 662.5 L 1250.5 675.5 L 1236.5 675.5 Z M 1293.5 662.5 L 1307.5 662.5 L 1307.5 675.5 L 1293.5 675.5 Z M 1265.5 662.5 L 1278.5 662.5 L 1278.5 675.5 L 1265.5 675.5 Z M 901.5 662.5 L 914.5 662.5 L 914.5 675.5 L 901.5 675.5 Z M 212.5 699.5 L 226.5 699.5 L 226.5 713.5 L 212.5 713.5 Z M 1691.5 699.5 L 1705.5 699.5 L 1705.5 713.5 L 1691.5 713.5 Z M 1653.5 699.5 L 1667.5 699.5 L 1667.5 713.5 L 1653.5 713.5 Z M 1616.5 699.5 L 1629.5 699.5 L 1629.5 713.5 L 1616.5 713.5 Z M 1578.5 699.5 L 1591.5 699.5 L 1591.5 713.5 L 1578.5 713.5 Z M 1540.5 699.5 L 1553.5 699.5 L 1553.5 713.5 L 1540.5 713.5 Z M 1502.5 699.5 L 1515.5 699.5 L 1515.5 713.5 L 1502.5 713.5 Z M 1464.5 699.5 L 1477.5 699.5 L 1477.5 713.5 L 1464.5 713.5 Z M 1426.5 699.5 L 1439.5 699.5 L 1439.5 713.5 L 1426.5 713.5 Z M 1388.5 699.5 L 1401.5 699.5 L 1401.5 713.5 L 1388.5 713.5 Z M 1350.5 699.5 L 1364.5 699.5 L 1364.5 713.5 L 1350.5 713.5 Z M 1312.5 699.5 L 1326.5 699.5 L 1326.5 713.5 L 1312.5 713.5 Z M 1274.5 699.5 L 1288.5 699.5 L 1288.5 713.5 L 1274.5 713.5 Z M 1236.5 699.5 L 1250.5 699.5 L 1250.5 713.5 L 1236.5 713.5 Z M 1198.5 699.5 L 1212.5 699.5 L 1212.5 713.5 L 1198.5 713.5 Z M 1160.5 699.5 L 1174.5 699.5 L 1174.5 713.5 L 1160.5 713.5 Z M 1123.5 699.5 L 1136.5 699.5 L 1136.5 713.5 L 1123.5 713.5 Z M 1085.5 699.5 L 1098.5 699.5 L 1098.5 713.5 L 1085.5 713.5 Z M 1047.5 699.5 L 1060.5 699.5 L 1060.5 713.5 L 1047.5 713.5 Z M 1009.5 699.5 L 1022.5 699.5 L 1022.5 713.5 L 1009.5 713.5 Z M 971.5 699.5 L 984.5 699.5 L 984.5 713.5 L 971.5 713.5 Z M 933.5 699.5 L 946.5 699.5 L 946.5 713.5 L 933.5 713.5 Z M 895.5 699.5 L 908.5 699.5 L 908.5 713.5 L 895.5 713.5 Z M 857.5 699.5 L 871.5 699.5 L 871.5 713.5 L 857.5 713.5 Z M 819.5 699.5 L 833.5 699.5 L 833.5 713.5 L 819.5 713.5 Z M 781.5 699.5 L 795.5 699.5 L 795.5 713.5 L 781.5 713.5 Z M 743.5 699.5 L 757.5 699.5 L 757.5 713.5 L 743.5 713.5 Z M 705.5 699.5 L 719.5 699.5 L 719.5 713.5 L 705.5 713.5 Z M 667.5 699.5 L 681.5 699.5 L 681.5 713.5 L 667.5 713.5 Z M 630.5 699.5 L 643.5 699.5 L 643.5 713.5 L 630.5 713.5 Z M 592.5 699.5 L 605.5 699.5 L 605.5 713.5 L 592.5 713.5 Z M 554.5 699.5 L 567.5 699.5 L 567.5 713.5 L 554.5 713.5 Z M 516.5 699.5 L 529.5 699.5 L 529.5 713.5 L 516.5 713.5 Z M 478.5 699.5 L 491.5 699.5 L 491.5 713.5 L 478.5 713.5 Z M 440.5 699.5 L 453.5 699.5 L 453.5 713.5 L 440.5 713.5 Z M 402.5 699.5 L 415.5 699.5 L 415.5 713.5 L 402.5 713.5 Z M 364.5 699.5 L 378.5 699.5 L 378.5 713.5 L 364.5 713.5 Z M 326.5 699.5 L 340.5 699.5 L 340.5 713.5 L 326.5 713.5 Z M 288.5 699.5 L 302.5 699.5 L 302.5 713.5 L 288.5 713.5 Z M 250.5 699.5 L 264.5 699.5 L 264.5 713.5 L 250.5 713.5 Z M 250.5 699.5 "/>
 </clipPath>
-<image id="image473" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image501" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image473"/>
+  <use xlink:href="#image501"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface464">
+<g id="surface492">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -267,6 +267,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 572.640625 520.882812 L 572.59375 521.601562 L 572.480469 522.25 L 572.28125 522.859375 L 572.011719 523.394531 L 571.652344 523.914062 L 571.226562 524.359375 L 570.753906 524.742188 L 570.261719 525.035156 L 569.699219 525.257812 L 569.117188 525.4375 L 568.488281 525.527344 L 567.8125 525.550781 L 560.429688 525.550781 L 560.429688 509.191406 L 567.074219 509.191406 L 568.039062 509.257812 L 568.890625 509.414062 L 569.652344 509.683594 L 570.304688 510.066406 L 570.867188 510.558594 L 571.316406 511.167969 L 571.496094 511.503906 L 571.652344 511.863281 L 571.765625 512.199219 L 571.851562 512.578125 L 571.898438 512.960938 L 571.921875 513.34375 L 571.851562 514.152344 L 571.652344 514.847656 L 571.335938 515.496094 L 570.886719 516.035156 L 570.328125 516.53125 L 569.652344 516.910156 L 570.304688 517.203125 L 570.867188 517.515625 L 571.359375 517.875 L 571.765625 518.28125 L 572.078125 518.707031 L 572.324219 519.15625 L 572.414062 519.425781 L 572.480469 519.695312 L 572.550781 519.960938 L 572.59375 520.277344 L 572.617188 520.570312 Z M 569.832031 513.632812 L 569.765625 512.960938 L 569.566406 512.402344 L 569.25 511.90625 L 568.800781 511.546875 L 568.242188 511.277344 L 567.542969 511.097656 L 567.386719 511.097656 L 567.230469 511.078125 L 567.074219 511.054688 L 566.714844 511.054688 L 566.558594 511.03125 L 562.519531 511.03125 L 562.519531 516.238281 L 566.558594 516.238281 L 567.386719 516.191406 L 568.105469 516.058594 L 568.710938 515.8125 L 569.160156 515.476562 L 569.519531 515.027344 L 569.742188 514.488281 L 569.765625 514.375 L 569.789062 514.242188 L 569.8125 514.105469 L 569.8125 513.792969 Z M 567.613281 523.710938 L 568.242188 523.6875 L 568.800781 523.554688 L 569.296875 523.328125 L 569.699219 523.039062 L 570.035156 522.65625 L 570.304688 522.183594 L 570.371094 522.003906 L 570.417969 521.804688 L 570.484375 521.578125 L 570.507812 521.375 L 570.53125 521.152344 L 570.550781 520.90625 L 570.507812 520.410156 L 570.417969 519.941406 L 570.261719 519.535156 L 570.035156 519.15625 L 569.742188 518.839844 L 569.40625 518.550781 L 569.160156 518.414062 L 568.890625 518.300781 L 568.597656 518.210938 L 568.285156 518.144531 L 567.949219 518.101562 L 567.613281 518.078125 L 562.519531 518.078125 L 562.519531 523.710938 Z M 567.613281 523.710938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 516 570 L 529 570 M 516 556 L 529 556 M 516 556 L 516 570 M 529 556 L 529 570 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 516 570 L 529 570 M 516 556 L 529 556 M 529 570 L 529 556 M 516 570 L 516 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 368 L 200 377 M 195 373 L 204 373 M 199 374 L 201 374 M 199 372 L 201 372 M 199 372 L 199 374 M 201 372 L 201 374 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.svg b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.svg
index 219260a..713d7cc 100644
--- a/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.svg
+++ b/cells/sdfsbp/sky130_fd_sc_hvl__sdfsbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 360.5 L 1743.5 360.5 L 1743.5 556.5 L 174.5 556.5 Z M 174.5 360.5 "/>
 </clipPath>
-<image id="image634" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image662" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image634"/>
+  <use xlink:href="#image662"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 199.5 385.5 L 1718.5 385.5 L 1718.5 398.5 L 199.5 398.5 Z M 199.5 385.5 "/>
 </clipPath>
-<image id="image635" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image663" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image635"/>
+  <use xlink:href="#image663"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 199.5 385.5 L 1718.5 385.5 L 1718.5 398.5 L 199.5 398.5 Z M 1559.5 601.5 L 1707.5 601.5 L 1707.5 611.5 L 1559.5 611.5 Z M 1386.5 601.5 L 1534.5 601.5 L 1534.5 611.5 L 1386.5 611.5 Z M 1386.5 611.5 L 1534.5 611.5 L 1534.5 624.5 L 1386.5 624.5 Z M 1559.5 611.5 L 1707.5 611.5 L 1707.5 624.5 L 1559.5 624.5 Z M 1043.5 601.5 L 1351.5 601.5 L 1351.5 626.5 L 1043.5 626.5 Z M 710.5 621.5 L 901.5 621.5 L 901.5 629.5 L 710.5 629.5 Z M 610.5 623.5 L 687.5 623.5 L 687.5 632.5 L 610.5 632.5 Z M 1386.5 624.5 L 1534.5 624.5 L 1534.5 633.5 L 1386.5 633.5 Z M 1559.5 624.5 L 1707.5 624.5 L 1707.5 633.5 L 1559.5 633.5 Z M 924.5 626.5 L 1351.5 626.5 L 1351.5 633.5 L 924.5 633.5 Z M 924.5 633.5 L 1176.5 633.5 L 1176.5 636.5 L 924.5 636.5 Z M 212.5 626.5 L 587.5 626.5 L 587.5 636.5 L 212.5 636.5 Z M 1453.5 633.5 L 1534.5 633.5 L 1534.5 642.5 L 1453.5 642.5 Z M 710.5 629.5 L 901.5 629.5 L 901.5 642.5 L 710.5 642.5 Z M 1626.5 633.5 L 1707.5 633.5 L 1707.5 642.5 L 1626.5 642.5 Z M 610.5 632.5 L 687.5 632.5 L 687.5 645.5 L 610.5 645.5 Z M 212.5 636.5 L 587.5 636.5 L 587.5 648.5 L 212.5 648.5 Z M 924.5 636.5 L 1176.5 636.5 L 1176.5 648.5 L 924.5 648.5 Z M 710.5 642.5 L 901.5 642.5 L 901.5 653.5 L 710.5 653.5 Z M 610.5 645.5 L 687.5 645.5 L 687.5 654.5 L 610.5 654.5 Z M 1626.5 642.5 L 1707.5 642.5 L 1707.5 655.5 L 1626.5 655.5 Z M 1453.5 642.5 L 1534.5 642.5 L 1534.5 655.5 L 1453.5 655.5 Z M 924.5 648.5 L 1176.5 648.5 L 1176.5 658.5 L 924.5 658.5 Z M 212.5 648.5 L 587.5 648.5 L 587.5 658.5 L 212.5 658.5 Z M 1626.5 655.5 L 1707.5 655.5 L 1707.5 658.5 L 1626.5 658.5 Z M 1453.5 655.5 L 1534.5 655.5 L 1534.5 658.5 L 1453.5 658.5 Z M 1453.5 655.5 "/>
 </clipPath>
-<image id="image636" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image664" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image636"/>
+  <use xlink:href="#image664"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 199.5 692.5 L 1718.5 692.5 L 1718.5 705.5 L 199.5 705.5 Z M 199.5 692.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image635"/>
+  <use xlink:href="#image663"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1141.5 418.5 L 1165.5 418.5 L 1165.5 421.5 L 1141.5 421.5 Z M 1459.5 418.5 L 1479.5 418.5 L 1479.5 423.5 L 1459.5 423.5 Z M 1516.5 418.5 L 1536.5 418.5 L 1536.5 423.5 L 1516.5 423.5 Z M 1029.5 418.5 L 1050.5 418.5 L 1050.5 427.5 L 1029.5 427.5 Z M 506.5 427.5 L 527.5 427.5 L 527.5 430.5 L 506.5 430.5 Z M 1141.5 421.5 L 1165.5 421.5 L 1165.5 434.5 L 1141.5 434.5 Z M 1516.5 423.5 L 1536.5 423.5 L 1536.5 436.5 L 1516.5 436.5 Z M 1459.5 423.5 L 1479.5 423.5 L 1479.5 436.5 L 1459.5 436.5 Z M 565.5 427.5 L 587.5 427.5 L 587.5 438.5 L 565.5 438.5 Z M 1029.5 427.5 L 1050.5 427.5 L 1050.5 440.5 L 1029.5 440.5 Z M 506.5 430.5 L 527.5 430.5 L 527.5 443.5 L 506.5 443.5 Z M 1686.5 442.5 L 1707.5 442.5 L 1707.5 445.5 L 1686.5 445.5 Z M 1626.5 442.5 L 1648.5 442.5 L 1648.5 445.5 L 1626.5 445.5 Z M 1141.5 434.5 L 1165.5 434.5 L 1165.5 449.5 L 1141.5 449.5 Z M 565.5 438.5 L 587.5 438.5 L 587.5 451.5 L 565.5 451.5 Z M 506.5 443.5 L 527.5 443.5 L 527.5 452.5 L 506.5 452.5 Z M 1459.5 436.5 L 1479.5 436.5 L 1479.5 453.5 L 1459.5 453.5 Z M 1516.5 436.5 L 1536.5 436.5 L 1536.5 453.5 L 1516.5 453.5 Z M 1029.5 440.5 L 1050.5 440.5 L 1050.5 457.5 L 1029.5 457.5 Z M 1626.5 445.5 L 1648.5 445.5 L 1648.5 458.5 L 1626.5 458.5 Z M 1686.5 445.5 L 1707.5 445.5 L 1707.5 458.5 L 1686.5 458.5 Z M 897.5 457.5 L 924.5 457.5 L 924.5 461.5 L 897.5 461.5 Z M 624.5 458.5 L 645.5 458.5 L 645.5 461.5 L 624.5 461.5 Z M 1626.5 458.5 L 1648.5 458.5 L 1648.5 461.5 L 1626.5 461.5 Z M 1141.5 449.5 L 1165.5 449.5 L 1165.5 462.5 L 1141.5 462.5 Z M 210.5 452.5 L 232.5 452.5 L 232.5 462.5 L 210.5 462.5 Z M 269.5 452.5 L 290.5 452.5 L 290.5 462.5 L 269.5 462.5 Z M 382.5 452.5 L 403.5 452.5 L 403.5 462.5 L 382.5 462.5 Z M 683.5 458.5 L 703.5 458.5 L 703.5 462.5 L 683.5 462.5 Z M 1559.5 461.5 L 1580.5 461.5 L 1580.5 464.5 L 1559.5 464.5 Z M 1459.5 453.5 L 1479.5 453.5 L 1479.5 466.5 L 1459.5 466.5 Z M 1516.5 453.5 L 1536.5 453.5 L 1536.5 466.5 L 1516.5 466.5 Z M 725.5 457.5 L 747.5 457.5 L 747.5 466.5 L 725.5 466.5 Z M 784.5 457.5 L 806.5 457.5 L 806.5 466.5 L 784.5 466.5 Z M 1265.5 462.5 L 1291.5 462.5 L 1291.5 467.5 L 1265.5 467.5 Z M 565.5 451.5 L 587.5 451.5 L 587.5 468.5 L 565.5 468.5 Z M 494.5 452.5 L 527.5 452.5 L 527.5 468.5 L 494.5 468.5 Z M 1329.5 462.5 L 1351.5 462.5 L 1351.5 471.5 L 1329.5 471.5 Z M 962.5 457.5 L 983.5 457.5 L 983.5 473.5 L 962.5 473.5 Z M 269.5 462.5 L 290.5 462.5 L 290.5 474.5 L 269.5 474.5 Z M 382.5 462.5 L 403.5 462.5 L 403.5 474.5 L 382.5 474.5 Z M 210.5 462.5 L 232.5 462.5 L 232.5 474.5 L 210.5 474.5 Z M 1618.5 461.5 L 1648.5 461.5 L 1648.5 474.5 L 1618.5 474.5 Z M 624.5 461.5 L 645.5 461.5 L 645.5 474.5 L 624.5 474.5 Z M 1686.5 458.5 L 1707.5 458.5 L 1707.5 474.5 L 1686.5 474.5 Z M 897.5 461.5 L 924.5 461.5 L 924.5 474.5 L 897.5 474.5 Z M 683.5 462.5 L 703.5 462.5 L 703.5 475.5 L 683.5 475.5 Z M 1559.5 464.5 L 1580.5 464.5 L 1580.5 477.5 L 1559.5 477.5 Z M 1141.5 462.5 L 1174.5 462.5 L 1174.5 478.5 L 1141.5 478.5 Z M 725.5 466.5 L 747.5 466.5 L 747.5 479.5 L 725.5 479.5 Z M 784.5 466.5 L 806.5 466.5 L 806.5 479.5 L 784.5 479.5 Z M 1265.5 467.5 L 1291.5 467.5 L 1291.5 480.5 L 1265.5 480.5 Z M 565.5 468.5 L 587.5 468.5 L 587.5 481.5 L 565.5 481.5 Z M 494.5 468.5 L 527.5 468.5 L 527.5 481.5 L 494.5 481.5 Z M 382.5 474.5 L 403.5 474.5 L 403.5 484.5 L 382.5 484.5 Z M 1459.5 466.5 L 1479.5 466.5 L 1479.5 484.5 L 1459.5 484.5 Z M 494.5 481.5 L 527.5 481.5 L 527.5 484.5 L 494.5 484.5 Z M 328.5 452.5 L 344.5 452.5 L 344.5 484.5 L 328.5 484.5 Z M 565.5 481.5 L 587.5 481.5 L 587.5 484.5 L 565.5 484.5 Z M 210.5 474.5 L 232.5 474.5 L 232.5 484.5 L 210.5 484.5 Z M 1516.5 466.5 L 1536.5 466.5 L 1536.5 484.5 L 1516.5 484.5 Z M 269.5 474.5 L 290.5 474.5 L 290.5 484.5 L 269.5 484.5 Z M 1329.5 471.5 L 1351.5 471.5 L 1351.5 484.5 L 1329.5 484.5 Z M 440.5 452.5 L 456.5 452.5 L 456.5 484.5 L 440.5 484.5 Z M 1686.5 474.5 L 1707.5 474.5 L 1707.5 486.5 L 1686.5 486.5 Z M 1618.5 474.5 L 1648.5 474.5 L 1648.5 486.5 L 1618.5 486.5 Z M 962.5 473.5 L 983.5 473.5 L 983.5 486.5 L 962.5 486.5 Z M 843.5 457.5 L 859.5 457.5 L 859.5 489.5 L 843.5 489.5 Z M 897.5 474.5 L 924.5 474.5 L 924.5 489.5 L 897.5 489.5 Z M 962.5 486.5 L 983.5 486.5 L 983.5 489.5 L 962.5 489.5 Z M 784.5 479.5 L 806.5 479.5 L 806.5 489.5 L 784.5 489.5 Z M 725.5 479.5 L 747.5 479.5 L 747.5 489.5 L 725.5 489.5 Z M 1020.5 457.5 L 1050.5 457.5 L 1050.5 489.5 L 1020.5 489.5 Z M 1141.5 478.5 L 1174.5 478.5 L 1174.5 491.5 L 1141.5 491.5 Z M 1211.5 462.5 L 1227.5 462.5 L 1227.5 494.5 L 1211.5 494.5 Z M 1088.5 418.5 L 1104.5 418.5 L 1104.5 494.5 L 1088.5 494.5 Z M 1329.5 484.5 L 1351.5 484.5 L 1351.5 494.5 L 1329.5 494.5 Z M 1141.5 491.5 L 1174.5 491.5 L 1174.5 494.5 L 1141.5 494.5 Z M 1265.5 480.5 L 1291.5 480.5 L 1291.5 494.5 L 1265.5 494.5 Z M 1029.5 489.5 L 1050.5 489.5 L 1050.5 494.5 L 1029.5 494.5 Z M 683.5 475.5 L 703.5 475.5 L 703.5 497.5 L 683.5 497.5 Z M 1516.5 484.5 L 1536.5 484.5 L 1536.5 497.5 L 1516.5 497.5 Z M 1459.5 484.5 L 1479.5 484.5 L 1479.5 497.5 L 1459.5 497.5 Z M 624.5 474.5 L 645.5 474.5 L 645.5 498.5 L 624.5 498.5 Z M 1459.5 497.5 L 1479.5 497.5 L 1479.5 500.5 L 1459.5 500.5 Z M 1559.5 477.5 L 1580.5 477.5 L 1580.5 502.5 L 1559.5 502.5 Z M 1618.5 486.5 L 1648.5 486.5 L 1648.5 502.5 L 1618.5 502.5 Z M 1686.5 486.5 L 1707.5 486.5 L 1707.5 502.5 L 1686.5 502.5 Z M 1383.5 500.5 L 1413.5 500.5 L 1413.5 509.5 L 1383.5 509.5 Z M 683.5 497.5 L 703.5 497.5 L 703.5 510.5 L 683.5 510.5 Z M 624.5 498.5 L 645.5 498.5 L 645.5 511.5 L 624.5 511.5 Z M 624.5 511.5 L 645.5 511.5 L 645.5 514.5 L 624.5 514.5 Z M 1516.5 497.5 L 1536.5 497.5 L 1536.5 514.5 L 1516.5 514.5 Z M 1450.5 500.5 L 1479.5 500.5 L 1479.5 514.5 L 1450.5 514.5 Z M 683.5 510.5 L 703.5 510.5 L 703.5 514.5 L 683.5 514.5 Z M 1559.5 502.5 L 1580.5 502.5 L 1580.5 515.5 L 1559.5 515.5 Z M 1686.5 502.5 L 1707.5 502.5 L 1707.5 515.5 L 1686.5 515.5 Z M 1618.5 502.5 L 1648.5 502.5 L 1648.5 515.5 L 1618.5 515.5 Z M 1686.5 515.5 L 1707.5 515.5 L 1707.5 518.5 L 1686.5 518.5 Z M 1559.5 515.5 L 1580.5 515.5 L 1580.5 518.5 L 1559.5 518.5 Z M 1618.5 515.5 L 1648.5 515.5 L 1648.5 518.5 L 1618.5 518.5 Z M 1383.5 509.5 L 1413.5 509.5 L 1413.5 522.5 L 1383.5 522.5 Z M 1450.5 514.5 L 1479.5 514.5 L 1479.5 527.5 L 1450.5 527.5 Z M 1516.5 514.5 L 1536.5 514.5 L 1536.5 527.5 L 1516.5 527.5 Z M 1383.5 522.5 L 1413.5 522.5 L 1413.5 531.5 L 1383.5 531.5 Z M 1516.5 527.5 L 1536.5 527.5 L 1536.5 531.5 L 1516.5 531.5 Z M 1450.5 527.5 L 1479.5 527.5 L 1479.5 531.5 L 1450.5 531.5 Z M 199.5 692.5 L 1718.5 692.5 L 1718.5 705.5 L 199.5 705.5 Z M 199.5 692.5 "/>
 </clipPath>
-<image id="image637" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image665" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image637"/>
+  <use xlink:href="#image665"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1291.5 601.5 L 1329.5 601.5 L 1329.5 633.5 L 1291.5 633.5 Z M 1407.5 601.5 L 1445.5 601.5 L 1445.5 633.5 L 1407.5 633.5 Z M 1580.5 601.5 L 1618.5 601.5 L 1618.5 633.5 L 1580.5 633.5 Z M 1238.5 601.5 L 1276.5 601.5 L 1276.5 633.5 L 1238.5 633.5 Z M 1184.5 601.5 L 1222.5 601.5 L 1222.5 633.5 L 1184.5 633.5 Z M 844.5 621.5 L 881.5 621.5 L 881.5 653.5 L 844.5 653.5 Z M 790.5 621.5 L 828.5 621.5 L 828.5 653.5 L 790.5 653.5 Z M 731.5 621.5 L 769.5 621.5 L 769.5 653.5 L 731.5 653.5 Z M 630.5 623.5 L 667.5 623.5 L 667.5 654.5 L 630.5 654.5 Z M 292.5 626.5 L 330.5 626.5 L 330.5 658.5 L 292.5 658.5 Z M 1117.5 601.5 L 1155.5 601.5 L 1155.5 658.5 L 1117.5 658.5 Z M 346.5 626.5 L 384.5 626.5 L 384.5 658.5 L 346.5 658.5 Z M 1648.5 601.5 L 1686.5 601.5 L 1686.5 658.5 L 1648.5 658.5 Z M 1063.5 601.5 L 1101.5 601.5 L 1101.5 658.5 L 1063.5 658.5 Z M 458.5 626.5 L 496.5 626.5 L 496.5 658.5 L 458.5 658.5 Z M 1475.5 601.5 L 1513.5 601.5 L 1513.5 658.5 L 1475.5 658.5 Z M 944.5 626.5 L 982.5 626.5 L 982.5 658.5 L 944.5 658.5 Z M 234.5 626.5 L 271.5 626.5 L 271.5 658.5 L 234.5 658.5 Z M 405.5 626.5 L 442.5 626.5 L 442.5 658.5 L 405.5 658.5 Z M 529.5 626.5 L 567.5 626.5 L 567.5 658.5 L 529.5 658.5 Z M 997.5 626.5 L 1035.5 626.5 L 1035.5 658.5 L 997.5 658.5 Z M 997.5 626.5 "/>
 </clipPath>
-<image id="image638" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image666" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image638"/>
+  <use xlink:href="#image666"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 527.5 427.5 L 565.5 427.5 L 565.5 484.5 L 527.5 484.5 Z M 290.5 452.5 L 328.5 452.5 L 328.5 484.5 L 290.5 484.5 Z M 456.5 452.5 L 494.5 452.5 L 494.5 484.5 L 456.5 484.5 Z M 232.5 452.5 L 269.5 452.5 L 269.5 484.5 L 232.5 484.5 Z M 403.5 452.5 L 440.5 452.5 L 440.5 484.5 L 403.5 484.5 Z M 344.5 452.5 L 382.5 452.5 L 382.5 484.5 L 344.5 484.5 Z M 806.5 457.5 L 843.5 457.5 L 843.5 489.5 L 806.5 489.5 Z M 924.5 457.5 L 962.5 457.5 L 962.5 489.5 L 924.5 489.5 Z M 983.5 457.5 L 1020.5 457.5 L 1020.5 489.5 L 983.5 489.5 Z M 859.5 457.5 L 897.5 457.5 L 897.5 489.5 L 859.5 489.5 Z M 747.5 457.5 L 784.5 457.5 L 784.5 489.5 L 747.5 489.5 Z M 1227.5 462.5 L 1265.5 462.5 L 1265.5 494.5 L 1227.5 494.5 Z M 1104.5 418.5 L 1141.5 418.5 L 1141.5 494.5 L 1104.5 494.5 Z M 1050.5 418.5 L 1088.5 418.5 L 1088.5 494.5 L 1050.5 494.5 Z M 1174.5 462.5 L 1211.5 462.5 L 1211.5 494.5 L 1174.5 494.5 Z M 1291.5 462.5 L 1329.5 462.5 L 1329.5 494.5 L 1291.5 494.5 Z M 645.5 458.5 L 683.5 458.5 L 683.5 514.5 L 645.5 514.5 Z M 1580.5 461.5 L 1618.5 461.5 L 1618.5 518.5 L 1580.5 518.5 Z M 1648.5 442.5 L 1686.5 442.5 L 1686.5 518.5 L 1648.5 518.5 Z M 1479.5 418.5 L 1516.5 418.5 L 1516.5 531.5 L 1479.5 531.5 Z M 1413.5 500.5 L 1450.5 500.5 L 1450.5 531.5 L 1413.5 531.5 Z M 1413.5 500.5 "/>
 </clipPath>
-<image id="image639" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image667" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image639"/>
+  <use xlink:href="#image667"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 211.5 385.5 L 223.5 385.5 L 223.5 398.5 L 211.5 398.5 Z M 1694.5 385.5 L 1707.5 385.5 L 1707.5 398.5 L 1694.5 398.5 Z M 1658.5 385.5 L 1670.5 385.5 L 1670.5 398.5 L 1658.5 398.5 Z M 1621.5 385.5 L 1634.5 385.5 L 1634.5 398.5 L 1621.5 398.5 Z M 1585.5 385.5 L 1598.5 385.5 L 1598.5 398.5 L 1585.5 398.5 Z M 1549.5 385.5 L 1562.5 385.5 L 1562.5 398.5 L 1549.5 398.5 Z M 1513.5 385.5 L 1526.5 385.5 L 1526.5 398.5 L 1513.5 398.5 Z M 1477.5 385.5 L 1490.5 385.5 L 1490.5 398.5 L 1477.5 398.5 Z M 1441.5 385.5 L 1453.5 385.5 L 1453.5 398.5 L 1441.5 398.5 Z M 1404.5 385.5 L 1417.5 385.5 L 1417.5 398.5 L 1404.5 398.5 Z M 1368.5 385.5 L 1381.5 385.5 L 1381.5 398.5 L 1368.5 398.5 Z M 1332.5 385.5 L 1345.5 385.5 L 1345.5 398.5 L 1332.5 398.5 Z M 1296.5 385.5 L 1309.5 385.5 L 1309.5 398.5 L 1296.5 398.5 Z M 1260.5 385.5 L 1272.5 385.5 L 1272.5 398.5 L 1260.5 398.5 Z M 1224.5 385.5 L 1236.5 385.5 L 1236.5 398.5 L 1224.5 398.5 Z M 1187.5 385.5 L 1200.5 385.5 L 1200.5 398.5 L 1187.5 398.5 Z M 1151.5 385.5 L 1164.5 385.5 L 1164.5 398.5 L 1151.5 398.5 Z M 1115.5 385.5 L 1128.5 385.5 L 1128.5 398.5 L 1115.5 398.5 Z M 1079.5 385.5 L 1092.5 385.5 L 1092.5 398.5 L 1079.5 398.5 Z M 1043.5 385.5 L 1055.5 385.5 L 1055.5 398.5 L 1043.5 398.5 Z M 1006.5 385.5 L 1019.5 385.5 L 1019.5 398.5 L 1006.5 398.5 Z M 970.5 385.5 L 983.5 385.5 L 983.5 398.5 L 970.5 398.5 Z M 934.5 385.5 L 947.5 385.5 L 947.5 398.5 L 934.5 398.5 Z M 898.5 385.5 L 911.5 385.5 L 911.5 398.5 L 898.5 398.5 Z M 862.5 385.5 L 875.5 385.5 L 875.5 398.5 L 862.5 398.5 Z M 826.5 385.5 L 838.5 385.5 L 838.5 398.5 L 826.5 398.5 Z M 789.5 385.5 L 802.5 385.5 L 802.5 398.5 L 789.5 398.5 Z M 753.5 385.5 L 766.5 385.5 L 766.5 398.5 L 753.5 398.5 Z M 717.5 385.5 L 730.5 385.5 L 730.5 398.5 L 717.5 398.5 Z M 681.5 385.5 L 694.5 385.5 L 694.5 398.5 L 681.5 398.5 Z M 645.5 385.5 L 657.5 385.5 L 657.5 398.5 L 645.5 398.5 Z M 608.5 385.5 L 621.5 385.5 L 621.5 398.5 L 608.5 398.5 Z M 572.5 385.5 L 585.5 385.5 L 585.5 398.5 L 572.5 398.5 Z M 536.5 385.5 L 549.5 385.5 L 549.5 398.5 L 536.5 398.5 Z M 500.5 385.5 L 513.5 385.5 L 513.5 398.5 L 500.5 398.5 Z M 464.5 385.5 L 477.5 385.5 L 477.5 398.5 L 464.5 398.5 Z M 428.5 385.5 L 440.5 385.5 L 440.5 398.5 L 428.5 398.5 Z M 391.5 385.5 L 404.5 385.5 L 404.5 398.5 L 391.5 398.5 Z M 355.5 385.5 L 368.5 385.5 L 368.5 398.5 L 355.5 398.5 Z M 319.5 385.5 L 332.5 385.5 L 332.5 398.5 L 319.5 398.5 Z M 283.5 385.5 L 296.5 385.5 L 296.5 398.5 L 283.5 398.5 Z M 247.5 385.5 L 260.5 385.5 L 260.5 398.5 L 247.5 398.5 Z M 1452.5 421.5 L 1465.5 421.5 L 1465.5 423.5 L 1452.5 423.5 Z M 1027.5 421.5 L 1040.5 421.5 L 1040.5 427.5 L 1027.5 427.5 Z M 511.5 421.5 L 523.5 421.5 L 523.5 430.5 L 511.5 430.5 Z M 511.5 430.5 L 523.5 430.5 L 523.5 434.5 L 511.5 434.5 Z M 1246.5 421.5 L 1259.5 421.5 L 1259.5 434.5 L 1246.5 434.5 Z M 1219.5 421.5 L 1231.5 421.5 L 1231.5 434.5 L 1219.5 434.5 Z M 1425.5 421.5 L 1438.5 421.5 L 1438.5 434.5 L 1425.5 434.5 Z M 1081.5 421.5 L 1094.5 421.5 L 1094.5 434.5 L 1081.5 434.5 Z M 1054.5 421.5 L 1067.5 421.5 L 1067.5 434.5 L 1054.5 434.5 Z M 1479.5 421.5 L 1492.5 421.5 L 1492.5 434.5 L 1479.5 434.5 Z M 1273.5 421.5 L 1286.5 421.5 L 1286.5 434.5 L 1273.5 434.5 Z M 1598.5 421.5 L 1611.5 421.5 L 1611.5 434.5 L 1598.5 434.5 Z M 905.5 421.5 L 918.5 421.5 L 918.5 434.5 L 905.5 434.5 Z M 878.5 421.5 L 890.5 421.5 L 890.5 434.5 L 878.5 434.5 Z M 850.5 421.5 L 863.5 421.5 L 863.5 434.5 L 850.5 434.5 Z M 628.5 421.5 L 641.5 421.5 L 641.5 434.5 L 628.5 434.5 Z M 483.5 421.5 L 496.5 421.5 L 496.5 434.5 L 483.5 434.5 Z M 1652.5 421.5 L 1665.5 421.5 L 1665.5 434.5 L 1652.5 434.5 Z M 1625.5 421.5 L 1638.5 421.5 L 1638.5 434.5 L 1625.5 434.5 Z M 249.5 421.5 L 262.5 421.5 L 262.5 434.5 L 249.5 434.5 Z M 304.5 421.5 L 316.5 421.5 L 316.5 434.5 L 304.5 434.5 Z M 276.5 421.5 L 289.5 421.5 L 289.5 434.5 L 276.5 434.5 Z M 456.5 421.5 L 469.5 421.5 L 469.5 434.5 L 456.5 434.5 Z M 1027.5 427.5 L 1040.5 427.5 L 1040.5 434.5 L 1027.5 434.5 Z M 1452.5 423.5 L 1465.5 423.5 L 1465.5 434.5 L 1452.5 434.5 Z M 633.5 656.5 L 646.5 656.5 L 646.5 668.5 L 633.5 668.5 Z M 1652.5 656.5 L 1665.5 656.5 L 1665.5 668.5 L 1652.5 668.5 Z M 1625.5 656.5 L 1638.5 656.5 L 1638.5 668.5 L 1625.5 668.5 Z M 1598.5 656.5 L 1611.5 656.5 L 1611.5 668.5 L 1598.5 668.5 Z M 1479.5 656.5 L 1492.5 656.5 L 1492.5 668.5 L 1479.5 668.5 Z M 1452.5 656.5 L 1465.5 656.5 L 1465.5 668.5 L 1452.5 668.5 Z M 1425.5 656.5 L 1438.5 656.5 L 1438.5 668.5 L 1425.5 668.5 Z M 1337.5 656.5 L 1350.5 656.5 L 1350.5 668.5 L 1337.5 668.5 Z M 1310.5 656.5 L 1323.5 656.5 L 1323.5 668.5 L 1310.5 668.5 Z M 1283.5 656.5 L 1295.5 656.5 L 1295.5 668.5 L 1283.5 668.5 Z M 1050.5 656.5 L 1063.5 656.5 L 1063.5 668.5 L 1050.5 668.5 Z M 1023.5 656.5 L 1036.5 656.5 L 1036.5 668.5 L 1023.5 668.5 Z M 996.5 656.5 L 1009.5 656.5 L 1009.5 668.5 L 996.5 668.5 Z M 889.5 656.5 L 902.5 656.5 L 902.5 668.5 L 889.5 668.5 Z M 862.5 656.5 L 875.5 656.5 L 875.5 668.5 L 862.5 668.5 Z M 835.5 656.5 L 848.5 656.5 L 848.5 668.5 L 835.5 668.5 Z M 278.5 656.5 L 291.5 656.5 L 291.5 668.5 L 278.5 668.5 Z M 251.5 656.5 L 264.5 656.5 L 264.5 668.5 L 251.5 668.5 Z M 545.5 656.5 L 558.5 656.5 L 558.5 668.5 L 545.5 668.5 Z M 518.5 656.5 L 530.5 656.5 L 530.5 668.5 L 518.5 668.5 Z M 491.5 656.5 L 503.5 656.5 L 503.5 668.5 L 491.5 668.5 Z M 306.5 656.5 L 318.5 656.5 L 318.5 668.5 L 306.5 668.5 Z M 606.5 656.5 L 619.5 656.5 L 619.5 668.5 L 606.5 668.5 Z M 211.5 692.5 L 223.5 692.5 L 223.5 705.5 L 211.5 705.5 Z M 1694.5 692.5 L 1707.5 692.5 L 1707.5 705.5 L 1694.5 705.5 Z M 1658.5 692.5 L 1670.5 692.5 L 1670.5 705.5 L 1658.5 705.5 Z M 1621.5 692.5 L 1634.5 692.5 L 1634.5 705.5 L 1621.5 705.5 Z M 1585.5 692.5 L 1598.5 692.5 L 1598.5 705.5 L 1585.5 705.5 Z M 1549.5 692.5 L 1562.5 692.5 L 1562.5 705.5 L 1549.5 705.5 Z M 1513.5 692.5 L 1526.5 692.5 L 1526.5 705.5 L 1513.5 705.5 Z M 1477.5 692.5 L 1490.5 692.5 L 1490.5 705.5 L 1477.5 705.5 Z M 1441.5 692.5 L 1453.5 692.5 L 1453.5 705.5 L 1441.5 705.5 Z M 1404.5 692.5 L 1417.5 692.5 L 1417.5 705.5 L 1404.5 705.5 Z M 1368.5 692.5 L 1381.5 692.5 L 1381.5 705.5 L 1368.5 705.5 Z M 1332.5 692.5 L 1345.5 692.5 L 1345.5 705.5 L 1332.5 705.5 Z M 1296.5 692.5 L 1309.5 692.5 L 1309.5 705.5 L 1296.5 705.5 Z M 1260.5 692.5 L 1272.5 692.5 L 1272.5 705.5 L 1260.5 705.5 Z M 1224.5 692.5 L 1236.5 692.5 L 1236.5 705.5 L 1224.5 705.5 Z M 1187.5 692.5 L 1200.5 692.5 L 1200.5 705.5 L 1187.5 705.5 Z M 1151.5 692.5 L 1164.5 692.5 L 1164.5 705.5 L 1151.5 705.5 Z M 1115.5 692.5 L 1128.5 692.5 L 1128.5 705.5 L 1115.5 705.5 Z M 1079.5 692.5 L 1092.5 692.5 L 1092.5 705.5 L 1079.5 705.5 Z M 1043.5 692.5 L 1055.5 692.5 L 1055.5 705.5 L 1043.5 705.5 Z M 1006.5 692.5 L 1019.5 692.5 L 1019.5 705.5 L 1006.5 705.5 Z M 970.5 692.5 L 983.5 692.5 L 983.5 705.5 L 970.5 705.5 Z M 934.5 692.5 L 947.5 692.5 L 947.5 705.5 L 934.5 705.5 Z M 898.5 692.5 L 911.5 692.5 L 911.5 705.5 L 898.5 705.5 Z M 862.5 692.5 L 875.5 692.5 L 875.5 705.5 L 862.5 705.5 Z M 826.5 692.5 L 838.5 692.5 L 838.5 705.5 L 826.5 705.5 Z M 789.5 692.5 L 802.5 692.5 L 802.5 705.5 L 789.5 705.5 Z M 753.5 692.5 L 766.5 692.5 L 766.5 705.5 L 753.5 705.5 Z M 717.5 692.5 L 730.5 692.5 L 730.5 705.5 L 717.5 705.5 Z M 681.5 692.5 L 694.5 692.5 L 694.5 705.5 L 681.5 705.5 Z M 645.5 692.5 L 657.5 692.5 L 657.5 705.5 L 645.5 705.5 Z M 608.5 692.5 L 621.5 692.5 L 621.5 705.5 L 608.5 705.5 Z M 572.5 692.5 L 585.5 692.5 L 585.5 705.5 L 572.5 705.5 Z M 536.5 692.5 L 549.5 692.5 L 549.5 705.5 L 536.5 705.5 Z M 500.5 692.5 L 513.5 692.5 L 513.5 705.5 L 500.5 705.5 Z M 464.5 692.5 L 477.5 692.5 L 477.5 705.5 L 464.5 705.5 Z M 428.5 692.5 L 440.5 692.5 L 440.5 705.5 L 428.5 705.5 Z M 391.5 692.5 L 404.5 692.5 L 404.5 705.5 L 391.5 705.5 Z M 355.5 692.5 L 368.5 692.5 L 368.5 705.5 L 355.5 705.5 Z M 319.5 692.5 L 332.5 692.5 L 332.5 705.5 L 319.5 705.5 Z M 283.5 692.5 L 296.5 692.5 L 296.5 705.5 L 283.5 705.5 Z M 247.5 692.5 L 260.5 692.5 L 260.5 705.5 L 247.5 705.5 Z M 247.5 692.5 "/>
 </clipPath>
-<image id="image640" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image668" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image640"/>
+  <use xlink:href="#image668"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface631">
+<g id="surface659">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -345,6 +345,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1158.515625 603.882812 L 1158.46875 604.601562 L 1158.355469 605.25 L 1158.15625 605.859375 L 1157.886719 606.394531 L 1157.527344 606.914062 L 1157.101562 607.359375 L 1156.628906 607.742188 L 1156.136719 608.035156 L 1155.574219 608.257812 L 1154.992188 608.4375 L 1154.363281 608.527344 L 1153.6875 608.550781 L 1146.304688 608.550781 L 1146.304688 592.191406 L 1152.949219 592.191406 L 1153.914062 592.257812 L 1154.765625 592.414062 L 1155.53125 592.683594 L 1156.179688 593.066406 L 1156.742188 593.558594 L 1157.191406 594.167969 L 1157.371094 594.503906 L 1157.527344 594.863281 L 1157.640625 595.199219 L 1157.730469 595.578125 L 1157.773438 595.960938 L 1157.796875 596.34375 L 1157.730469 597.152344 L 1157.527344 597.847656 L 1157.210938 598.496094 L 1156.765625 599.035156 L 1156.203125 599.53125 L 1155.53125 599.910156 L 1156.179688 600.203125 L 1156.742188 600.515625 L 1157.234375 600.875 L 1157.640625 601.28125 L 1157.953125 601.707031 L 1158.199219 602.15625 L 1158.289062 602.425781 L 1158.355469 602.695312 L 1158.425781 602.960938 L 1158.46875 603.277344 L 1158.492188 603.570312 Z M 1155.707031 596.632812 L 1155.640625 595.960938 L 1155.441406 595.402344 L 1155.125 594.90625 L 1154.675781 594.546875 L 1154.117188 594.277344 L 1153.421875 594.097656 L 1153.261719 594.097656 L 1153.105469 594.078125 L 1152.949219 594.054688 L 1152.589844 594.054688 L 1152.433594 594.03125 L 1148.394531 594.03125 L 1148.394531 599.238281 L 1152.433594 599.238281 L 1153.261719 599.191406 L 1153.980469 599.058594 L 1154.585938 598.8125 L 1155.035156 598.476562 L 1155.394531 598.027344 L 1155.621094 597.488281 L 1155.640625 597.375 L 1155.664062 597.242188 L 1155.6875 597.105469 L 1155.6875 596.792969 Z M 1153.488281 606.710938 L 1154.117188 606.6875 L 1154.675781 606.554688 L 1155.171875 606.328125 L 1155.574219 606.039062 L 1155.910156 605.65625 L 1156.179688 605.183594 L 1156.246094 605.003906 L 1156.292969 604.804688 L 1156.359375 604.578125 L 1156.382812 604.375 L 1156.40625 604.152344 L 1156.425781 603.90625 L 1156.382812 603.410156 L 1156.292969 602.941406 L 1156.136719 602.535156 L 1155.910156 602.15625 L 1155.621094 601.839844 L 1155.28125 601.550781 L 1155.035156 601.414062 L 1154.765625 601.300781 L 1154.476562 601.210938 L 1154.160156 601.144531 L 1153.824219 601.101562 L 1153.488281 601.078125 L 1148.394531 601.078125 L 1148.394531 606.710938 Z M 1153.488281 606.710938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1115 485 L 1128 485 M 1115 472 L 1128 472 M 1115 472 L 1115 485 M 1128 472 L 1128 485 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1115 485 L 1128 485 M 1115 472 L 1128 472 M 1128 485 L 1128 472 M 1115 485 L 1115 472 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 199 376 L 199 385 M 194 381 L 203 381 M 198 382 L 200 382 M 198 380 L 200 380 M 198 380 L 198 382 M 200 380 L 200 382 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.svg b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.svg
index 3c099c9..93b7eed 100644
--- a/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.svg
+++ b/cells/sdfstp/sky130_fd_sc_hvl__sdfstp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 347.5 L 1743.5 347.5 L 1743.5 558.5 L 174.5 558.5 Z M 174.5 347.5 "/>
 </clipPath>
-<image id="image523" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image550" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image523"/>
+  <use xlink:href="#image550"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 201.5 374.5 L 1717.5 374.5 L 1717.5 388.5 L 201.5 388.5 Z M 201.5 374.5 "/>
 </clipPath>
-<image id="image524" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image551" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image524"/>
+  <use xlink:href="#image551"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 201.5 374.5 L 1717.5 374.5 L 1717.5 388.5 L 201.5 388.5 Z M 1545.5 607.5 L 1705.5 607.5 L 1705.5 617.5 L 1545.5 617.5 Z M 1545.5 617.5 L 1705.5 617.5 L 1705.5 630.5 L 1545.5 630.5 Z M 1091.5 607.5 L 1497.5 607.5 L 1497.5 633.5 L 1091.5 633.5 Z M 625.5 627.5 L 709.5 627.5 L 709.5 637.5 L 625.5 637.5 Z M 1545.5 630.5 L 1705.5 630.5 L 1705.5 641.5 L 1545.5 641.5 Z M 733.5 631.5 L 939.5 631.5 L 939.5 641.5 L 733.5 641.5 Z M 963.5 633.5 L 1497.5 633.5 L 1497.5 641.5 L 963.5 641.5 Z M 213.5 633.5 L 601.5 633.5 L 601.5 643.5 L 213.5 643.5 Z M 963.5 641.5 L 1232.5 641.5 L 1232.5 643.5 L 963.5 643.5 Z M 1618.5 641.5 L 1705.5 641.5 L 1705.5 650.5 L 1618.5 650.5 Z M 625.5 637.5 L 709.5 637.5 L 709.5 651.5 L 625.5 651.5 Z M 733.5 641.5 L 939.5 641.5 L 939.5 654.5 L 733.5 654.5 Z M 213.5 643.5 L 601.5 643.5 L 601.5 657.5 L 213.5 657.5 Z M 963.5 643.5 L 1232.5 643.5 L 1232.5 657.5 L 963.5 657.5 Z M 625.5 651.5 L 709.5 651.5 L 709.5 661.5 L 625.5 661.5 Z M 1618.5 650.5 L 1705.5 650.5 L 1705.5 664.5 L 1618.5 664.5 Z M 733.5 654.5 L 939.5 654.5 L 939.5 665.5 L 733.5 665.5 Z M 963.5 657.5 L 1232.5 657.5 L 1232.5 667.5 L 963.5 667.5 Z M 1618.5 664.5 L 1705.5 664.5 L 1705.5 667.5 L 1618.5 667.5 Z M 213.5 657.5 L 601.5 657.5 L 601.5 667.5 L 213.5 667.5 Z M 213.5 657.5 "/>
 </clipPath>
-<image id="image525" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image552" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image525"/>
+  <use xlink:href="#image552"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 201.5 704.5 L 1717.5 704.5 L 1717.5 717.5 L 201.5 717.5 Z M 201.5 704.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image524"/>
+  <use xlink:href="#image551"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1204.5 410.5 L 1227.5 410.5 L 1227.5 413.5 L 1204.5 413.5 Z M 1083.5 410.5 L 1106.5 410.5 L 1106.5 422.5 L 1083.5 422.5 Z M 525.5 419.5 L 548.5 419.5 L 548.5 423.5 L 525.5 423.5 Z M 1204.5 413.5 L 1227.5 413.5 L 1227.5 427.5 L 1204.5 427.5 Z M 525.5 423.5 L 548.5 423.5 L 548.5 436.5 L 525.5 436.5 Z M 1083.5 422.5 L 1106.5 422.5 L 1106.5 436.5 L 1083.5 436.5 Z M 646.5 434.5 L 669.5 434.5 L 669.5 437.5 L 646.5 437.5 Z M 709.5 434.5 L 732.5 434.5 L 732.5 437.5 L 709.5 437.5 Z M 1505.5 428.5 L 1526.5 428.5 L 1526.5 438.5 L 1505.5 438.5 Z M 1443.5 428.5 L 1464.5 428.5 L 1464.5 438.5 L 1443.5 438.5 Z M 1621.5 437.5 L 1643.5 437.5 L 1643.5 442.5 L 1621.5 442.5 Z M 1683.5 437.5 L 1705.5 437.5 L 1705.5 442.5 L 1683.5 442.5 Z M 1204.5 427.5 L 1227.5 427.5 L 1227.5 443.5 L 1204.5 443.5 Z M 525.5 436.5 L 548.5 436.5 L 548.5 446.5 L 525.5 446.5 Z M 589.5 419.5 L 612.5 419.5 L 612.5 450.5 L 589.5 450.5 Z M 709.5 437.5 L 732.5 437.5 L 732.5 451.5 L 709.5 451.5 Z M 646.5 437.5 L 669.5 437.5 L 669.5 451.5 L 646.5 451.5 Z M 1443.5 438.5 L 1464.5 438.5 L 1464.5 452.5 L 1443.5 452.5 Z M 1505.5 438.5 L 1526.5 438.5 L 1526.5 452.5 L 1505.5 452.5 Z M 1621.5 442.5 L 1643.5 442.5 L 1643.5 456.5 L 1621.5 456.5 Z M 213.5 446.5 L 234.5 446.5 L 234.5 456.5 L 213.5 456.5 Z M 1683.5 442.5 L 1705.5 442.5 L 1705.5 456.5 L 1683.5 456.5 Z M 396.5 446.5 L 418.5 446.5 L 418.5 456.5 L 396.5 456.5 Z M 275.5 446.5 L 298.5 446.5 L 298.5 456.5 L 275.5 456.5 Z M 1204.5 443.5 L 1227.5 443.5 L 1227.5 457.5 L 1204.5 457.5 Z M 1621.5 456.5 L 1643.5 456.5 L 1643.5 457.5 L 1621.5 457.5 Z M 1083.5 436.5 L 1106.5 436.5 L 1106.5 457.5 L 1083.5 457.5 Z M 941.5 457.5 L 970.5 457.5 L 970.5 460.5 L 941.5 460.5 Z M 1443.5 452.5 L 1464.5 452.5 L 1464.5 462.5 L 1443.5 462.5 Z M 1550.5 457.5 L 1572.5 457.5 L 1572.5 462.5 L 1550.5 462.5 Z M 1505.5 452.5 L 1526.5 452.5 L 1526.5 462.5 L 1505.5 462.5 Z M 516.5 446.5 L 548.5 446.5 L 548.5 463.5 L 516.5 463.5 Z M 589.5 450.5 L 612.5 450.5 L 612.5 464.5 L 589.5 464.5 Z M 1334.5 457.5 L 1356.5 457.5 L 1356.5 467.5 L 1334.5 467.5 Z M 757.5 457.5 L 780.5 457.5 L 780.5 467.5 L 757.5 467.5 Z M 820.5 457.5 L 843.5 457.5 L 843.5 467.5 L 820.5 467.5 Z M 1397.5 457.5 L 1418.5 457.5 L 1418.5 467.5 L 1397.5 467.5 Z M 396.5 456.5 L 418.5 456.5 L 418.5 470.5 L 396.5 470.5 Z M 275.5 456.5 L 298.5 456.5 L 298.5 470.5 L 275.5 470.5 Z M 213.5 456.5 L 234.5 456.5 L 234.5 470.5 L 213.5 470.5 Z M 1683.5 456.5 L 1705.5 456.5 L 1705.5 471.5 L 1683.5 471.5 Z M 1612.5 457.5 L 1643.5 457.5 L 1643.5 471.5 L 1612.5 471.5 Z M 1204.5 457.5 L 1236.5 457.5 L 1236.5 474.5 L 1204.5 474.5 Z M 941.5 460.5 L 970.5 460.5 L 970.5 474.5 L 941.5 474.5 Z M 1011.5 457.5 L 1033.5 457.5 L 1033.5 474.5 L 1011.5 474.5 Z M 1550.5 462.5 L 1572.5 462.5 L 1572.5 476.5 L 1550.5 476.5 Z M 516.5 463.5 L 548.5 463.5 L 548.5 477.5 L 516.5 477.5 Z M 646.5 451.5 L 669.5 451.5 L 669.5 478.5 L 646.5 478.5 Z M 709.5 451.5 L 732.5 451.5 L 732.5 478.5 L 709.5 478.5 Z M 459.5 446.5 L 476.5 446.5 L 476.5 480.5 L 459.5 480.5 Z M 516.5 477.5 L 548.5 477.5 L 548.5 480.5 L 516.5 480.5 Z M 589.5 464.5 L 612.5 464.5 L 612.5 480.5 L 589.5 480.5 Z M 338.5 446.5 L 355.5 446.5 L 355.5 480.5 L 338.5 480.5 Z M 213.5 470.5 L 234.5 470.5 L 234.5 480.5 L 213.5 480.5 Z M 396.5 470.5 L 418.5 470.5 L 418.5 480.5 L 396.5 480.5 Z M 275.5 470.5 L 298.5 470.5 L 298.5 480.5 L 275.5 480.5 Z M 757.5 467.5 L 780.5 467.5 L 780.5 481.5 L 757.5 481.5 Z M 1334.5 467.5 L 1356.5 467.5 L 1356.5 481.5 L 1334.5 481.5 Z M 1397.5 467.5 L 1418.5 467.5 L 1418.5 481.5 L 1397.5 481.5 Z M 820.5 467.5 L 843.5 467.5 L 843.5 481.5 L 820.5 481.5 Z M 1683.5 471.5 L 1705.5 471.5 L 1705.5 485.5 L 1683.5 485.5 Z M 1612.5 471.5 L 1643.5 471.5 L 1643.5 485.5 L 1612.5 485.5 Z M 1204.5 474.5 L 1236.5 474.5 L 1236.5 487.5 L 1204.5 487.5 Z M 1011.5 474.5 L 1033.5 474.5 L 1033.5 487.5 L 1011.5 487.5 Z M 1011.5 487.5 L 1033.5 487.5 L 1033.5 491.5 L 1011.5 491.5 Z M 883.5 457.5 L 901.5 457.5 L 901.5 491.5 L 883.5 491.5 Z M 820.5 481.5 L 843.5 481.5 L 843.5 491.5 L 820.5 491.5 Z M 1276.5 457.5 L 1293.5 457.5 L 1293.5 491.5 L 1276.5 491.5 Z M 1397.5 481.5 L 1418.5 481.5 L 1418.5 491.5 L 1397.5 491.5 Z M 1334.5 481.5 L 1356.5 481.5 L 1356.5 491.5 L 1334.5 491.5 Z M 941.5 474.5 L 970.5 474.5 L 970.5 491.5 L 941.5 491.5 Z M 1146.5 410.5 L 1163.5 410.5 L 1163.5 491.5 L 1146.5 491.5 Z M 757.5 481.5 L 780.5 481.5 L 780.5 491.5 L 757.5 491.5 Z M 1204.5 487.5 L 1236.5 487.5 L 1236.5 491.5 L 1204.5 491.5 Z M 1074.5 457.5 L 1106.5 457.5 L 1106.5 491.5 L 1074.5 491.5 Z M 646.5 478.5 L 669.5 478.5 L 669.5 492.5 L 646.5 492.5 Z M 709.5 478.5 L 732.5 478.5 L 732.5 492.5 L 709.5 492.5 Z M 709.5 492.5 L 732.5 492.5 L 732.5 495.5 L 709.5 495.5 Z M 646.5 492.5 L 669.5 492.5 L 669.5 495.5 L 646.5 495.5 Z M 1550.5 476.5 L 1572.5 476.5 L 1572.5 500.5 L 1550.5 500.5 Z M 1683.5 485.5 L 1705.5 485.5 L 1705.5 500.5 L 1683.5 500.5 Z M 1612.5 485.5 L 1643.5 485.5 L 1643.5 500.5 L 1612.5 500.5 Z M 1683.5 500.5 L 1705.5 500.5 L 1705.5 513.5 L 1683.5 513.5 Z M 1550.5 500.5 L 1572.5 500.5 L 1572.5 513.5 L 1550.5 513.5 Z M 1612.5 500.5 L 1643.5 500.5 L 1643.5 513.5 L 1612.5 513.5 Z M 1550.5 513.5 L 1572.5 513.5 L 1572.5 518.5 L 1550.5 518.5 Z M 1612.5 513.5 L 1643.5 513.5 L 1643.5 518.5 L 1612.5 518.5 Z M 1683.5 513.5 L 1705.5 513.5 L 1705.5 518.5 L 1683.5 518.5 Z M 201.5 704.5 L 1717.5 704.5 L 1717.5 717.5 L 201.5 717.5 Z M 201.5 704.5 "/>
 </clipPath>
-<image id="image526" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image553" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image526"/>
+  <use xlink:href="#image553"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1299.5 607.5 L 1339.5 607.5 L 1339.5 641.5 L 1299.5 641.5 Z M 1356.5 607.5 L 1397.5 607.5 L 1397.5 641.5 L 1356.5 641.5 Z M 1569.5 607.5 L 1609.5 607.5 L 1609.5 641.5 L 1569.5 641.5 Z M 1433.5 607.5 L 1473.5 607.5 L 1473.5 641.5 L 1433.5 641.5 Z M 1241.5 607.5 L 1282.5 607.5 L 1282.5 641.5 L 1241.5 641.5 Z M 647.5 627.5 L 687.5 627.5 L 687.5 661.5 L 647.5 661.5 Z M 756.5 631.5 L 796.5 631.5 L 796.5 665.5 L 756.5 665.5 Z M 819.5 631.5 L 860.5 631.5 L 860.5 665.5 L 819.5 665.5 Z M 877.5 631.5 L 917.5 631.5 L 917.5 665.5 L 877.5 665.5 Z M 1170.5 607.5 L 1211.5 607.5 L 1211.5 667.5 L 1170.5 667.5 Z M 234.5 633.5 L 275.5 633.5 L 275.5 667.5 L 234.5 667.5 Z M 1641.5 607.5 L 1682.5 607.5 L 1682.5 667.5 L 1641.5 667.5 Z M 476.5 633.5 L 516.5 633.5 L 516.5 667.5 L 476.5 667.5 Z M 1113.5 607.5 L 1153.5 607.5 L 1153.5 667.5 L 1113.5 667.5 Z M 355.5 633.5 L 396.5 633.5 L 396.5 667.5 L 355.5 667.5 Z M 298.5 633.5 L 338.5 633.5 L 338.5 667.5 L 298.5 667.5 Z M 984.5 633.5 L 1025.5 633.5 L 1025.5 667.5 L 984.5 667.5 Z M 418.5 633.5 L 459.5 633.5 L 459.5 667.5 L 418.5 667.5 Z M 1042.5 633.5 L 1082.5 633.5 L 1082.5 667.5 L 1042.5 667.5 Z M 539.5 633.5 L 579.5 633.5 L 579.5 667.5 L 539.5 667.5 Z M 539.5 633.5 "/>
 </clipPath>
-<image id="image527" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image554" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image527"/>
+  <use xlink:href="#image554"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1464.5 428.5 L 1505.5 428.5 L 1505.5 462.5 L 1464.5 462.5 Z M 548.5 419.5 L 589.5 419.5 L 589.5 480.5 L 548.5 480.5 Z M 418.5 446.5 L 459.5 446.5 L 459.5 480.5 L 418.5 480.5 Z M 476.5 446.5 L 516.5 446.5 L 516.5 480.5 L 476.5 480.5 Z M 355.5 446.5 L 396.5 446.5 L 396.5 480.5 L 355.5 480.5 Z M 298.5 446.5 L 338.5 446.5 L 338.5 480.5 L 298.5 480.5 Z M 234.5 446.5 L 275.5 446.5 L 275.5 480.5 L 234.5 480.5 Z M 780.5 457.5 L 820.5 457.5 L 820.5 491.5 L 780.5 491.5 Z M 970.5 457.5 L 1011.5 457.5 L 1011.5 491.5 L 970.5 491.5 Z M 1106.5 410.5 L 1146.5 410.5 L 1146.5 491.5 L 1106.5 491.5 Z M 1293.5 457.5 L 1334.5 457.5 L 1334.5 491.5 L 1293.5 491.5 Z M 843.5 457.5 L 883.5 457.5 L 883.5 491.5 L 843.5 491.5 Z M 901.5 457.5 L 941.5 457.5 L 941.5 491.5 L 901.5 491.5 Z M 1356.5 457.5 L 1397.5 457.5 L 1397.5 491.5 L 1356.5 491.5 Z M 1163.5 410.5 L 1204.5 410.5 L 1204.5 491.5 L 1163.5 491.5 Z M 1033.5 457.5 L 1074.5 457.5 L 1074.5 491.5 L 1033.5 491.5 Z M 1236.5 457.5 L 1276.5 457.5 L 1276.5 491.5 L 1236.5 491.5 Z M 669.5 434.5 L 709.5 434.5 L 709.5 495.5 L 669.5 495.5 Z M 1643.5 437.5 L 1683.5 437.5 L 1683.5 518.5 L 1643.5 518.5 Z M 1572.5 457.5 L 1612.5 457.5 L 1612.5 518.5 L 1572.5 518.5 Z M 1572.5 457.5 "/>
 </clipPath>
-<image id="image528" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image555" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image528"/>
+  <use xlink:href="#image555"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 213.5 374.5 L 227.5 374.5 L 227.5 388.5 L 213.5 388.5 Z M 1690.5 374.5 L 1704.5 374.5 L 1704.5 388.5 L 1690.5 388.5 Z M 1652.5 374.5 L 1665.5 374.5 L 1665.5 388.5 L 1652.5 388.5 Z M 1613.5 374.5 L 1626.5 374.5 L 1626.5 388.5 L 1613.5 388.5 Z M 1574.5 374.5 L 1588.5 374.5 L 1588.5 388.5 L 1574.5 388.5 Z M 1535.5 374.5 L 1549.5 374.5 L 1549.5 388.5 L 1535.5 388.5 Z M 1496.5 374.5 L 1510.5 374.5 L 1510.5 388.5 L 1496.5 388.5 Z M 1457.5 374.5 L 1471.5 374.5 L 1471.5 388.5 L 1457.5 388.5 Z M 1418.5 374.5 L 1432.5 374.5 L 1432.5 388.5 L 1418.5 388.5 Z M 1379.5 374.5 L 1393.5 374.5 L 1393.5 388.5 L 1379.5 388.5 Z M 1341.5 374.5 L 1354.5 374.5 L 1354.5 388.5 L 1341.5 388.5 Z M 1302.5 374.5 L 1316.5 374.5 L 1316.5 388.5 L 1302.5 388.5 Z M 1263.5 374.5 L 1277.5 374.5 L 1277.5 388.5 L 1263.5 388.5 Z M 1224.5 374.5 L 1238.5 374.5 L 1238.5 388.5 L 1224.5 388.5 Z M 1185.5 374.5 L 1199.5 374.5 L 1199.5 388.5 L 1185.5 388.5 Z M 1146.5 374.5 L 1160.5 374.5 L 1160.5 388.5 L 1146.5 388.5 Z M 1107.5 374.5 L 1121.5 374.5 L 1121.5 388.5 L 1107.5 388.5 Z M 1069.5 374.5 L 1082.5 374.5 L 1082.5 388.5 L 1069.5 388.5 Z M 1030.5 374.5 L 1043.5 374.5 L 1043.5 388.5 L 1030.5 388.5 Z M 991.5 374.5 L 1005.5 374.5 L 1005.5 388.5 L 991.5 388.5 Z M 952.5 374.5 L 966.5 374.5 L 966.5 388.5 L 952.5 388.5 Z M 913.5 374.5 L 927.5 374.5 L 927.5 388.5 L 913.5 388.5 Z M 874.5 374.5 L 888.5 374.5 L 888.5 388.5 L 874.5 388.5 Z M 835.5 374.5 L 849.5 374.5 L 849.5 388.5 L 835.5 388.5 Z M 796.5 374.5 L 810.5 374.5 L 810.5 388.5 L 796.5 388.5 Z M 758.5 374.5 L 771.5 374.5 L 771.5 388.5 L 758.5 388.5 Z M 719.5 374.5 L 732.5 374.5 L 732.5 388.5 L 719.5 388.5 Z M 680.5 374.5 L 694.5 374.5 L 694.5 388.5 L 680.5 388.5 Z M 641.5 374.5 L 655.5 374.5 L 655.5 388.5 L 641.5 388.5 Z M 602.5 374.5 L 616.5 374.5 L 616.5 388.5 L 602.5 388.5 Z M 563.5 374.5 L 577.5 374.5 L 577.5 388.5 L 563.5 388.5 Z M 524.5 374.5 L 538.5 374.5 L 538.5 388.5 L 524.5 388.5 Z M 485.5 374.5 L 499.5 374.5 L 499.5 388.5 L 485.5 388.5 Z M 447.5 374.5 L 460.5 374.5 L 460.5 388.5 L 447.5 388.5 Z M 408.5 374.5 L 422.5 374.5 L 422.5 388.5 L 408.5 388.5 Z M 369.5 374.5 L 383.5 374.5 L 383.5 388.5 L 369.5 388.5 Z M 330.5 374.5 L 344.5 374.5 L 344.5 388.5 L 330.5 388.5 Z M 291.5 374.5 L 305.5 374.5 L 305.5 388.5 L 291.5 388.5 Z M 252.5 374.5 L 266.5 374.5 L 266.5 388.5 L 252.5 388.5 Z M 1081.5 413.5 L 1094.5 413.5 L 1094.5 422.5 L 1081.5 422.5 Z M 536.5 413.5 L 550.5 413.5 L 550.5 423.5 L 536.5 423.5 Z M 536.5 423.5 L 550.5 423.5 L 550.5 427.5 L 536.5 427.5 Z M 1110.5 413.5 L 1124.5 413.5 L 1124.5 427.5 L 1110.5 427.5 Z M 1336.5 413.5 L 1350.5 413.5 L 1350.5 427.5 L 1336.5 427.5 Z M 949.5 413.5 L 963.5 413.5 L 963.5 427.5 L 949.5 427.5 Z M 920.5 413.5 L 934.5 413.5 L 934.5 427.5 L 920.5 427.5 Z M 891.5 413.5 L 905.5 413.5 L 905.5 427.5 L 891.5 427.5 Z M 1139.5 413.5 L 1153.5 413.5 L 1153.5 427.5 L 1139.5 427.5 Z M 1307.5 413.5 L 1320.5 413.5 L 1320.5 427.5 L 1307.5 427.5 Z M 1620.5 413.5 L 1633.5 413.5 L 1633.5 427.5 L 1620.5 427.5 Z M 1590.5 413.5 L 1604.5 413.5 L 1604.5 427.5 L 1590.5 427.5 Z M 1513.5 413.5 L 1527.5 413.5 L 1527.5 427.5 L 1513.5 427.5 Z M 1484.5 413.5 L 1498.5 413.5 L 1498.5 427.5 L 1484.5 427.5 Z M 507.5 413.5 L 521.5 413.5 L 521.5 427.5 L 507.5 427.5 Z M 650.5 413.5 L 664.5 413.5 L 664.5 427.5 L 650.5 427.5 Z M 1277.5 413.5 L 1291.5 413.5 L 1291.5 427.5 L 1277.5 427.5 Z M 1649.5 413.5 L 1663.5 413.5 L 1663.5 427.5 L 1649.5 427.5 Z M 312.5 413.5 L 326.5 413.5 L 326.5 427.5 L 312.5 427.5 Z M 283.5 413.5 L 296.5 413.5 L 296.5 427.5 L 283.5 427.5 Z M 478.5 413.5 L 492.5 413.5 L 492.5 427.5 L 478.5 427.5 Z M 253.5 413.5 L 267.5 413.5 L 267.5 427.5 L 253.5 427.5 Z M 1081.5 422.5 L 1094.5 422.5 L 1094.5 427.5 L 1081.5 427.5 Z M 624.5 665.5 L 638.5 665.5 L 638.5 679.5 L 624.5 679.5 Z M 1646.5 665.5 L 1660.5 665.5 L 1660.5 679.5 L 1646.5 679.5 Z M 1617.5 665.5 L 1631.5 665.5 L 1631.5 679.5 L 1617.5 679.5 Z M 1588.5 665.5 L 1601.5 665.5 L 1601.5 679.5 L 1588.5 679.5 Z M 1450.5 665.5 L 1463.5 665.5 L 1463.5 679.5 L 1450.5 679.5 Z M 1420.5 665.5 L 1434.5 665.5 L 1434.5 679.5 L 1420.5 679.5 Z M 1391.5 665.5 L 1405.5 665.5 L 1405.5 679.5 L 1391.5 679.5 Z M 539.5 665.5 L 552.5 665.5 L 552.5 679.5 L 539.5 679.5 Z M 509.5 665.5 L 523.5 665.5 L 523.5 679.5 L 509.5 679.5 Z M 480.5 665.5 L 494.5 665.5 L 494.5 679.5 L 480.5 679.5 Z M 1098.5 665.5 L 1112.5 665.5 L 1112.5 679.5 L 1098.5 679.5 Z M 1069.5 665.5 L 1083.5 665.5 L 1083.5 679.5 L 1069.5 679.5 Z M 1040.5 665.5 L 1054.5 665.5 L 1054.5 679.5 L 1040.5 679.5 Z M 926.5 665.5 L 939.5 665.5 L 939.5 679.5 L 926.5 679.5 Z M 896.5 665.5 L 910.5 665.5 L 910.5 679.5 L 896.5 679.5 Z M 867.5 665.5 L 881.5 665.5 L 881.5 679.5 L 867.5 679.5 Z M 312.5 665.5 L 326.5 665.5 L 326.5 679.5 L 312.5 679.5 Z M 283.5 665.5 L 296.5 665.5 L 296.5 679.5 L 283.5 679.5 Z M 253.5 665.5 L 267.5 665.5 L 267.5 679.5 L 253.5 679.5 Z M 213.5 704.5 L 227.5 704.5 L 227.5 717.5 L 213.5 717.5 Z M 1690.5 704.5 L 1704.5 704.5 L 1704.5 717.5 L 1690.5 717.5 Z M 1652.5 704.5 L 1665.5 704.5 L 1665.5 717.5 L 1652.5 717.5 Z M 1613.5 704.5 L 1626.5 704.5 L 1626.5 717.5 L 1613.5 717.5 Z M 1574.5 704.5 L 1588.5 704.5 L 1588.5 717.5 L 1574.5 717.5 Z M 1535.5 704.5 L 1549.5 704.5 L 1549.5 717.5 L 1535.5 717.5 Z M 1496.5 704.5 L 1510.5 704.5 L 1510.5 717.5 L 1496.5 717.5 Z M 1457.5 704.5 L 1471.5 704.5 L 1471.5 717.5 L 1457.5 717.5 Z M 1418.5 704.5 L 1432.5 704.5 L 1432.5 717.5 L 1418.5 717.5 Z M 1379.5 704.5 L 1393.5 704.5 L 1393.5 717.5 L 1379.5 717.5 Z M 1341.5 704.5 L 1354.5 704.5 L 1354.5 717.5 L 1341.5 717.5 Z M 1302.5 704.5 L 1316.5 704.5 L 1316.5 717.5 L 1302.5 717.5 Z M 1263.5 704.5 L 1277.5 704.5 L 1277.5 717.5 L 1263.5 717.5 Z M 1224.5 704.5 L 1238.5 704.5 L 1238.5 717.5 L 1224.5 717.5 Z M 1185.5 704.5 L 1199.5 704.5 L 1199.5 717.5 L 1185.5 717.5 Z M 1146.5 704.5 L 1160.5 704.5 L 1160.5 717.5 L 1146.5 717.5 Z M 1107.5 704.5 L 1121.5 704.5 L 1121.5 717.5 L 1107.5 717.5 Z M 1069.5 704.5 L 1082.5 704.5 L 1082.5 717.5 L 1069.5 717.5 Z M 1030.5 704.5 L 1043.5 704.5 L 1043.5 717.5 L 1030.5 717.5 Z M 991.5 704.5 L 1005.5 704.5 L 1005.5 717.5 L 991.5 717.5 Z M 952.5 704.5 L 966.5 704.5 L 966.5 717.5 L 952.5 717.5 Z M 913.5 704.5 L 927.5 704.5 L 927.5 717.5 L 913.5 717.5 Z M 874.5 704.5 L 888.5 704.5 L 888.5 717.5 L 874.5 717.5 Z M 835.5 704.5 L 849.5 704.5 L 849.5 717.5 L 835.5 717.5 Z M 796.5 704.5 L 810.5 704.5 L 810.5 717.5 L 796.5 717.5 Z M 758.5 704.5 L 771.5 704.5 L 771.5 717.5 L 758.5 717.5 Z M 719.5 704.5 L 732.5 704.5 L 732.5 717.5 L 719.5 717.5 Z M 680.5 704.5 L 694.5 704.5 L 694.5 717.5 L 680.5 717.5 Z M 641.5 704.5 L 655.5 704.5 L 655.5 717.5 L 641.5 717.5 Z M 602.5 704.5 L 616.5 704.5 L 616.5 717.5 L 602.5 717.5 Z M 563.5 704.5 L 577.5 704.5 L 577.5 717.5 L 563.5 717.5 Z M 524.5 704.5 L 538.5 704.5 L 538.5 717.5 L 524.5 717.5 Z M 485.5 704.5 L 499.5 704.5 L 499.5 717.5 L 485.5 717.5 Z M 447.5 704.5 L 460.5 704.5 L 460.5 717.5 L 447.5 717.5 Z M 408.5 704.5 L 422.5 704.5 L 422.5 717.5 L 408.5 717.5 Z M 369.5 704.5 L 383.5 704.5 L 383.5 717.5 L 369.5 717.5 Z M 330.5 704.5 L 344.5 704.5 L 344.5 717.5 L 330.5 717.5 Z M 291.5 704.5 L 305.5 704.5 L 305.5 717.5 L 291.5 717.5 Z M 252.5 704.5 L 266.5 704.5 L 266.5 717.5 L 252.5 717.5 Z M 252.5 704.5 "/>
 </clipPath>
-<image id="image529" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image556" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image529"/>
+  <use xlink:href="#image556"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface520">
+<g id="surface547">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -286,6 +286,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1385.890625 579.34375 L 1385.84375 580.105469 L 1385.722656 580.796875 L 1385.507812 581.441406 L 1385.222656 582.015625 L 1384.839844 582.5625 L 1384.386719 583.039062 L 1383.886719 583.445312 L 1383.363281 583.753906 L 1382.765625 583.992188 L 1382.148438 584.183594 L 1381.480469 584.28125 L 1380.765625 584.304688 L 1372.917969 584.304688 L 1372.917969 566.921875 L 1379.976562 566.921875 L 1381.003906 566.992188 L 1381.90625 567.160156 L 1382.71875 567.445312 L 1383.410156 567.851562 L 1384.007812 568.375 L 1384.484375 569.019531 L 1384.675781 569.378906 L 1384.839844 569.757812 L 1384.960938 570.117188 L 1385.054688 570.523438 L 1385.101562 570.929688 L 1385.125 571.332031 L 1385.054688 572.191406 L 1384.839844 572.929688 L 1384.507812 573.621094 L 1384.03125 574.195312 L 1383.433594 574.71875 L 1382.71875 575.125 L 1383.410156 575.433594 L 1384.007812 575.769531 L 1384.53125 576.148438 L 1384.960938 576.578125 L 1385.292969 577.03125 L 1385.554688 577.507812 L 1385.652344 577.792969 L 1385.722656 578.082031 L 1385.792969 578.367188 L 1385.84375 578.699219 L 1385.867188 579.011719 Z M 1382.910156 571.644531 L 1382.839844 570.929688 L 1382.625 570.332031 L 1382.289062 569.808594 L 1381.8125 569.425781 L 1381.214844 569.140625 L 1380.476562 568.949219 L 1380.3125 568.949219 L 1379.976562 568.902344 L 1379.59375 568.902344 L 1379.429688 568.878906 L 1375.136719 568.878906 L 1375.136719 574.410156 L 1379.429688 574.410156 L 1380.3125 574.359375 L 1381.074219 574.21875 L 1381.71875 573.957031 L 1382.195312 573.597656 L 1382.574219 573.121094 L 1382.8125 572.550781 L 1382.839844 572.429688 L 1382.863281 572.285156 L 1382.886719 572.144531 L 1382.886719 571.808594 Z M 1380.550781 582.347656 L 1381.214844 582.324219 L 1381.8125 582.179688 L 1382.335938 581.941406 L 1382.765625 581.632812 L 1383.125 581.226562 L 1383.410156 580.726562 L 1383.480469 580.535156 L 1383.53125 580.320312 L 1383.601562 580.082031 L 1383.625 579.867188 L 1383.648438 579.628906 L 1383.671875 579.367188 L 1383.625 578.84375 L 1383.53125 578.34375 L 1383.363281 577.914062 L 1383.125 577.507812 L 1382.8125 577.175781 L 1382.457031 576.863281 L 1382.195312 576.722656 L 1381.90625 576.601562 L 1381.597656 576.507812 L 1381.265625 576.433594 L 1380.90625 576.386719 L 1380.550781 576.363281 L 1375.136719 576.363281 L 1375.136719 582.347656 Z M 1380.550781 582.347656 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1341 510 L 1354 510 M 1341 496 L 1354 496 M 1341 496 L 1341 510 M 1354 496 L 1354 510 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1341 510 L 1354 510 M 1341 496 L 1354 496 M 1354 510 L 1354 496 M 1341 510 L 1341 496 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201 363 L 201 372 M 196 368 L 205 368 M 200 369 L 202 369 M 200 367 L 202 367 M 200 367 L 200 369 M 202 367 L 202 369 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.svg b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.svg
index 57916d7..a437a2e 100644
--- a/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.svg
+++ b/cells/sdfxbp/sky130_fd_sc_hvl__sdfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 356.5 L 1744.5 356.5 L 1744.5 557.5 L 174.5 557.5 Z M 1428.5 557.5 L 1626.5 557.5 L 1626.5 570.5 L 1428.5 570.5 Z M 1428.5 557.5 "/>
 </clipPath>
-<image id="image497" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image526" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image497"/>
+  <use xlink:href="#image526"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 199.5 382.5 L 1718.5 382.5 L 1718.5 395.5 L 199.5 395.5 Z M 199.5 382.5 "/>
 </clipPath>
-<image id="image498" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image527" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image498"/>
+  <use xlink:href="#image527"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 199.5 382.5 L 1718.5 382.5 L 1718.5 395.5 L 199.5 395.5 Z M 611.5 603.5 L 782.5 603.5 L 782.5 606.5 L 611.5 606.5 Z M 1432.5 603.5 L 1515.5 603.5 L 1515.5 606.5 L 1432.5 606.5 Z M 1624.5 603.5 L 1706.5 603.5 L 1706.5 606.5 L 1624.5 606.5 Z M 806.5 600.5 L 948.5 600.5 L 948.5 610.5 L 806.5 610.5 Z M 1139.5 603.5 L 1405.5 603.5 L 1405.5 613.5 L 1139.5 613.5 Z M 1432.5 606.5 L 1515.5 606.5 L 1515.5 619.5 L 1432.5 619.5 Z M 611.5 606.5 L 782.5 606.5 L 782.5 619.5 L 611.5 619.5 Z M 1624.5 606.5 L 1706.5 606.5 L 1706.5 619.5 L 1624.5 619.5 Z M 806.5 610.5 L 948.5 610.5 L 948.5 623.5 L 806.5 623.5 Z M 1139.5 613.5 L 1405.5 613.5 L 1405.5 626.5 L 1139.5 626.5 Z M 1432.5 619.5 L 1515.5 619.5 L 1515.5 628.5 L 1432.5 628.5 Z M 806.5 623.5 L 948.5 623.5 L 948.5 633.5 L 806.5 633.5 Z M 1139.5 626.5 L 1405.5 626.5 L 1405.5 635.5 L 1139.5 635.5 Z M 611.5 619.5 L 782.5 619.5 L 782.5 635.5 L 611.5 635.5 Z M 243.5 628.5 L 555.5 628.5 L 555.5 638.5 L 243.5 638.5 Z M 972.5 628.5 L 1114.5 628.5 L 1114.5 638.5 L 972.5 638.5 Z M 611.5 635.5 L 700.5 635.5 L 700.5 642.5 L 611.5 642.5 Z M 1624.5 619.5 L 1706.5 619.5 L 1706.5 645.5 L 1624.5 645.5 Z M 1432.5 628.5 L 1584.5 628.5 L 1584.5 645.5 L 1432.5 645.5 Z M 1323.5 635.5 L 1405.5 635.5 L 1405.5 645.5 L 1323.5 645.5 Z M 972.5 638.5 L 1114.5 638.5 L 1114.5 651.5 L 972.5 651.5 Z M 243.5 638.5 L 555.5 638.5 L 555.5 651.5 L 243.5 651.5 Z M 611.5 642.5 L 700.5 642.5 L 700.5 655.5 L 611.5 655.5 Z M 1624.5 645.5 L 1706.5 645.5 L 1706.5 658.5 L 1624.5 658.5 Z M 1323.5 645.5 L 1405.5 645.5 L 1405.5 658.5 L 1323.5 658.5 Z M 1432.5 645.5 L 1584.5 645.5 L 1584.5 658.5 L 1432.5 658.5 Z M 1323.5 658.5 L 1405.5 658.5 L 1405.5 661.5 L 1323.5 661.5 Z M 1624.5 658.5 L 1706.5 658.5 L 1706.5 661.5 L 1624.5 661.5 Z M 243.5 651.5 L 555.5 651.5 L 555.5 661.5 L 243.5 661.5 Z M 611.5 655.5 L 700.5 655.5 L 700.5 661.5 L 611.5 661.5 Z M 1432.5 658.5 L 1584.5 658.5 L 1584.5 661.5 L 1432.5 661.5 Z M 972.5 651.5 L 1114.5 651.5 L 1114.5 661.5 L 972.5 661.5 Z M 972.5 651.5 "/>
 </clipPath>
-<image id="image499" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image528" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image499"/>
+  <use xlink:href="#image528"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 199.5 696.5 L 1718.5 696.5 L 1718.5 709.5 L 199.5 709.5 Z M 199.5 696.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image498"/>
+  <use xlink:href="#image527"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1685.5 415.5 L 1706.5 415.5 L 1706.5 419.5 L 1685.5 419.5 Z M 1624.5 415.5 L 1646.5 415.5 L 1646.5 419.5 L 1624.5 419.5 Z M 1351.5 415.5 L 1372.5 415.5 L 1372.5 420.5 L 1351.5 420.5 Z M 689.5 415.5 L 711.5 415.5 L 711.5 420.5 L 689.5 420.5 Z M 1410.5 415.5 L 1431.5 415.5 L 1431.5 420.5 L 1410.5 420.5 Z M 363.5 415.5 L 385.5 415.5 L 385.5 425.5 L 363.5 425.5 Z M 303.5 415.5 L 325.5 415.5 L 325.5 425.5 L 303.5 425.5 Z M 424.5 415.5 L 444.5 415.5 L 444.5 425.5 L 424.5 425.5 Z M 1624.5 419.5 L 1646.5 419.5 L 1646.5 432.5 L 1624.5 432.5 Z M 1685.5 419.5 L 1706.5 419.5 L 1706.5 432.5 L 1685.5 432.5 Z M 1410.5 420.5 L 1431.5 420.5 L 1431.5 433.5 L 1410.5 433.5 Z M 689.5 420.5 L 711.5 420.5 L 711.5 433.5 L 689.5 433.5 Z M 1351.5 420.5 L 1372.5 420.5 L 1372.5 433.5 L 1351.5 433.5 Z M 1513.5 429.5 L 1533.5 429.5 L 1533.5 433.5 L 1513.5 433.5 Z M 1454.5 429.5 L 1474.5 429.5 L 1474.5 436.5 L 1454.5 436.5 Z M 303.5 425.5 L 325.5 425.5 L 325.5 438.5 L 303.5 438.5 Z M 424.5 425.5 L 444.5 425.5 L 444.5 438.5 L 424.5 438.5 Z M 363.5 425.5 L 385.5 425.5 L 385.5 438.5 L 363.5 438.5 Z M 630.5 415.5 L 651.5 415.5 L 651.5 442.5 L 630.5 442.5 Z M 1513.5 433.5 L 1533.5 433.5 L 1533.5 446.5 L 1513.5 446.5 Z M 689.5 433.5 L 711.5 433.5 L 711.5 446.5 L 689.5 446.5 Z M 363.5 438.5 L 385.5 438.5 L 385.5 448.5 L 363.5 448.5 Z M 303.5 438.5 L 325.5 438.5 L 325.5 448.5 L 303.5 448.5 Z M 1351.5 433.5 L 1372.5 433.5 L 1372.5 448.5 L 1351.5 448.5 Z M 424.5 438.5 L 444.5 438.5 L 444.5 448.5 L 424.5 448.5 Z M 1410.5 433.5 L 1431.5 433.5 L 1431.5 448.5 L 1410.5 448.5 Z M 586.5 439.5 L 607.5 439.5 L 607.5 449.5 L 586.5 449.5 Z M 526.5 439.5 L 548.5 439.5 L 548.5 449.5 L 526.5 449.5 Z M 467.5 439.5 L 488.5 439.5 L 488.5 449.5 L 467.5 449.5 Z M 1454.5 436.5 L 1474.5 436.5 L 1474.5 449.5 L 1454.5 449.5 Z M 904.5 446.5 L 926.5 446.5 L 926.5 450.5 L 904.5 450.5 Z M 1685.5 432.5 L 1706.5 432.5 L 1706.5 451.5 L 1685.5 451.5 Z M 1624.5 432.5 L 1646.5 432.5 L 1646.5 451.5 L 1624.5 451.5 Z M 630.5 442.5 L 651.5 442.5 L 651.5 455.5 L 630.5 455.5 Z M 1239.5 453.5 L 1260.5 453.5 L 1260.5 456.5 L 1239.5 456.5 Z M 1351.5 448.5 L 1372.5 448.5 L 1372.5 460.5 L 1351.5 460.5 Z M 1343.5 460.5 L 1372.5 460.5 L 1372.5 461.5 L 1343.5 461.5 Z M 1410.5 448.5 L 1431.5 448.5 L 1431.5 461.5 L 1410.5 461.5 Z M 467.5 449.5 L 488.5 449.5 L 488.5 462.5 L 467.5 462.5 Z M 526.5 449.5 L 548.5 449.5 L 548.5 462.5 L 526.5 462.5 Z M 586.5 449.5 L 607.5 449.5 L 607.5 462.5 L 586.5 462.5 Z M 1179.5 453.5 L 1200.5 453.5 L 1200.5 463.5 L 1179.5 463.5 Z M 904.5 450.5 L 926.5 450.5 L 926.5 463.5 L 904.5 463.5 Z M 844.5 446.5 L 865.5 446.5 L 865.5 463.5 L 844.5 463.5 Z M 1624.5 451.5 L 1646.5 451.5 L 1646.5 464.5 L 1624.5 464.5 Z M 1513.5 446.5 L 1533.5 446.5 L 1533.5 464.5 L 1513.5 464.5 Z M 1685.5 451.5 L 1706.5 451.5 L 1706.5 464.5 L 1685.5 464.5 Z M 1454.5 449.5 L 1474.5 449.5 L 1474.5 466.5 L 1454.5 466.5 Z M 1068.5 464.5 L 1089.5 464.5 L 1089.5 468.5 L 1068.5 468.5 Z M 1239.5 456.5 L 1260.5 456.5 L 1260.5 469.5 L 1239.5 469.5 Z M 1284.5 460.5 L 1304.5 460.5 L 1304.5 470.5 L 1284.5 470.5 Z M 586.5 462.5 L 607.5 462.5 L 607.5 471.5 L 586.5 471.5 Z M 526.5 462.5 L 548.5 462.5 L 548.5 471.5 L 526.5 471.5 Z M 467.5 462.5 L 488.5 462.5 L 488.5 471.5 L 467.5 471.5 Z M 1008.5 464.5 L 1030.5 464.5 L 1030.5 473.5 L 1008.5 473.5 Z M 1410.5 461.5 L 1431.5 461.5 L 1431.5 475.5 L 1410.5 475.5 Z M 1343.5 461.5 L 1372.5 461.5 L 1372.5 475.5 L 1343.5 475.5 Z M 630.5 455.5 L 651.5 455.5 L 651.5 475.5 L 630.5 475.5 Z M 844.5 463.5 L 865.5 463.5 L 865.5 476.5 L 844.5 476.5 Z M 1179.5 463.5 L 1200.5 463.5 L 1200.5 476.5 L 1179.5 476.5 Z M 1513.5 464.5 L 1533.5 464.5 L 1533.5 477.5 L 1513.5 477.5 Z M 1454.5 466.5 L 1474.5 466.5 L 1474.5 479.5 L 1454.5 479.5 Z M 789.5 446.5 L 805.5 446.5 L 805.5 479.5 L 789.5 479.5 Z M 844.5 476.5 L 865.5 476.5 L 865.5 479.5 L 844.5 479.5 Z M 689.5 446.5 L 750.5 446.5 L 750.5 479.5 L 689.5 479.5 Z M 904.5 463.5 L 926.5 463.5 L 926.5 479.5 L 904.5 479.5 Z M 211.5 471.5 L 232.5 471.5 L 232.5 481.5 L 211.5 481.5 Z M 1068.5 468.5 L 1089.5 468.5 L 1089.5 481.5 L 1068.5 481.5 Z M 270.5 471.5 L 292.5 471.5 L 292.5 481.5 L 270.5 481.5 Z M 1624.5 464.5 L 1646.5 464.5 L 1646.5 483.5 L 1624.5 483.5 Z M 1284.5 470.5 L 1304.5 470.5 L 1304.5 483.5 L 1284.5 483.5 Z M 1685.5 464.5 L 1706.5 464.5 L 1706.5 483.5 L 1685.5 483.5 Z M 1239.5 469.5 L 1260.5 469.5 L 1260.5 485.5 L 1239.5 485.5 Z M 1513.5 477.5 L 1533.5 477.5 L 1533.5 486.5 L 1513.5 486.5 Z M 1008.5 473.5 L 1030.5 473.5 L 1030.5 486.5 L 1008.5 486.5 Z M 630.5 475.5 L 651.5 475.5 L 651.5 488.5 L 630.5 488.5 Z M 1410.5 475.5 L 1431.5 475.5 L 1431.5 488.5 L 1410.5 488.5 Z M 1343.5 475.5 L 1372.5 475.5 L 1372.5 488.5 L 1343.5 488.5 Z M 1580.5 486.5 L 1601.5 486.5 L 1601.5 491.5 L 1580.5 491.5 Z M 1410.5 488.5 L 1431.5 488.5 L 1431.5 493.5 L 1410.5 493.5 Z M 1343.5 488.5 L 1372.5 488.5 L 1372.5 493.5 L 1343.5 493.5 Z M 1284.5 483.5 L 1304.5 483.5 L 1304.5 493.5 L 1284.5 493.5 Z M 630.5 488.5 L 651.5 488.5 L 651.5 493.5 L 630.5 493.5 Z M 689.5 479.5 L 711.5 479.5 L 711.5 493.5 L 689.5 493.5 Z M 211.5 481.5 L 232.5 481.5 L 232.5 494.5 L 211.5 494.5 Z M 270.5 481.5 L 292.5 481.5 L 292.5 494.5 L 270.5 494.5 Z M 1624.5 483.5 L 1646.5 483.5 L 1646.5 496.5 L 1624.5 496.5 Z M 1685.5 483.5 L 1706.5 483.5 L 1706.5 496.5 L 1685.5 496.5 Z M 1513.5 486.5 L 1542.5 486.5 L 1542.5 496.5 L 1513.5 496.5 Z M 1454.5 479.5 L 1474.5 479.5 L 1474.5 497.5 L 1454.5 497.5 Z M 1239.5 485.5 L 1260.5 485.5 L 1260.5 498.5 L 1239.5 498.5 Z M 1179.5 476.5 L 1200.5 476.5 L 1200.5 498.5 L 1179.5 498.5 Z M 270.5 494.5 L 292.5 494.5 L 292.5 503.5 L 270.5 503.5 Z M 211.5 494.5 L 232.5 494.5 L 232.5 503.5 L 211.5 503.5 Z M 1068.5 481.5 L 1089.5 481.5 L 1089.5 504.5 L 1068.5 504.5 Z M 1580.5 491.5 L 1601.5 491.5 L 1601.5 504.5 L 1580.5 504.5 Z M 949.5 464.5 L 970.5 464.5 L 970.5 504.5 L 949.5 504.5 Z M 1112.5 498.5 L 1132.5 498.5 L 1132.5 508.5 L 1112.5 508.5 Z M 1513.5 496.5 L 1542.5 496.5 L 1542.5 509.5 L 1513.5 509.5 Z M 1454.5 497.5 L 1474.5 497.5 L 1474.5 510.5 L 1454.5 510.5 Z M 1171.5 498.5 L 1200.5 498.5 L 1200.5 513.5 L 1171.5 513.5 Z M 1239.5 498.5 L 1260.5 498.5 L 1260.5 514.5 L 1239.5 514.5 Z M 1685.5 496.5 L 1706.5 496.5 L 1706.5 515.5 L 1685.5 515.5 Z M 1624.5 496.5 L 1646.5 496.5 L 1646.5 515.5 L 1624.5 515.5 Z M 949.5 504.5 L 970.5 504.5 L 970.5 517.5 L 949.5 517.5 Z M 1068.5 504.5 L 1089.5 504.5 L 1089.5 517.5 L 1068.5 517.5 Z M 1112.5 508.5 L 1132.5 508.5 L 1132.5 521.5 L 1112.5 521.5 Z M 1008.5 486.5 L 1030.5 486.5 L 1030.5 522.5 L 1008.5 522.5 Z M 1068.5 517.5 L 1089.5 517.5 L 1089.5 522.5 L 1068.5 522.5 Z M 949.5 517.5 L 970.5 517.5 L 970.5 522.5 L 949.5 522.5 Z M 1171.5 513.5 L 1200.5 513.5 L 1200.5 526.5 L 1171.5 526.5 Z M 1454.5 510.5 L 1474.5 510.5 L 1474.5 527.5 L 1454.5 527.5 Z M 1513.5 509.5 L 1542.5 509.5 L 1542.5 527.5 L 1513.5 527.5 Z M 1580.5 504.5 L 1601.5 504.5 L 1601.5 527.5 L 1580.5 527.5 Z M 1239.5 514.5 L 1260.5 514.5 L 1260.5 527.5 L 1239.5 527.5 Z M 1685.5 515.5 L 1706.5 515.5 L 1706.5 528.5 L 1685.5 528.5 Z M 1624.5 515.5 L 1646.5 515.5 L 1646.5 528.5 L 1624.5 528.5 Z M 1171.5 526.5 L 1200.5 526.5 L 1200.5 530.5 L 1171.5 530.5 Z M 1239.5 527.5 L 1260.5 527.5 L 1260.5 530.5 L 1239.5 530.5 Z M 1112.5 521.5 L 1132.5 521.5 L 1132.5 530.5 L 1112.5 530.5 Z M 1685.5 528.5 L 1706.5 528.5 L 1706.5 531.5 L 1685.5 531.5 Z M 1624.5 528.5 L 1646.5 528.5 L 1646.5 531.5 L 1624.5 531.5 Z M 1454.5 527.5 L 1474.5 527.5 L 1474.5 540.5 L 1454.5 540.5 Z M 1513.5 527.5 L 1542.5 527.5 L 1542.5 540.5 L 1513.5 540.5 Z M 1580.5 527.5 L 1601.5 527.5 L 1601.5 540.5 L 1580.5 540.5 Z M 1580.5 540.5 L 1601.5 540.5 L 1601.5 544.5 L 1580.5 544.5 Z M 1513.5 540.5 L 1542.5 540.5 L 1542.5 544.5 L 1513.5 544.5 Z M 1454.5 540.5 L 1474.5 540.5 L 1474.5 544.5 L 1454.5 544.5 Z M 199.5 696.5 L 1718.5 696.5 L 1718.5 709.5 L 199.5 709.5 Z M 199.5 696.5 "/>
 </clipPath>
-<image id="image500" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image529" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image500"/>
+  <use xlink:href="#image529"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 888.5 600.5 L 926.5 600.5 L 926.5 633.5 L 888.5 633.5 Z M 828.5 600.5 L 866.5 600.5 L 866.5 633.5 L 828.5 633.5 Z M 1161.5 603.5 L 1199.5 603.5 L 1199.5 635.5 L 1161.5 635.5 Z M 1276.5 603.5 L 1314.5 603.5 L 1314.5 635.5 L 1276.5 635.5 Z M 1221.5 603.5 L 1259.5 603.5 L 1259.5 635.5 L 1221.5 635.5 Z M 722.5 603.5 L 760.5 603.5 L 760.5 635.5 L 722.5 635.5 Z M 994.5 628.5 L 1032.5 628.5 L 1032.5 661.5 L 994.5 661.5 Z M 440.5 628.5 L 478.5 628.5 L 478.5 661.5 L 440.5 661.5 Z M 1054.5 628.5 L 1092.5 628.5 L 1092.5 661.5 L 1054.5 661.5 Z M 1646.5 603.5 L 1685.5 603.5 L 1685.5 661.5 L 1646.5 661.5 Z M 495.5 628.5 L 533.5 628.5 L 533.5 661.5 L 495.5 661.5 Z M 1345.5 603.5 L 1383.5 603.5 L 1383.5 661.5 L 1345.5 661.5 Z M 1454.5 603.5 L 1493.5 603.5 L 1493.5 661.5 L 1454.5 661.5 Z M 633.5 603.5 L 672.5 603.5 L 672.5 661.5 L 633.5 661.5 Z M 380.5 628.5 L 418.5 628.5 L 418.5 661.5 L 380.5 661.5 Z M 1523.5 628.5 L 1562.5 628.5 L 1562.5 661.5 L 1523.5 661.5 Z M 265.5 628.5 L 303.5 628.5 L 303.5 661.5 L 265.5 661.5 Z M 325.5 628.5 L 363.5 628.5 L 363.5 661.5 L 325.5 661.5 Z M 325.5 628.5 "/>
 </clipPath>
-<image id="image501" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image530" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image501"/>
+  <use xlink:href="#image530"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 325.5 415.5 L 363.5 415.5 L 363.5 448.5 L 325.5 448.5 Z M 385.5 415.5 L 424.5 415.5 L 424.5 448.5 L 385.5 448.5 Z M 488.5 439.5 L 526.5 439.5 L 526.5 471.5 L 488.5 471.5 Z M 548.5 439.5 L 586.5 439.5 L 586.5 471.5 L 548.5 471.5 Z M 865.5 446.5 L 904.5 446.5 L 904.5 479.5 L 865.5 479.5 Z M 805.5 446.5 L 844.5 446.5 L 844.5 479.5 L 805.5 479.5 Z M 750.5 446.5 L 789.5 446.5 L 789.5 479.5 L 750.5 479.5 Z M 1372.5 415.5 L 1410.5 415.5 L 1410.5 493.5 L 1372.5 493.5 Z M 1304.5 460.5 L 1343.5 460.5 L 1343.5 493.5 L 1304.5 493.5 Z M 651.5 415.5 L 689.5 415.5 L 689.5 493.5 L 651.5 493.5 Z M 232.5 471.5 L 270.5 471.5 L 270.5 503.5 L 232.5 503.5 Z M 1030.5 464.5 L 1068.5 464.5 L 1068.5 522.5 L 1030.5 522.5 Z M 970.5 464.5 L 1008.5 464.5 L 1008.5 522.5 L 970.5 522.5 Z M 1132.5 498.5 L 1171.5 498.5 L 1171.5 530.5 L 1132.5 530.5 Z M 1200.5 453.5 L 1239.5 453.5 L 1239.5 530.5 L 1200.5 530.5 Z M 1646.5 415.5 L 1685.5 415.5 L 1685.5 531.5 L 1646.5 531.5 Z M 1542.5 486.5 L 1580.5 486.5 L 1580.5 544.5 L 1542.5 544.5 Z M 1474.5 429.5 L 1513.5 429.5 L 1513.5 544.5 L 1474.5 544.5 Z M 1474.5 429.5 "/>
 </clipPath>
-<image id="image502" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image531" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image502"/>
+  <use xlink:href="#image531"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 211.5 382.5 L 225.5 382.5 L 225.5 395.5 L 211.5 395.5 Z M 1693.5 382.5 L 1706.5 382.5 L 1706.5 395.5 L 1693.5 395.5 Z M 1656.5 382.5 L 1669.5 382.5 L 1669.5 395.5 L 1656.5 395.5 Z M 1619.5 382.5 L 1632.5 382.5 L 1632.5 395.5 L 1619.5 395.5 Z M 1582.5 382.5 L 1595.5 382.5 L 1595.5 395.5 L 1582.5 395.5 Z M 1545.5 382.5 L 1558.5 382.5 L 1558.5 395.5 L 1545.5 395.5 Z M 1508.5 382.5 L 1521.5 382.5 L 1521.5 395.5 L 1508.5 395.5 Z M 1471.5 382.5 L 1484.5 382.5 L 1484.5 395.5 L 1471.5 395.5 Z M 1434.5 382.5 L 1447.5 382.5 L 1447.5 395.5 L 1434.5 395.5 Z M 1397.5 382.5 L 1410.5 382.5 L 1410.5 395.5 L 1397.5 395.5 Z M 1360.5 382.5 L 1373.5 382.5 L 1373.5 395.5 L 1360.5 395.5 Z M 1323.5 382.5 L 1336.5 382.5 L 1336.5 395.5 L 1323.5 395.5 Z M 1286.5 382.5 L 1299.5 382.5 L 1299.5 395.5 L 1286.5 395.5 Z M 1249.5 382.5 L 1262.5 382.5 L 1262.5 395.5 L 1249.5 395.5 Z M 1211.5 382.5 L 1225.5 382.5 L 1225.5 395.5 L 1211.5 395.5 Z M 1174.5 382.5 L 1188.5 382.5 L 1188.5 395.5 L 1174.5 395.5 Z M 1137.5 382.5 L 1151.5 382.5 L 1151.5 395.5 L 1137.5 395.5 Z M 1100.5 382.5 L 1113.5 382.5 L 1113.5 395.5 L 1100.5 395.5 Z M 1063.5 382.5 L 1076.5 382.5 L 1076.5 395.5 L 1063.5 395.5 Z M 1026.5 382.5 L 1039.5 382.5 L 1039.5 395.5 L 1026.5 395.5 Z M 989.5 382.5 L 1002.5 382.5 L 1002.5 395.5 L 989.5 395.5 Z M 952.5 382.5 L 965.5 382.5 L 965.5 395.5 L 952.5 395.5 Z M 915.5 382.5 L 928.5 382.5 L 928.5 395.5 L 915.5 395.5 Z M 878.5 382.5 L 891.5 382.5 L 891.5 395.5 L 878.5 395.5 Z M 841.5 382.5 L 854.5 382.5 L 854.5 395.5 L 841.5 395.5 Z M 804.5 382.5 L 817.5 382.5 L 817.5 395.5 L 804.5 395.5 Z M 767.5 382.5 L 780.5 382.5 L 780.5 395.5 L 767.5 395.5 Z M 730.5 382.5 L 743.5 382.5 L 743.5 395.5 L 730.5 395.5 Z M 693.5 382.5 L 706.5 382.5 L 706.5 395.5 L 693.5 395.5 Z M 656.5 382.5 L 669.5 382.5 L 669.5 395.5 L 656.5 395.5 Z M 619.5 382.5 L 632.5 382.5 L 632.5 395.5 L 619.5 395.5 Z M 582.5 382.5 L 595.5 382.5 L 595.5 395.5 L 582.5 395.5 Z M 545.5 382.5 L 558.5 382.5 L 558.5 395.5 L 545.5 395.5 Z M 508.5 382.5 L 521.5 382.5 L 521.5 395.5 L 508.5 395.5 Z M 471.5 382.5 L 484.5 382.5 L 484.5 395.5 L 471.5 395.5 Z M 434.5 382.5 L 447.5 382.5 L 447.5 395.5 L 434.5 395.5 Z M 397.5 382.5 L 410.5 382.5 L 410.5 395.5 L 397.5 395.5 Z M 360.5 382.5 L 373.5 382.5 L 373.5 395.5 L 360.5 395.5 Z M 323.5 382.5 L 336.5 382.5 L 336.5 395.5 L 323.5 395.5 Z M 286.5 382.5 L 299.5 382.5 L 299.5 395.5 L 286.5 395.5 Z M 248.5 382.5 L 262.5 382.5 L 262.5 395.5 L 248.5 395.5 Z M 1348.5 419.5 L 1361.5 419.5 L 1361.5 420.5 L 1348.5 420.5 Z M 687.5 419.5 L 700.5 419.5 L 700.5 420.5 L 687.5 420.5 Z M 365.5 419.5 L 378.5 419.5 L 378.5 425.5 L 365.5 425.5 Z M 365.5 425.5 L 378.5 425.5 L 378.5 432.5 L 365.5 432.5 Z M 687.5 420.5 L 700.5 420.5 L 700.5 432.5 L 687.5 432.5 Z M 1348.5 420.5 L 1361.5 420.5 L 1361.5 432.5 L 1348.5 432.5 Z M 715.5 419.5 L 728.5 419.5 L 728.5 432.5 L 715.5 432.5 Z M 1376.5 419.5 L 1389.5 419.5 L 1389.5 432.5 L 1376.5 432.5 Z M 1547.5 419.5 L 1560.5 419.5 L 1560.5 432.5 L 1547.5 432.5 Z M 392.5 419.5 L 406.5 419.5 L 406.5 432.5 L 392.5 432.5 Z M 1015.5 419.5 L 1028.5 419.5 L 1028.5 432.5 L 1015.5 432.5 Z M 1043.5 419.5 L 1056.5 419.5 L 1056.5 432.5 L 1043.5 432.5 Z M 1519.5 419.5 L 1532.5 419.5 L 1532.5 432.5 L 1519.5 432.5 Z M 1320.5 419.5 L 1333.5 419.5 L 1333.5 432.5 L 1320.5 432.5 Z M 1648.5 419.5 L 1661.5 419.5 L 1661.5 432.5 L 1648.5 432.5 Z M 1620.5 419.5 L 1633.5 419.5 L 1633.5 432.5 L 1620.5 432.5 Z M 337.5 419.5 L 350.5 419.5 L 350.5 432.5 L 337.5 432.5 Z M 743.5 419.5 L 756.5 419.5 L 756.5 432.5 L 743.5 432.5 Z M 278.5 419.5 L 291.5 419.5 L 291.5 432.5 L 278.5 432.5 Z M 250.5 419.5 L 264.5 419.5 L 264.5 432.5 L 250.5 432.5 Z M 1249.5 453.5 L 1262.5 453.5 L 1262.5 456.5 L 1249.5 456.5 Z M 1249.5 456.5 L 1262.5 456.5 L 1262.5 466.5 L 1249.5 466.5 Z M 619.5 453.5 L 632.5 453.5 L 632.5 466.5 L 619.5 466.5 Z M 338.5 659.5 L 352.5 659.5 L 352.5 672.5 L 338.5 672.5 Z M 1655.5 659.5 L 1668.5 659.5 L 1668.5 672.5 L 1655.5 672.5 Z M 1627.5 659.5 L 1641.5 659.5 L 1641.5 672.5 L 1627.5 672.5 Z M 1600.5 659.5 L 1613.5 659.5 L 1613.5 672.5 L 1600.5 672.5 Z M 1528.5 659.5 L 1541.5 659.5 L 1541.5 672.5 L 1528.5 672.5 Z M 1500.5 659.5 L 1513.5 659.5 L 1513.5 672.5 L 1500.5 672.5 Z M 1472.5 659.5 L 1485.5 659.5 L 1485.5 672.5 L 1472.5 672.5 Z M 311.5 659.5 L 324.5 659.5 L 324.5 672.5 L 311.5 672.5 Z M 283.5 659.5 L 296.5 659.5 L 296.5 672.5 L 283.5 672.5 Z M 526.5 659.5 L 539.5 659.5 L 539.5 672.5 L 526.5 672.5 Z M 499.5 659.5 L 512.5 659.5 L 512.5 672.5 L 499.5 672.5 Z M 554.5 659.5 L 567.5 659.5 L 567.5 672.5 L 554.5 672.5 Z M 1331.5 659.5 L 1344.5 659.5 L 1344.5 672.5 L 1331.5 672.5 Z M 1303.5 659.5 L 1316.5 659.5 L 1316.5 672.5 L 1303.5 672.5 Z M 1276.5 659.5 L 1289.5 659.5 L 1289.5 672.5 L 1276.5 672.5 Z M 1067.5 659.5 L 1080.5 659.5 L 1080.5 672.5 L 1067.5 672.5 Z M 1039.5 659.5 L 1053.5 659.5 L 1053.5 672.5 L 1039.5 672.5 Z M 1012.5 659.5 L 1025.5 659.5 L 1025.5 672.5 L 1012.5 672.5 Z M 732.5 659.5 L 745.5 659.5 L 745.5 672.5 L 732.5 672.5 Z M 704.5 659.5 L 717.5 659.5 L 717.5 672.5 L 704.5 672.5 Z M 676.5 659.5 L 689.5 659.5 L 689.5 672.5 L 676.5 672.5 Z M 211.5 696.5 L 225.5 696.5 L 225.5 709.5 L 211.5 709.5 Z M 1693.5 696.5 L 1706.5 696.5 L 1706.5 709.5 L 1693.5 709.5 Z M 1656.5 696.5 L 1669.5 696.5 L 1669.5 709.5 L 1656.5 709.5 Z M 1619.5 696.5 L 1632.5 696.5 L 1632.5 709.5 L 1619.5 709.5 Z M 1582.5 696.5 L 1595.5 696.5 L 1595.5 709.5 L 1582.5 709.5 Z M 1545.5 696.5 L 1558.5 696.5 L 1558.5 709.5 L 1545.5 709.5 Z M 1508.5 696.5 L 1521.5 696.5 L 1521.5 709.5 L 1508.5 709.5 Z M 1471.5 696.5 L 1484.5 696.5 L 1484.5 709.5 L 1471.5 709.5 Z M 1434.5 696.5 L 1447.5 696.5 L 1447.5 709.5 L 1434.5 709.5 Z M 1397.5 696.5 L 1410.5 696.5 L 1410.5 709.5 L 1397.5 709.5 Z M 1360.5 696.5 L 1373.5 696.5 L 1373.5 709.5 L 1360.5 709.5 Z M 1323.5 696.5 L 1336.5 696.5 L 1336.5 709.5 L 1323.5 709.5 Z M 1286.5 696.5 L 1299.5 696.5 L 1299.5 709.5 L 1286.5 709.5 Z M 1249.5 696.5 L 1262.5 696.5 L 1262.5 709.5 L 1249.5 709.5 Z M 1211.5 696.5 L 1225.5 696.5 L 1225.5 709.5 L 1211.5 709.5 Z M 1174.5 696.5 L 1188.5 696.5 L 1188.5 709.5 L 1174.5 709.5 Z M 1137.5 696.5 L 1151.5 696.5 L 1151.5 709.5 L 1137.5 709.5 Z M 1100.5 696.5 L 1113.5 696.5 L 1113.5 709.5 L 1100.5 709.5 Z M 1063.5 696.5 L 1076.5 696.5 L 1076.5 709.5 L 1063.5 709.5 Z M 1026.5 696.5 L 1039.5 696.5 L 1039.5 709.5 L 1026.5 709.5 Z M 989.5 696.5 L 1002.5 696.5 L 1002.5 709.5 L 989.5 709.5 Z M 952.5 696.5 L 965.5 696.5 L 965.5 709.5 L 952.5 709.5 Z M 915.5 696.5 L 928.5 696.5 L 928.5 709.5 L 915.5 709.5 Z M 878.5 696.5 L 891.5 696.5 L 891.5 709.5 L 878.5 709.5 Z M 841.5 696.5 L 854.5 696.5 L 854.5 709.5 L 841.5 709.5 Z M 804.5 696.5 L 817.5 696.5 L 817.5 709.5 L 804.5 709.5 Z M 767.5 696.5 L 780.5 696.5 L 780.5 709.5 L 767.5 709.5 Z M 730.5 696.5 L 743.5 696.5 L 743.5 709.5 L 730.5 709.5 Z M 693.5 696.5 L 706.5 696.5 L 706.5 709.5 L 693.5 709.5 Z M 656.5 696.5 L 669.5 696.5 L 669.5 709.5 L 656.5 709.5 Z M 619.5 696.5 L 632.5 696.5 L 632.5 709.5 L 619.5 709.5 Z M 582.5 696.5 L 595.5 696.5 L 595.5 709.5 L 582.5 709.5 Z M 545.5 696.5 L 558.5 696.5 L 558.5 709.5 L 545.5 709.5 Z M 508.5 696.5 L 521.5 696.5 L 521.5 709.5 L 508.5 709.5 Z M 471.5 696.5 L 484.5 696.5 L 484.5 709.5 L 471.5 709.5 Z M 434.5 696.5 L 447.5 696.5 L 447.5 709.5 L 434.5 709.5 Z M 397.5 696.5 L 410.5 696.5 L 410.5 709.5 L 397.5 709.5 Z M 360.5 696.5 L 373.5 696.5 L 373.5 709.5 L 360.5 709.5 Z M 323.5 696.5 L 336.5 696.5 L 336.5 709.5 L 323.5 709.5 Z M 286.5 696.5 L 299.5 696.5 L 299.5 709.5 L 286.5 709.5 Z M 248.5 696.5 L 262.5 696.5 L 262.5 709.5 L 248.5 709.5 Z M 248.5 696.5 "/>
 </clipPath>
-<image id="image503" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image532" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image503"/>
+  <use xlink:href="#image532"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface494">
+<g id="surface523">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -285,6 +285,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1722.886719 452.191406 L 1722.886719 468.550781 L 1720.53125 468.550781 L 1712.070312 455.289062 L 1712.070312 468.550781 L 1710.097656 468.550781 L 1710.097656 452.191406 L 1712.363281 452.191406 L 1720.914062 465.566406 L 1720.914062 452.191406 Z M 1722.886719 452.191406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1693 626 L 1706 626 M 1693 613 L 1706 613 M 1693 613 L 1693 626 M 1706 613 L 1706 626 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1693 626 L 1706 626 M 1693 613 L 1706 613 M 1706 626 L 1706 613 M 1693 626 L 1693 613 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 199 372 L 199 381 M 194 377 L 203 377 M 198 378 L 200 378 M 198 376 L 200 376 M 198 376 L 198 378 M 200 376 L 200 378 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.svg b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.svg
index 23868f2..e054511 100644
--- a/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.svg
+++ b/cells/sdfxtp/sky130_fd_sc_hvl__sdfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 302.5 L 1744.5 302.5 L 1744.5 564.5 L 174.5 564.5 Z M 174.5 302.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 207.5 335.5 L 1710.5 335.5 L 1710.5 352.5 L 207.5 352.5 Z M 207.5 335.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 207.5 335.5 L 1710.5 335.5 L 1710.5 352.5 L 207.5 352.5 Z M 1591.5 615.5 L 1695.5 615.5 L 1695.5 621.5 L 1591.5 621.5 Z M 1457.5 625.5 L 1561.5 625.5 L 1561.5 631.5 L 1457.5 631.5 Z M 1591.5 621.5 L 1695.5 621.5 L 1695.5 638.5 L 1591.5 638.5 Z M 1457.5 631.5 L 1561.5 631.5 L 1561.5 648.5 L 1457.5 648.5 Z M 1457.5 648.5 L 1561.5 648.5 L 1561.5 658.5 L 1457.5 658.5 Z M 1122.5 625.5 L 1230.5 625.5 L 1230.5 658.5 L 1122.5 658.5 Z M 1591.5 638.5 L 1695.5 638.5 L 1695.5 667.5 L 1591.5 667.5 Z M 873.5 658.5 L 1561.5 658.5 L 1561.5 669.5 L 873.5 669.5 Z M 738.5 658.5 L 842.5 658.5 L 842.5 671.5 L 738.5 671.5 Z M 224.5 658.5 L 708.5 658.5 L 708.5 671.5 L 224.5 671.5 Z M 1591.5 667.5 L 1695.5 667.5 L 1695.5 685.5 L 1591.5 685.5 Z M 873.5 669.5 L 1561.5 669.5 L 1561.5 686.5 L 873.5 686.5 Z M 738.5 671.5 L 842.5 671.5 L 842.5 688.5 L 738.5 688.5 Z M 224.5 671.5 L 708.5 671.5 L 708.5 688.5 L 224.5 688.5 Z M 1591.5 685.5 L 1695.5 685.5 L 1695.5 691.5 L 1591.5 691.5 Z M 873.5 686.5 L 1561.5 686.5 L 1561.5 701.5 L 873.5 701.5 Z M 738.5 688.5 L 842.5 688.5 L 842.5 701.5 L 738.5 701.5 Z M 224.5 688.5 L 708.5 688.5 L 708.5 701.5 L 224.5 701.5 Z M 224.5 688.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image406"/>
+  <use xlink:href="#image434"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 207.5 746.5 L 1710.5 746.5 L 1710.5 763.5 L 207.5 763.5 Z M 207.5 746.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1122.5 379.5 L 1150.5 379.5 L 1150.5 384.5 L 1122.5 384.5 Z M 614.5 379.5 L 641.5 379.5 L 641.5 386.5 L 614.5 386.5 Z M 1591.5 379.5 L 1618.5 379.5 L 1618.5 386.5 L 1591.5 386.5 Z M 826.5 379.5 L 852.5 379.5 L 852.5 386.5 L 826.5 386.5 Z M 1534.5 379.5 L 1561.5 379.5 L 1561.5 386.5 L 1534.5 386.5 Z M 691.5 379.5 L 718.5 379.5 L 718.5 386.5 L 691.5 386.5 Z M 748.5 379.5 L 775.5 379.5 L 775.5 386.5 L 748.5 386.5 Z M 1669.5 379.5 L 1695.5 379.5 L 1695.5 386.5 L 1669.5 386.5 Z M 1457.5 379.5 L 1484.5 379.5 L 1484.5 386.5 L 1457.5 386.5 Z M 1122.5 384.5 L 1150.5 384.5 L 1150.5 401.5 L 1122.5 401.5 Z M 1591.5 386.5 L 1618.5 386.5 L 1618.5 403.5 L 1591.5 403.5 Z M 1534.5 386.5 L 1561.5 386.5 L 1561.5 403.5 L 1534.5 403.5 Z M 614.5 386.5 L 641.5 386.5 L 641.5 403.5 L 614.5 403.5 Z M 748.5 386.5 L 775.5 386.5 L 775.5 403.5 L 748.5 403.5 Z M 1669.5 386.5 L 1695.5 386.5 L 1695.5 403.5 L 1669.5 403.5 Z M 1457.5 386.5 L 1484.5 386.5 L 1484.5 403.5 L 1457.5 403.5 Z M 826.5 386.5 L 852.5 386.5 L 852.5 403.5 L 826.5 403.5 Z M 691.5 386.5 L 718.5 386.5 L 718.5 403.5 L 691.5 403.5 Z M 614.5 403.5 L 641.5 403.5 L 641.5 413.5 L 614.5 413.5 Z M 1534.5 403.5 L 1561.5 403.5 L 1561.5 421.5 L 1534.5 421.5 Z M 1457.5 403.5 L 1484.5 403.5 L 1484.5 421.5 L 1457.5 421.5 Z M 223.5 413.5 L 251.5 413.5 L 251.5 425.5 L 223.5 425.5 Z M 302.5 413.5 L 330.5 413.5 L 330.5 425.5 L 302.5 425.5 Z M 452.5 413.5 L 481.5 413.5 L 481.5 425.5 L 452.5 425.5 Z M 1591.5 403.5 L 1618.5 403.5 L 1618.5 426.5 L 1591.5 426.5 Z M 1669.5 403.5 L 1695.5 403.5 L 1695.5 426.5 L 1669.5 426.5 Z M 603.5 413.5 L 641.5 413.5 L 641.5 432.5 L 603.5 432.5 Z M 826.5 403.5 L 852.5 403.5 L 852.5 432.5 L 826.5 432.5 Z M 748.5 403.5 L 775.5 403.5 L 775.5 432.5 L 748.5 432.5 Z M 691.5 403.5 L 718.5 403.5 L 718.5 432.5 L 691.5 432.5 Z M 1457.5 421.5 L 1484.5 421.5 L 1484.5 438.5 L 1457.5 438.5 Z M 1122.5 401.5 L 1150.5 401.5 L 1150.5 438.5 L 1122.5 438.5 Z M 1280.5 379.5 L 1308.5 379.5 L 1308.5 438.5 L 1280.5 438.5 Z M 1534.5 421.5 L 1561.5 421.5 L 1561.5 439.5 L 1534.5 439.5 Z M 1446.5 438.5 L 1484.5 438.5 L 1484.5 439.5 L 1446.5 439.5 Z M 1591.5 426.5 L 1618.5 426.5 L 1618.5 443.5 L 1591.5 443.5 Z M 1669.5 426.5 L 1695.5 426.5 L 1695.5 443.5 L 1669.5 443.5 Z M 223.5 425.5 L 251.5 425.5 L 251.5 443.5 L 223.5 443.5 Z M 452.5 425.5 L 481.5 425.5 L 481.5 443.5 L 452.5 443.5 Z M 302.5 425.5 L 330.5 425.5 L 330.5 443.5 L 302.5 443.5 Z M 603.5 432.5 L 641.5 432.5 L 641.5 449.5 L 603.5 449.5 Z M 826.5 432.5 L 852.5 432.5 L 852.5 449.5 L 826.5 449.5 Z M 748.5 432.5 L 775.5 432.5 L 775.5 449.5 L 748.5 449.5 Z M 691.5 432.5 L 718.5 432.5 L 718.5 449.5 L 691.5 449.5 Z M 960.5 438.5 L 988.5 438.5 L 988.5 451.5 L 960.5 451.5 Z M 883.5 438.5 L 909.5 438.5 L 909.5 451.5 L 883.5 451.5 Z M 1280.5 438.5 L 1320.5 438.5 L 1320.5 452.5 L 1280.5 452.5 Z M 603.5 449.5 L 641.5 449.5 L 641.5 455.5 L 603.5 455.5 Z M 826.5 449.5 L 852.5 449.5 L 852.5 455.5 L 826.5 455.5 Z M 691.5 449.5 L 718.5 449.5 L 718.5 455.5 L 691.5 455.5 Z M 748.5 449.5 L 775.5 449.5 L 775.5 455.5 L 748.5 455.5 Z M 452.5 443.5 L 481.5 443.5 L 481.5 455.5 L 452.5 455.5 Z M 302.5 443.5 L 330.5 443.5 L 330.5 455.5 L 302.5 455.5 Z M 223.5 443.5 L 251.5 443.5 L 251.5 455.5 L 223.5 455.5 Z M 381.5 413.5 L 402.5 413.5 L 402.5 455.5 L 381.5 455.5 Z M 531.5 413.5 L 552.5 413.5 L 552.5 455.5 L 531.5 455.5 Z M 1446.5 439.5 L 1484.5 439.5 L 1484.5 457.5 L 1446.5 457.5 Z M 1534.5 439.5 L 1561.5 439.5 L 1561.5 457.5 L 1534.5 457.5 Z M 1201.5 379.5 L 1229.5 379.5 L 1229.5 457.5 L 1201.5 457.5 Z M 1669.5 443.5 L 1695.5 443.5 L 1695.5 467.5 L 1669.5 467.5 Z M 1591.5 443.5 L 1618.5 443.5 L 1618.5 467.5 L 1591.5 467.5 Z M 883.5 451.5 L 909.5 451.5 L 909.5 468.5 L 883.5 468.5 Z M 960.5 451.5 L 988.5 451.5 L 988.5 468.5 L 960.5 468.5 Z M 1280.5 452.5 L 1320.5 452.5 L 1320.5 469.5 L 1280.5 469.5 Z M 1201.5 457.5 L 1229.5 457.5 L 1229.5 474.5 L 1201.5 474.5 Z M 1534.5 457.5 L 1561.5 457.5 L 1561.5 474.5 L 1534.5 474.5 Z M 1446.5 457.5 L 1484.5 457.5 L 1484.5 474.5 L 1446.5 474.5 Z M 883.5 468.5 L 909.5 468.5 L 909.5 480.5 L 883.5 480.5 Z M 1039.5 438.5 L 1060.5 438.5 L 1060.5 480.5 L 1039.5 480.5 Z M 1534.5 474.5 L 1561.5 474.5 L 1561.5 480.5 L 1534.5 480.5 Z M 1370.5 438.5 L 1395.5 438.5 L 1395.5 480.5 L 1370.5 480.5 Z M 1201.5 474.5 L 1229.5 474.5 L 1229.5 480.5 L 1201.5 480.5 Z M 960.5 468.5 L 988.5 468.5 L 988.5 480.5 L 960.5 480.5 Z M 1446.5 474.5 L 1484.5 474.5 L 1484.5 480.5 L 1446.5 480.5 Z M 1280.5 469.5 L 1320.5 469.5 L 1320.5 480.5 L 1280.5 480.5 Z M 1110.5 438.5 L 1150.5 438.5 L 1150.5 480.5 L 1110.5 480.5 Z M 1591.5 467.5 L 1618.5 467.5 L 1618.5 485.5 L 1591.5 485.5 Z M 1669.5 467.5 L 1695.5 467.5 L 1695.5 485.5 L 1669.5 485.5 Z M 1591.5 485.5 L 1618.5 485.5 L 1618.5 508.5 L 1591.5 508.5 Z M 1669.5 485.5 L 1695.5 485.5 L 1695.5 508.5 L 1669.5 508.5 Z M 1669.5 508.5 L 1695.5 508.5 L 1695.5 525.5 L 1669.5 525.5 Z M 1591.5 508.5 L 1618.5 508.5 L 1618.5 525.5 L 1591.5 525.5 Z M 1669.5 525.5 L 1695.5 525.5 L 1695.5 531.5 L 1669.5 531.5 Z M 1591.5 525.5 L 1618.5 525.5 L 1618.5 531.5 L 1591.5 531.5 Z M 207.5 746.5 L 1710.5 746.5 L 1710.5 763.5 L 207.5 763.5 Z M 207.5 746.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image435"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1618.5 615.5 L 1669.5 615.5 L 1669.5 691.5 L 1618.5 691.5 Z M 480.5 658.5 L 531.5 658.5 L 531.5 701.5 L 480.5 701.5 Z M 401.5 658.5 L 452.5 658.5 L 452.5 701.5 L 401.5 701.5 Z M 1395.5 658.5 L 1446.5 658.5 L 1446.5 701.5 L 1395.5 701.5 Z M 1324.5 658.5 L 1374.5 658.5 L 1374.5 701.5 L 1324.5 701.5 Z M 1241.5 658.5 L 1291.5 658.5 L 1291.5 701.5 L 1241.5 701.5 Z M 552.5 658.5 L 602.5 658.5 L 602.5 701.5 L 552.5 701.5 Z M 1060.5 658.5 L 1110.5 658.5 L 1110.5 701.5 L 1060.5 701.5 Z M 988.5 658.5 L 1039.5 658.5 L 1039.5 701.5 L 988.5 701.5 Z M 909.5 658.5 L 960.5 658.5 L 960.5 701.5 L 909.5 701.5 Z M 765.5 658.5 L 815.5 658.5 L 815.5 701.5 L 765.5 701.5 Z M 631.5 658.5 L 681.5 658.5 L 681.5 701.5 L 631.5 701.5 Z M 251.5 658.5 L 301.5 658.5 L 301.5 701.5 L 251.5 701.5 Z M 330.5 658.5 L 380.5 658.5 L 380.5 701.5 L 330.5 701.5 Z M 1484.5 625.5 L 1534.5 625.5 L 1534.5 701.5 L 1484.5 701.5 Z M 1150.5 625.5 L 1201.5 625.5 L 1201.5 701.5 L 1150.5 701.5 Z M 1150.5 625.5 "/>
 </clipPath>
-<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image408"/>
+  <use xlink:href="#image436"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 641.5 379.5 L 691.5 379.5 L 691.5 455.5 L 641.5 455.5 Z M 481.5 413.5 L 531.5 413.5 L 531.5 455.5 L 481.5 455.5 Z M 402.5 413.5 L 452.5 413.5 L 452.5 455.5 L 402.5 455.5 Z M 251.5 413.5 L 302.5 413.5 L 302.5 455.5 L 251.5 455.5 Z M 552.5 413.5 L 603.5 413.5 L 603.5 455.5 L 552.5 455.5 Z M 775.5 379.5 L 826.5 379.5 L 826.5 455.5 L 775.5 455.5 Z M 330.5 413.5 L 381.5 413.5 L 381.5 455.5 L 330.5 455.5 Z M 1150.5 379.5 L 1201.5 379.5 L 1201.5 480.5 L 1150.5 480.5 Z M 1229.5 379.5 L 1280.5 379.5 L 1280.5 480.5 L 1229.5 480.5 Z M 1320.5 438.5 L 1370.5 438.5 L 1370.5 480.5 L 1320.5 480.5 Z M 1060.5 438.5 L 1110.5 438.5 L 1110.5 480.5 L 1060.5 480.5 Z M 1484.5 379.5 L 1534.5 379.5 L 1534.5 480.5 L 1484.5 480.5 Z M 1395.5 438.5 L 1446.5 438.5 L 1446.5 480.5 L 1395.5 480.5 Z M 909.5 438.5 L 960.5 438.5 L 960.5 480.5 L 909.5 480.5 Z M 988.5 438.5 L 1039.5 438.5 L 1039.5 480.5 L 988.5 480.5 Z M 1618.5 379.5 L 1669.5 379.5 L 1669.5 531.5 L 1618.5 531.5 Z M 1618.5 379.5 "/>
 </clipPath>
-<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image409"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 223.5 335.5 L 240.5 335.5 L 240.5 352.5 L 223.5 352.5 Z M 1678.5 335.5 L 1695.5 335.5 L 1695.5 352.5 L 1678.5 352.5 Z M 1629.5 335.5 L 1646.5 335.5 L 1646.5 352.5 L 1629.5 352.5 Z M 1581.5 335.5 L 1598.5 335.5 L 1598.5 352.5 L 1581.5 352.5 Z M 1532.5 335.5 L 1549.5 335.5 L 1549.5 352.5 L 1532.5 352.5 Z M 1484.5 335.5 L 1501.5 335.5 L 1501.5 352.5 L 1484.5 352.5 Z M 1435.5 335.5 L 1452.5 335.5 L 1452.5 352.5 L 1435.5 352.5 Z M 1387.5 335.5 L 1404.5 335.5 L 1404.5 352.5 L 1387.5 352.5 Z M 1338.5 335.5 L 1355.5 335.5 L 1355.5 352.5 L 1338.5 352.5 Z M 1290.5 335.5 L 1307.5 335.5 L 1307.5 352.5 L 1290.5 352.5 Z M 1241.5 335.5 L 1258.5 335.5 L 1258.5 352.5 L 1241.5 352.5 Z M 1193.5 335.5 L 1210.5 335.5 L 1210.5 352.5 L 1193.5 352.5 Z M 1144.5 335.5 L 1161.5 335.5 L 1161.5 352.5 L 1144.5 352.5 Z M 1096.5 335.5 L 1113.5 335.5 L 1113.5 352.5 L 1096.5 352.5 Z M 1047.5 335.5 L 1064.5 335.5 L 1064.5 352.5 L 1047.5 352.5 Z M 999.5 335.5 L 1016.5 335.5 L 1016.5 352.5 L 999.5 352.5 Z M 950.5 335.5 L 968.5 335.5 L 968.5 352.5 L 950.5 352.5 Z M 902.5 335.5 L 919.5 335.5 L 919.5 352.5 L 902.5 352.5 Z M 853.5 335.5 L 871.5 335.5 L 871.5 352.5 L 853.5 352.5 Z M 805.5 335.5 L 822.5 335.5 L 822.5 352.5 L 805.5 352.5 Z M 756.5 335.5 L 774.5 335.5 L 774.5 352.5 L 756.5 352.5 Z M 708.5 335.5 L 725.5 335.5 L 725.5 352.5 L 708.5 352.5 Z M 659.5 335.5 L 677.5 335.5 L 677.5 352.5 L 659.5 352.5 Z M 611.5 335.5 L 628.5 335.5 L 628.5 352.5 L 611.5 352.5 Z M 562.5 335.5 L 580.5 335.5 L 580.5 352.5 L 562.5 352.5 Z M 514.5 335.5 L 531.5 335.5 L 531.5 352.5 L 514.5 352.5 Z M 465.5 335.5 L 483.5 335.5 L 483.5 352.5 L 465.5 352.5 Z M 417.5 335.5 L 434.5 335.5 L 434.5 352.5 L 417.5 352.5 Z M 369.5 335.5 L 386.5 335.5 L 386.5 352.5 L 369.5 352.5 Z M 320.5 335.5 L 337.5 335.5 L 337.5 352.5 L 320.5 352.5 Z M 272.5 335.5 L 289.5 335.5 L 289.5 352.5 L 272.5 352.5 Z M 1123.5 380.5 L 1140.5 380.5 L 1140.5 384.5 L 1123.5 384.5 Z M 747.5 384.5 L 764.5 384.5 L 764.5 386.5 L 747.5 386.5 Z M 1681.5 384.5 L 1698.5 384.5 L 1698.5 386.5 L 1681.5 386.5 Z M 1457.5 384.5 L 1474.5 384.5 L 1474.5 386.5 L 1457.5 386.5 Z M 614.5 384.5 L 631.5 384.5 L 631.5 386.5 L 614.5 386.5 Z M 1195.5 380.5 L 1212.5 380.5 L 1212.5 398.5 L 1195.5 398.5 Z M 1159.5 380.5 L 1176.5 380.5 L 1176.5 398.5 L 1159.5 398.5 Z M 1123.5 384.5 L 1140.5 384.5 L 1140.5 398.5 L 1123.5 398.5 Z M 1645.5 384.5 L 1662.5 384.5 L 1662.5 401.5 L 1645.5 401.5 Z M 302.5 384.5 L 320.5 384.5 L 320.5 401.5 L 302.5 401.5 Z M 1493.5 384.5 L 1510.5 384.5 L 1510.5 401.5 L 1493.5 401.5 Z M 339.5 384.5 L 356.5 384.5 L 356.5 401.5 L 339.5 401.5 Z M 784.5 384.5 L 801.5 384.5 L 801.5 401.5 L 784.5 401.5 Z M 375.5 384.5 L 392.5 384.5 L 392.5 401.5 L 375.5 401.5 Z M 1421.5 384.5 L 1438.5 384.5 L 1438.5 401.5 L 1421.5 401.5 Z M 578.5 384.5 L 595.5 384.5 L 595.5 401.5 L 578.5 401.5 Z M 650.5 384.5 L 668.5 384.5 L 668.5 401.5 L 650.5 401.5 Z M 1457.5 386.5 L 1474.5 386.5 L 1474.5 401.5 L 1457.5 401.5 Z M 1681.5 386.5 L 1698.5 386.5 L 1698.5 401.5 L 1681.5 401.5 Z M 747.5 386.5 L 764.5 386.5 L 764.5 401.5 L 747.5 401.5 Z M 614.5 386.5 L 631.5 386.5 L 631.5 401.5 L 614.5 401.5 Z M 606.5 698.5 L 624.5 698.5 L 624.5 715.5 L 606.5 715.5 Z M 1681.5 698.5 L 1698.5 698.5 L 1698.5 715.5 L 1681.5 715.5 Z M 1645.5 698.5 L 1662.5 698.5 L 1662.5 715.5 L 1645.5 715.5 Z M 1493.5 698.5 L 1510.5 698.5 L 1510.5 715.5 L 1493.5 715.5 Z M 1457.5 698.5 L 1474.5 698.5 L 1474.5 715.5 L 1457.5 715.5 Z M 1421.5 698.5 L 1438.5 698.5 L 1438.5 715.5 L 1421.5 715.5 Z M 570.5 698.5 L 587.5 698.5 L 587.5 715.5 L 570.5 715.5 Z M 375.5 698.5 L 392.5 698.5 L 392.5 715.5 L 375.5 715.5 Z M 338.5 698.5 L 355.5 698.5 L 355.5 715.5 L 338.5 715.5 Z M 302.5 698.5 L 319.5 698.5 L 319.5 715.5 L 302.5 715.5 Z M 1160.5 698.5 L 1177.5 698.5 L 1177.5 715.5 L 1160.5 715.5 Z M 1124.5 698.5 L 1141.5 698.5 L 1141.5 715.5 L 1124.5 715.5 Z M 1087.5 698.5 L 1104.5 698.5 L 1104.5 715.5 L 1087.5 715.5 Z M 774.5 698.5 L 791.5 698.5 L 791.5 715.5 L 774.5 715.5 Z M 737.5 698.5 L 754.5 698.5 L 754.5 715.5 L 737.5 715.5 Z M 643.5 698.5 L 660.5 698.5 L 660.5 715.5 L 643.5 715.5 Z M 223.5 746.5 L 240.5 746.5 L 240.5 763.5 L 223.5 763.5 Z M 1678.5 746.5 L 1695.5 746.5 L 1695.5 763.5 L 1678.5 763.5 Z M 1629.5 746.5 L 1646.5 746.5 L 1646.5 763.5 L 1629.5 763.5 Z M 1581.5 746.5 L 1598.5 746.5 L 1598.5 763.5 L 1581.5 763.5 Z M 1532.5 746.5 L 1549.5 746.5 L 1549.5 763.5 L 1532.5 763.5 Z M 1484.5 746.5 L 1501.5 746.5 L 1501.5 763.5 L 1484.5 763.5 Z M 1435.5 746.5 L 1452.5 746.5 L 1452.5 763.5 L 1435.5 763.5 Z M 1387.5 746.5 L 1404.5 746.5 L 1404.5 763.5 L 1387.5 763.5 Z M 1338.5 746.5 L 1355.5 746.5 L 1355.5 763.5 L 1338.5 763.5 Z M 1290.5 746.5 L 1307.5 746.5 L 1307.5 763.5 L 1290.5 763.5 Z M 1241.5 746.5 L 1258.5 746.5 L 1258.5 763.5 L 1241.5 763.5 Z M 1193.5 746.5 L 1210.5 746.5 L 1210.5 763.5 L 1193.5 763.5 Z M 1144.5 746.5 L 1161.5 746.5 L 1161.5 763.5 L 1144.5 763.5 Z M 1096.5 746.5 L 1113.5 746.5 L 1113.5 763.5 L 1096.5 763.5 Z M 1047.5 746.5 L 1064.5 746.5 L 1064.5 763.5 L 1047.5 763.5 Z M 999.5 746.5 L 1016.5 746.5 L 1016.5 763.5 L 999.5 763.5 Z M 950.5 746.5 L 968.5 746.5 L 968.5 763.5 L 950.5 763.5 Z M 902.5 746.5 L 919.5 746.5 L 919.5 763.5 L 902.5 763.5 Z M 853.5 746.5 L 871.5 746.5 L 871.5 763.5 L 853.5 763.5 Z M 805.5 746.5 L 822.5 746.5 L 822.5 763.5 L 805.5 763.5 Z M 756.5 746.5 L 774.5 746.5 L 774.5 763.5 L 756.5 763.5 Z M 708.5 746.5 L 725.5 746.5 L 725.5 763.5 L 708.5 763.5 Z M 659.5 746.5 L 677.5 746.5 L 677.5 763.5 L 659.5 763.5 Z M 611.5 746.5 L 628.5 746.5 L 628.5 763.5 L 611.5 763.5 Z M 562.5 746.5 L 580.5 746.5 L 580.5 763.5 L 562.5 763.5 Z M 514.5 746.5 L 531.5 746.5 L 531.5 763.5 L 514.5 763.5 Z M 465.5 746.5 L 483.5 746.5 L 483.5 763.5 L 465.5 763.5 Z M 417.5 746.5 L 434.5 746.5 L 434.5 763.5 L 417.5 763.5 Z M 369.5 746.5 L 386.5 746.5 L 386.5 763.5 L 369.5 763.5 Z M 320.5 746.5 L 337.5 746.5 L 337.5 763.5 L 320.5 763.5 Z M 272.5 746.5 L 289.5 746.5 L 289.5 763.5 L 272.5 763.5 Z M 272.5 746.5 "/>
 </clipPath>
-<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image410"/>
+  <use xlink:href="#image438"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface401">
+<g id="surface429">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -232,6 +232,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1649.089844 595.792969 L 1647.703125 597.5 L 1644.613281 594.9375 L 1643.730469 595.410156 L 1642.84375 595.761719 L 1641.933594 596.058594 L 1640.960938 596.261719 L 1639.988281 596.378906 L 1638.988281 596.441406 L 1637.632812 596.351562 L 1636.367188 596.144531 L 1635.1875 595.792969 L 1634.066406 595.320312 L 1633.007812 594.703125 L 1632.066406 593.90625 L 1631.210938 593.050781 L 1630.476562 592.082031 L 1629.886719 591.019531 L 1629.386719 589.871094 L 1629.003906 588.632812 L 1628.765625 587.28125 L 1628.707031 586.957031 L 1628.679688 586.601562 L 1628.648438 586.277344 L 1628.621094 585.925781 L 1628.621094 585.1875 L 1628.679688 583.714844 L 1628.882812 582.300781 L 1629.207031 581.007812 L 1629.679688 579.769531 L 1630.269531 578.621094 L 1631.035156 577.558594 L 1631.800781 576.707031 L 1632.683594 575.941406 L 1633.65625 575.292969 L 1634.6875 574.792969 L 1635.804688 574.378906 L 1637.042969 574.085938 L 1637.335938 574.054688 L 1637.660156 574.027344 L 1637.984375 573.996094 L 1638.308594 573.96875 L 1638.632812 573.96875 L 1638.988281 573.9375 L 1640.3125 574.027344 L 1641.578125 574.230469 L 1642.757812 574.585938 L 1643.875 575.058594 L 1644.9375 575.675781 L 1645.90625 576.441406 L 1646.734375 577.324219 L 1647.46875 578.265625 L 1648.058594 579.296875 L 1648.558594 580.445312 L 1648.941406 581.683594 L 1649.207031 582.980469 L 1649.234375 583.363281 L 1649.265625 583.714844 L 1649.296875 584.070312 L 1649.324219 584.421875 L 1649.324219 584.777344 L 1649.355469 585.128906 L 1649.265625 586.777344 L 1649 588.339844 L 1648.589844 589.785156 L 1648 591.136719 L 1647.234375 592.375 L 1646.320312 593.523438 Z M 1641.667969 589.722656 L 1644.289062 591.875 L 1644.996094 590.992188 L 1645.585938 589.988281 L 1646.027344 588.898438 L 1646.351562 587.75 L 1646.527344 586.515625 L 1646.613281 585.160156 L 1646.554688 583.921875 L 1646.378906 582.742188 L 1646.085938 581.652344 L 1645.703125 580.652344 L 1645.203125 579.710938 L 1644.582031 578.855469 L 1643.875 578.148438 L 1643.140625 577.558594 L 1642.316406 577.089844 L 1641.429688 576.734375 L 1640.460938 576.5 L 1639.457031 576.351562 L 1638.988281 576.351562 L 1637.925781 576.441406 L 1636.925781 576.617188 L 1635.984375 576.914062 L 1635.128906 577.355469 L 1634.332031 577.914062 L 1633.625 578.589844 L 1632.949219 579.386719 L 1632.417969 580.269531 L 1631.976562 581.242188 L 1631.652344 582.300781 L 1631.445312 583.449219 L 1631.359375 584.6875 L 1631.359375 585.1875 L 1631.386719 586.484375 L 1631.566406 587.664062 L 1631.859375 588.753906 L 1632.242188 589.785156 L 1632.773438 590.726562 L 1633.421875 591.550781 L 1634.097656 592.285156 L 1634.863281 592.875 L 1635.6875 593.347656 L 1636.570312 593.671875 L 1637.542969 593.90625 L 1638.574219 593.996094 L 1638.632812 594.023438 L 1639.488281 594.023438 L 1640.046875 593.964844 L 1640.605469 593.847656 L 1641.136719 593.730469 L 1641.667969 593.554688 L 1642.226562 593.316406 L 1642.257812 593.316406 L 1642.316406 593.289062 L 1642.34375 593.257812 L 1642.402344 593.257812 L 1642.433594 593.230469 L 1642.492188 593.199219 L 1640.3125 591.375 Z M 1641.667969 589.722656 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1629 501 L 1646 501 M 1629 484 L 1646 484 M 1629 484 L 1629 501 M 1646 484 L 1646 501 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1629 501 L 1646 501 M 1629 484 L 1646 484 M 1646 501 L 1646 484 M 1629 501 L 1629 484 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 319 L 207 328 M 202 324 L 211 324 M 206 325 L 208 325 M 206 323 L 208 323 M 206 323 L 206 325 M 208 323 L 208 325 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.svg b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.svg
index 2c52100..a21a72e 100644
--- a/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.svg
+++ b/cells/sdlclkp/sky130_fd_sc_hvl__sdlclkp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 226.5 L 1744.5 226.5 L 1744.5 575.5 L 175.5 575.5 Z M 175.5 226.5 "/>
 </clipPath>
-<image id="image549" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image576" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image549"/>
+  <use xlink:href="#image576"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 219.5 270.5 L 1699.5 270.5 L 1699.5 293.5 L 219.5 293.5 Z M 219.5 270.5 "/>
 </clipPath>
-<image id="image550" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image577" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image550"/>
+  <use xlink:href="#image577"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 219.5 270.5 L 1699.5 270.5 L 1699.5 293.5 L 219.5 293.5 Z M 1529.5 655.5 L 1667.5 655.5 L 1667.5 657.5 L 1529.5 657.5 Z M 1312.5 657.5 L 1667.5 657.5 L 1667.5 675.5 L 1312.5 675.5 Z M 934.5 665.5 L 1272.5 665.5 L 1272.5 682.5 L 934.5 682.5 Z M 258.5 665.5 L 610.5 665.5 L 610.5 682.5 L 258.5 682.5 Z M 1312.5 675.5 L 1667.5 675.5 L 1667.5 698.5 L 1312.5 698.5 Z M 651.5 683.5 L 893.5 683.5 L 893.5 700.5 L 651.5 700.5 Z M 934.5 682.5 L 1272.5 682.5 L 1272.5 704.5 L 934.5 704.5 Z M 258.5 682.5 L 610.5 682.5 L 610.5 704.5 L 258.5 704.5 Z M 1312.5 698.5 L 1667.5 698.5 L 1667.5 713.5 L 1312.5 713.5 Z M 934.5 704.5 L 1272.5 704.5 L 1272.5 721.5 L 934.5 721.5 Z M 258.5 704.5 L 610.5 704.5 L 610.5 721.5 L 258.5 721.5 Z M 651.5 700.5 L 893.5 700.5 L 893.5 722.5 L 651.5 722.5 Z M 1529.5 713.5 L 1667.5 713.5 L 1667.5 725.5 L 1529.5 725.5 Z M 651.5 722.5 L 893.5 722.5 L 893.5 739.5 L 651.5 739.5 Z M 1529.5 725.5 L 1667.5 725.5 L 1667.5 748.5 L 1529.5 748.5 Z M 1529.5 748.5 L 1667.5 748.5 L 1667.5 756.5 L 1529.5 756.5 Z M 1529.5 748.5 "/>
 </clipPath>
-<image id="image551" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image578" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image551"/>
+  <use xlink:href="#image578"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 219.5 816.5 L 1699.5 816.5 L 1699.5 839.5 L 219.5 839.5 Z M 219.5 816.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image550"/>
+  <use xlink:href="#image577"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1529.5 329.5 L 1565.5 329.5 L 1565.5 338.5 L 1529.5 338.5 Z M 1632.5 329.5 L 1667.5 329.5 L 1667.5 338.5 L 1632.5 338.5 Z M 1632.5 338.5 L 1667.5 338.5 L 1667.5 360.5 L 1632.5 360.5 Z M 1529.5 338.5 L 1565.5 338.5 L 1565.5 360.5 L 1529.5 360.5 Z M 1632.5 360.5 L 1667.5 360.5 L 1667.5 383.5 L 1632.5 383.5 Z M 1529.5 360.5 L 1565.5 360.5 L 1565.5 383.5 L 1529.5 383.5 Z M 1632.5 383.5 L 1667.5 383.5 L 1667.5 406.5 L 1632.5 406.5 Z M 1529.5 383.5 L 1565.5 383.5 L 1565.5 406.5 L 1529.5 406.5 Z M 753.5 421.5 L 791.5 421.5 L 791.5 426.5 L 753.5 426.5 Z M 651.5 421.5 L 686.5 421.5 L 686.5 429.5 L 651.5 429.5 Z M 258.5 421.5 L 299.5 421.5 L 299.5 429.5 L 258.5 429.5 Z M 575.5 421.5 L 610.5 421.5 L 610.5 429.5 L 575.5 429.5 Z M 470.5 421.5 L 508.5 421.5 L 508.5 429.5 L 470.5 429.5 Z M 858.5 421.5 L 893.5 421.5 L 893.5 429.5 L 858.5 429.5 Z M 1529.5 406.5 L 1565.5 406.5 L 1565.5 430.5 L 1529.5 430.5 Z M 1312.5 430.5 L 1347.5 430.5 L 1347.5 438.5 L 1312.5 438.5 Z M 1414.5 430.5 L 1452.5 430.5 L 1452.5 442.5 L 1414.5 442.5 Z M 753.5 426.5 L 791.5 426.5 L 791.5 449.5 L 753.5 449.5 Z M 858.5 429.5 L 893.5 429.5 L 893.5 452.5 L 858.5 452.5 Z M 258.5 429.5 L 299.5 429.5 L 299.5 452.5 L 258.5 452.5 Z M 470.5 429.5 L 508.5 429.5 L 508.5 452.5 L 470.5 452.5 Z M 575.5 429.5 L 610.5 429.5 L 610.5 452.5 L 575.5 452.5 Z M 651.5 429.5 L 686.5 429.5 L 686.5 452.5 L 651.5 452.5 Z M 1632.5 406.5 L 1667.5 406.5 L 1667.5 454.5 L 1632.5 454.5 Z M 1519.5 430.5 L 1565.5 430.5 L 1565.5 454.5 L 1519.5 454.5 Z M 1312.5 438.5 L 1347.5 438.5 L 1347.5 461.5 L 1312.5 461.5 Z M 1414.5 442.5 L 1452.5 442.5 L 1452.5 465.5 L 1414.5 465.5 Z M 753.5 449.5 L 791.5 449.5 L 791.5 472.5 L 753.5 472.5 Z M 1519.5 454.5 L 1565.5 454.5 L 1565.5 477.5 L 1519.5 477.5 Z M 1632.5 454.5 L 1667.5 454.5 L 1667.5 477.5 L 1632.5 477.5 Z M 1131.5 465.5 L 1169.5 465.5 L 1169.5 482.5 L 1131.5 482.5 Z M 1236.5 465.5 L 1272.5 465.5 L 1272.5 482.5 L 1236.5 482.5 Z M 934.5 465.5 L 969.5 465.5 L 969.5 482.5 L 934.5 482.5 Z M 651.5 452.5 L 686.5 452.5 L 686.5 490.5 L 651.5 490.5 Z M 470.5 452.5 L 508.5 452.5 L 508.5 490.5 L 470.5 490.5 Z M 858.5 452.5 L 893.5 452.5 L 893.5 490.5 L 858.5 490.5 Z M 258.5 452.5 L 299.5 452.5 L 299.5 490.5 L 258.5 490.5 Z M 575.5 452.5 L 610.5 452.5 L 610.5 490.5 L 575.5 490.5 Z M 753.5 472.5 L 791.5 472.5 L 791.5 494.5 L 753.5 494.5 Z M 1312.5 461.5 L 1347.5 461.5 L 1347.5 500.5 L 1312.5 500.5 Z M 1519.5 477.5 L 1565.5 477.5 L 1565.5 500.5 L 1519.5 500.5 Z M 1632.5 477.5 L 1667.5 477.5 L 1667.5 500.5 L 1632.5 500.5 Z M 1414.5 465.5 L 1452.5 465.5 L 1452.5 500.5 L 1414.5 500.5 Z M 1236.5 482.5 L 1272.5 482.5 L 1272.5 505.5 L 1236.5 505.5 Z M 934.5 482.5 L 969.5 482.5 L 969.5 505.5 L 934.5 505.5 Z M 1131.5 482.5 L 1169.5 482.5 L 1169.5 505.5 L 1131.5 505.5 Z M 258.5 490.5 L 299.5 490.5 L 299.5 513.5 L 258.5 513.5 Z M 575.5 490.5 L 610.5 490.5 L 610.5 513.5 L 575.5 513.5 Z M 858.5 490.5 L 893.5 490.5 L 893.5 513.5 L 858.5 513.5 Z M 470.5 490.5 L 508.5 490.5 L 508.5 513.5 L 470.5 513.5 Z M 651.5 490.5 L 686.5 490.5 L 686.5 513.5 L 651.5 513.5 Z M 1036.5 465.5 L 1064.5 465.5 L 1064.5 521.5 L 1036.5 521.5 Z M 1236.5 505.5 L 1272.5 505.5 L 1272.5 521.5 L 1236.5 521.5 Z M 575.5 513.5 L 610.5 513.5 L 610.5 521.5 L 575.5 521.5 Z M 651.5 513.5 L 686.5 513.5 L 686.5 521.5 L 651.5 521.5 Z M 258.5 513.5 L 299.5 513.5 L 299.5 521.5 L 258.5 521.5 Z M 858.5 513.5 L 893.5 513.5 L 893.5 521.5 L 858.5 521.5 Z M 470.5 513.5 L 508.5 513.5 L 508.5 521.5 L 470.5 521.5 Z M 1131.5 505.5 L 1169.5 505.5 L 1169.5 521.5 L 1131.5 521.5 Z M 934.5 505.5 L 969.5 505.5 L 969.5 521.5 L 934.5 521.5 Z M 753.5 494.5 L 791.5 494.5 L 791.5 521.5 L 753.5 521.5 Z M 366.5 421.5 L 403.5 421.5 L 403.5 521.5 L 366.5 521.5 Z M 1414.5 500.5 L 1452.5 500.5 L 1452.5 523.5 L 1414.5 523.5 Z M 1312.5 500.5 L 1347.5 500.5 L 1347.5 523.5 L 1312.5 523.5 Z M 1519.5 500.5 L 1565.5 500.5 L 1565.5 523.5 L 1519.5 523.5 Z M 1632.5 500.5 L 1667.5 500.5 L 1667.5 523.5 L 1632.5 523.5 Z M 1519.5 523.5 L 1565.5 523.5 L 1565.5 531.5 L 1519.5 531.5 Z M 1312.5 523.5 L 1347.5 523.5 L 1347.5 531.5 L 1312.5 531.5 Z M 1632.5 523.5 L 1667.5 523.5 L 1667.5 531.5 L 1632.5 531.5 Z M 1414.5 523.5 L 1452.5 523.5 L 1452.5 531.5 L 1414.5 531.5 Z M 219.5 816.5 L 1699.5 816.5 L 1699.5 839.5 L 219.5 839.5 Z M 219.5 816.5 "/>
 </clipPath>
-<image id="image552" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image579" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image552"/>
+  <use xlink:href="#image579"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1452.5 657.5 L 1519.5 657.5 L 1519.5 713.5 L 1452.5 713.5 Z M 1347.5 657.5 L 1414.5 657.5 L 1414.5 713.5 L 1347.5 713.5 Z M 403.5 665.5 L 470.5 665.5 L 470.5 721.5 L 403.5 721.5 Z M 1169.5 665.5 L 1236.5 665.5 L 1236.5 721.5 L 1169.5 721.5 Z M 299.5 665.5 L 366.5 665.5 L 366.5 721.5 L 299.5 721.5 Z M 1064.5 665.5 L 1131.5 665.5 L 1131.5 721.5 L 1064.5 721.5 Z M 508.5 665.5 L 575.5 665.5 L 575.5 721.5 L 508.5 721.5 Z M 969.5 665.5 L 1036.5 665.5 L 1036.5 721.5 L 969.5 721.5 Z M 686.5 683.5 L 753.5 683.5 L 753.5 739.5 L 686.5 739.5 Z M 791.5 683.5 L 858.5 683.5 L 858.5 739.5 L 791.5 739.5 Z M 1565.5 655.5 L 1632.5 655.5 L 1632.5 756.5 L 1565.5 756.5 Z M 1565.5 655.5 "/>
 </clipPath>
-<image id="image553" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image580" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image553"/>
+  <use xlink:href="#image580"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 403.5 421.5 L 470.5 421.5 L 470.5 521.5 L 403.5 521.5 Z M 1064.5 465.5 L 1131.5 465.5 L 1131.5 521.5 L 1064.5 521.5 Z M 969.5 465.5 L 1036.5 465.5 L 1036.5 521.5 L 969.5 521.5 Z M 686.5 421.5 L 753.5 421.5 L 753.5 521.5 L 686.5 521.5 Z M 1169.5 465.5 L 1236.5 465.5 L 1236.5 521.5 L 1169.5 521.5 Z M 791.5 421.5 L 858.5 421.5 L 858.5 521.5 L 791.5 521.5 Z M 508.5 421.5 L 575.5 421.5 L 575.5 521.5 L 508.5 521.5 Z M 299.5 421.5 L 366.5 421.5 L 366.5 521.5 L 299.5 521.5 Z M 1565.5 329.5 L 1632.5 329.5 L 1632.5 531.5 L 1565.5 531.5 Z M 1347.5 430.5 L 1414.5 430.5 L 1414.5 531.5 L 1347.5 531.5 Z M 1452.5 430.5 L 1519.5 430.5 L 1519.5 531.5 L 1452.5 531.5 Z M 1452.5 430.5 "/>
 </clipPath>
-<image id="image554" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image581" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image554"/>
+  <use xlink:href="#image581"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 240.5 270.5 L 262.5 270.5 L 262.5 293.5 L 240.5 293.5 Z M 1656.5 270.5 L 1679.5 270.5 L 1679.5 293.5 L 1656.5 293.5 Z M 1591.5 270.5 L 1614.5 270.5 L 1614.5 293.5 L 1591.5 293.5 Z M 1527.5 270.5 L 1550.5 270.5 L 1550.5 293.5 L 1527.5 293.5 Z M 1463.5 270.5 L 1486.5 270.5 L 1486.5 293.5 L 1463.5 293.5 Z M 1398.5 270.5 L 1421.5 270.5 L 1421.5 293.5 L 1398.5 293.5 Z M 1334.5 270.5 L 1357.5 270.5 L 1357.5 293.5 L 1334.5 293.5 Z M 1270.5 270.5 L 1292.5 270.5 L 1292.5 293.5 L 1270.5 293.5 Z M 1205.5 270.5 L 1228.5 270.5 L 1228.5 293.5 L 1205.5 293.5 Z M 1141.5 270.5 L 1164.5 270.5 L 1164.5 293.5 L 1141.5 293.5 Z M 1076.5 270.5 L 1099.5 270.5 L 1099.5 293.5 L 1076.5 293.5 Z M 1012.5 270.5 L 1035.5 270.5 L 1035.5 293.5 L 1012.5 293.5 Z M 948.5 270.5 L 971.5 270.5 L 971.5 293.5 L 948.5 293.5 Z M 883.5 270.5 L 906.5 270.5 L 906.5 293.5 L 883.5 293.5 Z M 819.5 270.5 L 842.5 270.5 L 842.5 293.5 L 819.5 293.5 Z M 755.5 270.5 L 777.5 270.5 L 777.5 293.5 L 755.5 293.5 Z M 690.5 270.5 L 713.5 270.5 L 713.5 293.5 L 690.5 293.5 Z M 626.5 270.5 L 649.5 270.5 L 649.5 293.5 L 626.5 293.5 Z M 561.5 270.5 L 584.5 270.5 L 584.5 293.5 L 561.5 293.5 Z M 497.5 270.5 L 520.5 270.5 L 520.5 293.5 L 497.5 293.5 Z M 433.5 270.5 L 456.5 270.5 L 456.5 293.5 L 433.5 293.5 Z M 368.5 270.5 L 391.5 270.5 L 391.5 293.5 L 368.5 293.5 Z M 304.5 270.5 L 327.5 270.5 L 327.5 293.5 L 304.5 293.5 Z M 663.5 320.5 L 686.5 320.5 L 686.5 343.5 L 663.5 343.5 Z M 1447.5 320.5 L 1469.5 320.5 L 1469.5 343.5 L 1447.5 343.5 Z M 615.5 320.5 L 638.5 320.5 L 638.5 343.5 L 615.5 343.5 Z M 463.5 320.5 L 486.5 320.5 L 486.5 343.5 L 463.5 343.5 Z M 1495.5 320.5 L 1518.5 320.5 L 1518.5 343.5 L 1495.5 343.5 Z M 511.5 320.5 L 534.5 320.5 L 534.5 343.5 L 511.5 343.5 Z M 559.5 320.5 L 582.5 320.5 L 582.5 343.5 L 559.5 343.5 Z M 1259.5 329.5 L 1282.5 329.5 L 1282.5 352.5 L 1259.5 352.5 Z M 1211.5 329.5 L 1233.5 329.5 L 1233.5 352.5 L 1211.5 352.5 Z M 1543.5 339.5 L 1566.5 339.5 L 1566.5 360.5 L 1543.5 360.5 Z M 1162.5 339.5 L 1185.5 339.5 L 1185.5 362.5 L 1162.5 362.5 Z M 1114.5 339.5 L 1137.5 339.5 L 1137.5 362.5 L 1114.5 362.5 Z M 760.5 339.5 L 783.5 339.5 L 783.5 362.5 L 760.5 362.5 Z M 415.5 339.5 L 437.5 339.5 L 437.5 362.5 L 415.5 362.5 Z M 270.5 339.5 L 293.5 339.5 L 293.5 362.5 L 270.5 362.5 Z M 1591.5 339.5 L 1614.5 339.5 L 1614.5 362.5 L 1591.5 362.5 Z M 318.5 339.5 L 341.5 339.5 L 341.5 362.5 L 318.5 362.5 Z M 366.5 339.5 L 389.5 339.5 L 389.5 362.5 L 366.5 362.5 Z M 712.5 339.5 L 734.5 339.5 L 734.5 362.5 L 712.5 362.5 Z M 1307.5 339.5 L 1330.5 339.5 L 1330.5 362.5 L 1307.5 362.5 Z M 1355.5 339.5 L 1378.5 339.5 L 1378.5 362.5 L 1355.5 362.5 Z M 1543.5 360.5 L 1566.5 360.5 L 1566.5 362.5 L 1543.5 362.5 Z M 325.5 748.5 L 348.5 748.5 L 348.5 771.5 L 325.5 771.5 Z M 373.5 748.5 L 396.5 748.5 L 396.5 771.5 L 373.5 771.5 Z M 749.5 748.5 L 772.5 748.5 L 772.5 771.5 L 749.5 771.5 Z M 1541.5 748.5 L 1564.5 748.5 L 1564.5 771.5 L 1541.5 771.5 Z M 1097.5 748.5 L 1120.5 748.5 L 1120.5 771.5 L 1097.5 771.5 Z M 798.5 748.5 L 820.5 748.5 L 820.5 771.5 L 798.5 771.5 Z M 1146.5 748.5 L 1168.5 748.5 L 1168.5 771.5 L 1146.5 771.5 Z M 421.5 748.5 L 444.5 748.5 L 444.5 771.5 L 421.5 771.5 Z M 1589.5 748.5 L 1612.5 748.5 L 1612.5 771.5 L 1589.5 771.5 Z M 1493.5 748.5 L 1516.5 748.5 L 1516.5 771.5 L 1493.5 771.5 Z M 846.5 757.5 L 869.5 757.5 L 869.5 780.5 L 846.5 780.5 Z M 1445.5 757.5 L 1467.5 757.5 L 1467.5 780.5 L 1445.5 780.5 Z M 1300.5 757.5 L 1323.5 757.5 L 1323.5 780.5 L 1300.5 780.5 Z M 1396.5 757.5 L 1419.5 757.5 L 1419.5 780.5 L 1396.5 780.5 Z M 1001.5 757.5 L 1023.5 757.5 L 1023.5 780.5 L 1001.5 780.5 Z M 1049.5 757.5 L 1072.5 757.5 L 1072.5 780.5 L 1049.5 780.5 Z M 1348.5 757.5 L 1371.5 757.5 L 1371.5 780.5 L 1348.5 780.5 Z M 240.5 816.5 L 262.5 816.5 L 262.5 839.5 L 240.5 839.5 Z M 1656.5 816.5 L 1679.5 816.5 L 1679.5 839.5 L 1656.5 839.5 Z M 1591.5 816.5 L 1614.5 816.5 L 1614.5 839.5 L 1591.5 839.5 Z M 1527.5 816.5 L 1550.5 816.5 L 1550.5 839.5 L 1527.5 839.5 Z M 1463.5 816.5 L 1486.5 816.5 L 1486.5 839.5 L 1463.5 839.5 Z M 1398.5 816.5 L 1421.5 816.5 L 1421.5 839.5 L 1398.5 839.5 Z M 1334.5 816.5 L 1357.5 816.5 L 1357.5 839.5 L 1334.5 839.5 Z M 1270.5 816.5 L 1292.5 816.5 L 1292.5 839.5 L 1270.5 839.5 Z M 1205.5 816.5 L 1228.5 816.5 L 1228.5 839.5 L 1205.5 839.5 Z M 1141.5 816.5 L 1164.5 816.5 L 1164.5 839.5 L 1141.5 839.5 Z M 1076.5 816.5 L 1099.5 816.5 L 1099.5 839.5 L 1076.5 839.5 Z M 1012.5 816.5 L 1035.5 816.5 L 1035.5 839.5 L 1012.5 839.5 Z M 948.5 816.5 L 971.5 816.5 L 971.5 839.5 L 948.5 839.5 Z M 883.5 816.5 L 906.5 816.5 L 906.5 839.5 L 883.5 839.5 Z M 819.5 816.5 L 842.5 816.5 L 842.5 839.5 L 819.5 839.5 Z M 755.5 816.5 L 777.5 816.5 L 777.5 839.5 L 755.5 839.5 Z M 690.5 816.5 L 713.5 816.5 L 713.5 839.5 L 690.5 839.5 Z M 626.5 816.5 L 649.5 816.5 L 649.5 839.5 L 626.5 839.5 Z M 561.5 816.5 L 584.5 816.5 L 584.5 839.5 L 561.5 839.5 Z M 497.5 816.5 L 520.5 816.5 L 520.5 839.5 L 497.5 839.5 Z M 433.5 816.5 L 456.5 816.5 L 456.5 839.5 L 433.5 839.5 Z M 368.5 816.5 L 391.5 816.5 L 391.5 839.5 L 368.5 839.5 Z M 304.5 816.5 L 327.5 816.5 L 327.5 839.5 L 304.5 839.5 Z M 304.5 816.5 "/>
 </clipPath>
-<image id="image555" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image582" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image555"/>
+  <use xlink:href="#image582"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface546">
+<g id="surface573">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -273,6 +273,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 481.308594 556.558594 L 481.308594 566.375 L 498.195312 566.375 L 498.195312 569.597656 L 477.65625 569.597656 L 477.65625 540.96875 L 497.488281 540.96875 L 497.488281 544.1875 L 481.308594 544.1875 L 481.308594 553.339844 L 496.898438 553.339844 L 496.898438 556.558594 Z M 481.308594 556.558594 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 433 536 L 456 536 M 433 513 L 456 513 M 433 513 L 433 536 M 456 513 L 456 536 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 433 536 L 456 536 M 433 513 L 456 513 M 456 536 L 456 513 M 433 536 L 433 513 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 219 246 L 219 255 M 214 251 L 223 251 M 218 252 L 220 252 M 218 250 L 220 250 M 218 250 L 218 252 M 220 250 L 220 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.svg b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.svg
index 1ad4769..f479890 100644
--- a/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.svg
+++ b/cells/sdlxtp/sky130_fd_sc_hvl__sdlxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 573.5 L 174.5 573.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image425"/>
+  <use xlink:href="#image453"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 217.5 281.5 L 1701.5 281.5 L 1701.5 303.5 L 217.5 303.5 Z M 217.5 281.5 "/>
 </clipPath>
-<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image426"/>
+  <use xlink:href="#image454"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 217.5 281.5 L 1701.5 281.5 L 1701.5 303.5 L 217.5 303.5 Z M 1435.5 651.5 L 1680.5 651.5 L 1680.5 667.5 L 1435.5 667.5 Z M 1435.5 667.5 L 1680.5 667.5 L 1680.5 689.5 L 1435.5 689.5 Z M 1435.5 689.5 L 1680.5 689.5 L 1680.5 705.5 L 1435.5 705.5 Z M 1071.5 693.5 L 1396.5 693.5 L 1396.5 708.5 L 1071.5 708.5 Z M 239.5 693.5 L 859.5 693.5 L 859.5 709.5 L 239.5 709.5 Z M 898.5 693.5 L 1033.5 693.5 L 1033.5 709.5 L 898.5 709.5 Z M 1548.5 705.5 L 1680.5 705.5 L 1680.5 718.5 L 1548.5 718.5 Z M 1071.5 708.5 L 1396.5 708.5 L 1396.5 730.5 L 1071.5 730.5 Z M 239.5 709.5 L 859.5 709.5 L 859.5 731.5 L 239.5 731.5 Z M 898.5 709.5 L 1033.5 709.5 L 1033.5 731.5 L 898.5 731.5 Z M 1548.5 718.5 L 1680.5 718.5 L 1680.5 739.5 L 1548.5 739.5 Z M 898.5 731.5 L 1033.5 731.5 L 1033.5 747.5 L 898.5 747.5 Z M 239.5 731.5 L 859.5 731.5 L 859.5 747.5 L 239.5 747.5 Z M 1071.5 730.5 L 1396.5 730.5 L 1396.5 747.5 L 1071.5 747.5 Z M 1548.5 739.5 L 1680.5 739.5 L 1680.5 747.5 L 1548.5 747.5 Z M 1548.5 739.5 "/>
 </clipPath>
-<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image455" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image427"/>
+  <use xlink:href="#image455"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 217.5 805.5 L 1701.5 805.5 L 1701.5 827.5 L 217.5 827.5 Z M 217.5 805.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image426"/>
+  <use xlink:href="#image454"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 1111.5 337.5 L 1148.5 337.5 L 1148.5 343.5 L 1111.5 343.5 Z M 1544.5 337.5 L 1580.5 337.5 L 1580.5 343.5 L 1544.5 343.5 Z M 1645.5 337.5 L 1682.5 337.5 L 1682.5 343.5 L 1645.5 343.5 Z M 1212.5 337.5 L 1249.5 337.5 L 1249.5 343.5 L 1212.5 343.5 Z M 541.5 341.5 L 577.5 341.5 L 577.5 346.5 L 541.5 346.5 Z M 733.5 341.5 L 769.5 341.5 L 769.5 346.5 L 733.5 346.5 Z M 351.5 341.5 L 385.5 341.5 L 385.5 349.5 L 351.5 349.5 Z M 1212.5 343.5 L 1249.5 343.5 L 1249.5 365.5 L 1212.5 365.5 Z M 1645.5 343.5 L 1682.5 343.5 L 1682.5 365.5 L 1645.5 365.5 Z M 1544.5 343.5 L 1580.5 343.5 L 1580.5 365.5 L 1544.5 365.5 Z M 1111.5 343.5 L 1148.5 343.5 L 1148.5 365.5 L 1111.5 365.5 Z M 541.5 346.5 L 577.5 346.5 L 577.5 368.5 L 541.5 368.5 Z M 733.5 346.5 L 769.5 346.5 L 769.5 368.5 L 733.5 368.5 Z M 351.5 349.5 L 385.5 349.5 L 385.5 371.5 L 351.5 371.5 Z M 1212.5 365.5 L 1249.5 365.5 L 1249.5 380.5 L 1212.5 380.5 Z M 351.5 371.5 L 385.5 371.5 L 385.5 384.5 L 351.5 384.5 Z M 1024.5 381.5 L 1061.5 381.5 L 1061.5 386.5 L 1024.5 386.5 Z M 923.5 381.5 L 960.5 381.5 L 960.5 386.5 L 923.5 386.5 Z M 834.5 341.5 L 871.5 341.5 L 871.5 396.5 L 834.5 396.5 Z M 1645.5 365.5 L 1682.5 365.5 L 1682.5 396.5 L 1645.5 396.5 Z M 1419.5 380.5 L 1455.5 380.5 L 1455.5 396.5 L 1419.5 396.5 Z M 236.5 384.5 L 273.5 384.5 L 273.5 400.5 L 236.5 400.5 Z M 733.5 368.5 L 769.5 368.5 L 769.5 404.5 L 733.5 404.5 Z M 1544.5 365.5 L 1580.5 365.5 L 1580.5 405.5 L 1544.5 405.5 Z M 1111.5 365.5 L 1148.5 365.5 L 1148.5 407.5 L 1111.5 407.5 Z M 1212.5 380.5 L 1263.5 380.5 L 1263.5 407.5 L 1212.5 407.5 Z M 923.5 386.5 L 960.5 386.5 L 960.5 408.5 L 923.5 408.5 Z M 1024.5 386.5 L 1061.5 386.5 L 1061.5 408.5 L 1024.5 408.5 Z M 337.5 384.5 L 385.5 384.5 L 385.5 408.5 L 337.5 408.5 Z M 541.5 368.5 L 577.5 368.5 L 577.5 411.5 L 541.5 411.5 Z M 1419.5 396.5 L 1455.5 396.5 L 1455.5 418.5 L 1419.5 418.5 Z M 834.5 396.5 L 871.5 396.5 L 871.5 418.5 L 834.5 418.5 Z M 1645.5 396.5 L 1682.5 396.5 L 1682.5 418.5 L 1645.5 418.5 Z M 236.5 400.5 L 273.5 400.5 L 273.5 422.5 L 236.5 422.5 Z M 733.5 404.5 L 769.5 404.5 L 769.5 426.5 L 733.5 426.5 Z M 1544.5 405.5 L 1580.5 405.5 L 1580.5 427.5 L 1544.5 427.5 Z M 1212.5 407.5 L 1263.5 407.5 L 1263.5 429.5 L 1212.5 429.5 Z M 1111.5 407.5 L 1148.5 407.5 L 1148.5 429.5 L 1111.5 429.5 Z M 337.5 408.5 L 385.5 408.5 L 385.5 430.5 L 337.5 430.5 Z M 541.5 411.5 L 577.5 411.5 L 577.5 433.5 L 541.5 433.5 Z M 1419.5 418.5 L 1455.5 418.5 L 1455.5 434.5 L 1419.5 434.5 Z M 1111.5 429.5 L 1148.5 429.5 L 1148.5 434.5 L 1111.5 434.5 Z M 1212.5 429.5 L 1263.5 429.5 L 1263.5 434.5 L 1212.5 434.5 Z M 1327.5 380.5 L 1354.5 380.5 L 1354.5 434.5 L 1327.5 434.5 Z M 733.5 426.5 L 769.5 426.5 L 769.5 438.5 L 733.5 438.5 Z M 642.5 341.5 L 669.5 341.5 L 669.5 438.5 L 642.5 438.5 Z M 337.5 430.5 L 385.5 430.5 L 385.5 438.5 L 337.5 438.5 Z M 450.5 341.5 L 477.5 341.5 L 477.5 438.5 L 450.5 438.5 Z M 834.5 418.5 L 871.5 418.5 L 871.5 438.5 L 834.5 438.5 Z M 236.5 422.5 L 273.5 422.5 L 273.5 438.5 L 236.5 438.5 Z M 541.5 433.5 L 577.5 433.5 L 577.5 438.5 L 541.5 438.5 Z M 1645.5 418.5 L 1682.5 418.5 L 1682.5 450.5 L 1645.5 450.5 Z M 1024.5 408.5 L 1061.5 408.5 L 1061.5 451.5 L 1024.5 451.5 Z M 923.5 408.5 L 960.5 408.5 L 960.5 451.5 L 923.5 451.5 Z M 1544.5 427.5 L 1580.5 427.5 L 1580.5 468.5 L 1544.5 468.5 Z M 1645.5 450.5 L 1682.5 450.5 L 1682.5 472.5 L 1645.5 472.5 Z M 923.5 451.5 L 960.5 451.5 L 960.5 473.5 L 923.5 473.5 Z M 1024.5 451.5 L 1061.5 451.5 L 1061.5 473.5 L 1024.5 473.5 Z M 1544.5 468.5 L 1580.5 468.5 L 1580.5 477.5 L 1544.5 477.5 Z M 1024.5 473.5 L 1061.5 473.5 L 1061.5 478.5 L 1024.5 478.5 Z M 923.5 473.5 L 960.5 473.5 L 960.5 478.5 L 923.5 478.5 Z M 1530.5 477.5 L 1580.5 477.5 L 1580.5 489.5 L 1530.5 489.5 Z M 1428.5 477.5 L 1465.5 477.5 L 1465.5 493.5 L 1428.5 493.5 Z M 1645.5 472.5 L 1682.5 472.5 L 1682.5 504.5 L 1645.5 504.5 Z M 1428.5 493.5 L 1465.5 493.5 L 1465.5 515.5 L 1428.5 515.5 Z M 1645.5 504.5 L 1682.5 504.5 L 1682.5 526.5 L 1645.5 526.5 Z M 1428.5 515.5 L 1465.5 515.5 L 1465.5 531.5 L 1428.5 531.5 Z M 1530.5 489.5 L 1580.5 489.5 L 1580.5 531.5 L 1530.5 531.5 Z M 1645.5 526.5 L 1682.5 526.5 L 1682.5 531.5 L 1645.5 531.5 Z M 217.5 805.5 L 1701.5 805.5 L 1701.5 827.5 L 217.5 827.5 Z M 217.5 805.5 "/>
 </clipPath>
-<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image428"/>
+  <use xlink:href="#image456"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1469.5 651.5 L 1533.5 651.5 L 1533.5 705.5 L 1469.5 705.5 Z M 275.5 693.5 L 340.5 693.5 L 340.5 747.5 L 275.5 747.5 Z M 467.5 693.5 L 532.5 693.5 L 532.5 747.5 L 467.5 747.5 Z M 1298.5 693.5 L 1362.5 693.5 L 1362.5 747.5 L 1298.5 747.5 Z M 1206.5 693.5 L 1271.5 693.5 L 1271.5 747.5 L 1206.5 747.5 Z M 1106.5 693.5 L 1170.5 693.5 L 1170.5 747.5 L 1106.5 747.5 Z M 934.5 693.5 L 999.5 693.5 L 999.5 747.5 L 934.5 747.5 Z M 760.5 693.5 L 825.5 693.5 L 825.5 747.5 L 760.5 747.5 Z M 659.5 693.5 L 724.5 693.5 L 724.5 747.5 L 659.5 747.5 Z M 568.5 693.5 L 632.5 693.5 L 632.5 747.5 L 568.5 747.5 Z M 376.5 693.5 L 440.5 693.5 L 440.5 747.5 L 376.5 747.5 Z M 1582.5 651.5 L 1646.5 651.5 L 1646.5 747.5 L 1582.5 747.5 Z M 1582.5 651.5 "/>
 </clipPath>
-<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image429"/>
+  <use xlink:href="#image457"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1148.5 337.5 L 1212.5 337.5 L 1212.5 434.5 L 1148.5 434.5 Z M 1354.5 380.5 L 1419.5 380.5 L 1419.5 434.5 L 1354.5 434.5 Z M 1263.5 380.5 L 1327.5 380.5 L 1327.5 434.5 L 1263.5 434.5 Z M 273.5 384.5 L 337.5 384.5 L 337.5 438.5 L 273.5 438.5 Z M 577.5 341.5 L 642.5 341.5 L 642.5 438.5 L 577.5 438.5 Z M 385.5 341.5 L 450.5 341.5 L 450.5 438.5 L 385.5 438.5 Z M 769.5 341.5 L 834.5 341.5 L 834.5 438.5 L 769.5 438.5 Z M 669.5 341.5 L 733.5 341.5 L 733.5 438.5 L 669.5 438.5 Z M 477.5 341.5 L 541.5 341.5 L 541.5 438.5 L 477.5 438.5 Z M 960.5 381.5 L 1024.5 381.5 L 1024.5 478.5 L 960.5 478.5 Z M 1465.5 477.5 L 1530.5 477.5 L 1530.5 531.5 L 1465.5 531.5 Z M 1580.5 337.5 L 1645.5 337.5 L 1645.5 531.5 L 1580.5 531.5 Z M 1580.5 337.5 "/>
 </clipPath>
-<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image430"/>
+  <use xlink:href="#image458"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 237.5 281.5 L 259.5 281.5 L 259.5 303.5 L 237.5 303.5 Z M 1659.5 281.5 L 1681.5 281.5 L 1681.5 303.5 L 1659.5 303.5 Z M 1597.5 281.5 L 1619.5 281.5 L 1619.5 303.5 L 1597.5 303.5 Z M 1535.5 281.5 L 1557.5 281.5 L 1557.5 303.5 L 1535.5 303.5 Z M 1473.5 281.5 L 1495.5 281.5 L 1495.5 303.5 L 1473.5 303.5 Z M 1412.5 281.5 L 1434.5 281.5 L 1434.5 303.5 L 1412.5 303.5 Z M 1350.5 281.5 L 1372.5 281.5 L 1372.5 303.5 L 1350.5 303.5 Z M 1288.5 281.5 L 1310.5 281.5 L 1310.5 303.5 L 1288.5 303.5 Z M 1226.5 281.5 L 1248.5 281.5 L 1248.5 303.5 L 1226.5 303.5 Z M 1164.5 281.5 L 1186.5 281.5 L 1186.5 303.5 L 1164.5 303.5 Z M 1102.5 281.5 L 1124.5 281.5 L 1124.5 303.5 L 1102.5 303.5 Z M 1041.5 281.5 L 1062.5 281.5 L 1062.5 303.5 L 1041.5 303.5 Z M 979.5 281.5 L 1001.5 281.5 L 1001.5 303.5 L 979.5 303.5 Z M 917.5 281.5 L 939.5 281.5 L 939.5 303.5 L 917.5 303.5 Z M 855.5 281.5 L 877.5 281.5 L 877.5 303.5 L 855.5 303.5 Z M 793.5 281.5 L 815.5 281.5 L 815.5 303.5 L 793.5 303.5 Z M 731.5 281.5 L 753.5 281.5 L 753.5 303.5 L 731.5 303.5 Z M 670.5 281.5 L 691.5 281.5 L 691.5 303.5 L 670.5 303.5 Z M 608.5 281.5 L 630.5 281.5 L 630.5 303.5 L 608.5 303.5 Z M 546.5 281.5 L 568.5 281.5 L 568.5 303.5 L 546.5 303.5 Z M 484.5 281.5 L 506.5 281.5 L 506.5 303.5 L 484.5 303.5 Z M 422.5 281.5 L 444.5 281.5 L 444.5 303.5 L 422.5 303.5 Z M 360.5 281.5 L 382.5 281.5 L 382.5 303.5 L 360.5 303.5 Z M 299.5 281.5 L 320.5 281.5 L 320.5 303.5 L 299.5 303.5 Z M 747.5 343.5 L 769.5 343.5 L 769.5 346.5 L 747.5 346.5 Z M 339.5 343.5 L 361.5 343.5 L 361.5 349.5 L 339.5 349.5 Z M 339.5 349.5 L 361.5 349.5 L 361.5 365.5 L 339.5 365.5 Z M 747.5 346.5 L 769.5 346.5 L 769.5 365.5 L 747.5 365.5 Z M 1432.5 343.5 L 1454.5 343.5 L 1454.5 365.5 L 1432.5 365.5 Z M 1386.5 343.5 L 1408.5 343.5 L 1408.5 365.5 L 1386.5 365.5 Z M 1339.5 343.5 L 1361.5 343.5 L 1361.5 365.5 L 1339.5 365.5 Z M 931.5 343.5 L 953.5 343.5 L 953.5 365.5 L 931.5 365.5 Z M 1542.5 343.5 L 1564.5 343.5 L 1564.5 365.5 L 1542.5 365.5 Z M 1495.5 343.5 L 1517.5 343.5 L 1517.5 365.5 L 1495.5 365.5 Z M 700.5 343.5 L 722.5 343.5 L 722.5 365.5 L 700.5 365.5 Z M 654.5 343.5 L 676.5 343.5 L 676.5 365.5 L 654.5 365.5 Z M 385.5 343.5 L 407.5 343.5 L 407.5 365.5 L 385.5 365.5 Z M 293.5 343.5 L 315.5 343.5 L 315.5 365.5 L 293.5 365.5 Z M 1588.5 343.5 L 1610.5 343.5 L 1610.5 365.5 L 1588.5 365.5 Z M 306.5 743.5 L 327.5 743.5 L 327.5 765.5 L 306.5 765.5 Z M 1592.5 743.5 L 1614.5 743.5 L 1614.5 765.5 L 1592.5 765.5 Z M 1546.5 743.5 L 1568.5 743.5 L 1568.5 765.5 L 1546.5 765.5 Z M 1499.5 743.5 L 1521.5 743.5 L 1521.5 765.5 L 1499.5 765.5 Z M 1376.5 743.5 L 1397.5 743.5 L 1397.5 765.5 L 1376.5 765.5 Z M 1329.5 743.5 L 1351.5 743.5 L 1351.5 765.5 L 1329.5 765.5 Z M 1283.5 743.5 L 1305.5 743.5 L 1305.5 765.5 L 1283.5 765.5 Z M 938.5 743.5 L 959.5 743.5 L 959.5 765.5 L 938.5 765.5 Z M 891.5 743.5 L 913.5 743.5 L 913.5 765.5 L 891.5 765.5 Z M 765.5 743.5 L 787.5 743.5 L 787.5 765.5 L 765.5 765.5 Z M 718.5 743.5 L 740.5 743.5 L 740.5 765.5 L 718.5 765.5 Z M 398.5 743.5 L 420.5 743.5 L 420.5 765.5 L 398.5 765.5 Z M 352.5 743.5 L 374.5 743.5 L 374.5 765.5 L 352.5 765.5 Z M 237.5 805.5 L 259.5 805.5 L 259.5 827.5 L 237.5 827.5 Z M 1659.5 805.5 L 1681.5 805.5 L 1681.5 827.5 L 1659.5 827.5 Z M 1597.5 805.5 L 1619.5 805.5 L 1619.5 827.5 L 1597.5 827.5 Z M 1535.5 805.5 L 1557.5 805.5 L 1557.5 827.5 L 1535.5 827.5 Z M 1473.5 805.5 L 1495.5 805.5 L 1495.5 827.5 L 1473.5 827.5 Z M 1412.5 805.5 L 1434.5 805.5 L 1434.5 827.5 L 1412.5 827.5 Z M 1350.5 805.5 L 1372.5 805.5 L 1372.5 827.5 L 1350.5 827.5 Z M 1288.5 805.5 L 1310.5 805.5 L 1310.5 827.5 L 1288.5 827.5 Z M 1226.5 805.5 L 1248.5 805.5 L 1248.5 827.5 L 1226.5 827.5 Z M 1164.5 805.5 L 1186.5 805.5 L 1186.5 827.5 L 1164.5 827.5 Z M 1102.5 805.5 L 1124.5 805.5 L 1124.5 827.5 L 1102.5 827.5 Z M 1041.5 805.5 L 1062.5 805.5 L 1062.5 827.5 L 1041.5 827.5 Z M 979.5 805.5 L 1001.5 805.5 L 1001.5 827.5 L 979.5 827.5 Z M 917.5 805.5 L 939.5 805.5 L 939.5 827.5 L 917.5 827.5 Z M 855.5 805.5 L 877.5 805.5 L 877.5 827.5 L 855.5 827.5 Z M 793.5 805.5 L 815.5 805.5 L 815.5 827.5 L 793.5 827.5 Z M 731.5 805.5 L 753.5 805.5 L 753.5 827.5 L 731.5 827.5 Z M 670.5 805.5 L 691.5 805.5 L 691.5 827.5 L 670.5 827.5 Z M 608.5 805.5 L 630.5 805.5 L 630.5 827.5 L 608.5 827.5 Z M 546.5 805.5 L 568.5 805.5 L 568.5 827.5 L 546.5 827.5 Z M 484.5 805.5 L 506.5 805.5 L 506.5 827.5 L 484.5 827.5 Z M 422.5 805.5 L 444.5 805.5 L 444.5 827.5 L 422.5 827.5 Z M 360.5 805.5 L 382.5 805.5 L 382.5 827.5 L 360.5 827.5 Z M 299.5 805.5 L 320.5 805.5 L 320.5 827.5 L 299.5 827.5 Z M 299.5 805.5 "/>
 </clipPath>
-<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image431"/>
+  <use xlink:href="#image459"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface422">
+<g id="surface450">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -255,6 +255,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1684.257812 425.304688 L 1682.476562 427.5 L 1678.5 424.207031 L 1677.367188 424.8125 L 1676.230469 425.265625 L 1675.054688 425.644531 L 1673.804688 425.910156 L 1672.554688 426.0625 L 1671.269531 426.136719 L 1669.527344 426.023438 L 1667.898438 425.757812 L 1666.382812 425.304688 L 1664.945312 424.699219 L 1663.582031 423.902344 L 1662.371094 422.878906 L 1661.269531 421.78125 L 1660.324219 420.53125 L 1659.566406 419.167969 L 1658.921875 417.691406 L 1658.429688 416.101562 L 1658.128906 414.359375 L 1658.050781 413.941406 L 1658.015625 413.488281 L 1657.976562 413.070312 L 1657.9375 412.617188 L 1657.9375 411.671875 L 1658.015625 409.777344 L 1658.28125 407.960938 L 1658.695312 406.292969 L 1659.300781 404.703125 L 1660.058594 403.226562 L 1661.042969 401.863281 L 1662.027344 400.765625 L 1663.164062 399.78125 L 1664.414062 398.949219 L 1665.738281 398.304688 L 1667.179688 397.773438 L 1668.769531 397.394531 L 1669.148438 397.355469 L 1669.566406 397.320312 L 1669.980469 397.28125 L 1670.398438 397.242188 L 1670.8125 397.242188 L 1671.269531 397.207031 L 1672.972656 397.320312 L 1674.601562 397.585938 L 1676.117188 398.039062 L 1677.554688 398.644531 L 1678.917969 399.441406 L 1680.167969 400.425781 L 1681.226562 401.558594 L 1682.175781 402.773438 L 1682.933594 404.097656 L 1683.574219 405.574219 L 1684.066406 407.164062 L 1684.410156 408.832031 L 1684.445312 409.324219 L 1684.523438 410.230469 L 1684.558594 410.6875 L 1684.558594 411.140625 L 1684.597656 411.59375 L 1684.484375 413.714844 L 1684.144531 415.722656 L 1683.613281 417.578125 L 1682.855469 419.320312 L 1681.871094 420.910156 L 1680.699219 422.386719 Z M 1674.714844 417.503906 L 1678.085938 420.265625 L 1678.992188 419.132812 L 1679.75 417.84375 L 1680.320312 416.441406 L 1680.734375 414.964844 L 1680.960938 413.375 L 1681.078125 411.632812 L 1681 410.042969 L 1680.773438 408.527344 L 1680.394531 407.125 L 1679.902344 405.839844 L 1679.257812 404.628906 L 1678.464844 403.53125 L 1677.554688 402.621094 L 1676.609375 401.863281 L 1675.546875 401.257812 L 1674.410156 400.804688 L 1673.160156 400.5 L 1671.875 400.3125 L 1671.269531 400.3125 L 1669.90625 400.425781 L 1668.617188 400.652344 L 1667.40625 401.03125 L 1666.308594 401.597656 L 1665.285156 402.316406 L 1664.375 403.1875 L 1663.503906 404.210938 L 1662.824219 405.347656 L 1662.257812 406.597656 L 1661.839844 407.960938 L 1661.574219 409.4375 L 1661.460938 411.027344 L 1661.460938 411.671875 L 1661.5 413.335938 L 1661.726562 414.851562 L 1662.105469 416.253906 L 1662.597656 417.578125 L 1663.277344 418.789062 L 1664.113281 419.851562 L 1664.984375 420.796875 L 1665.96875 421.554688 L 1667.027344 422.160156 L 1668.164062 422.578125 L 1669.414062 422.878906 L 1670.738281 422.992188 L 1670.8125 423.03125 L 1671.914062 423.03125 L 1672.632812 422.957031 L 1673.351562 422.804688 L 1674.03125 422.652344 L 1674.714844 422.425781 L 1675.433594 422.121094 L 1675.472656 422.121094 L 1675.546875 422.085938 L 1675.585938 422.046875 L 1675.660156 422.046875 L 1675.699219 422.007812 L 1675.773438 421.972656 L 1672.972656 419.625 Z M 1674.714844 417.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1659 679 L 1681 679 M 1659 657 L 1681 657 M 1659 657 L 1659 679 M 1681 657 L 1681 679 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1659 679 L 1681 679 M 1659 657 L 1681 657 M 1681 679 L 1681 657 M 1659 679 L 1659 657 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 217 258 L 217 267 M 212 263 L 221 263 M 216 264 L 218 264 M 216 262 L 218 262 M 216 262 L 216 264 M 218 262 L 218 264 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.svg b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.svg
index 3befedc..c0d3a52 100644
--- a/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.svg
+++ b/cells/xnor2/sky130_fd_sc_hvl__xnor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 396.5 98.5 L 1526.5 98.5 L 1526.5 593.5 L 396.5 593.5 Z M 396.5 98.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 458.5 161.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 1218.5 699.5 L 1421.5 699.5 L 1421.5 707.5 L 1218.5 707.5 Z M 487.5 707.5 L 1161.5 707.5 L 1161.5 718.5 L 487.5 718.5 Z M 1218.5 707.5 L 1421.5 707.5 L 1421.5 739.5 L 1218.5 739.5 Z M 487.5 718.5 L 1161.5 718.5 L 1161.5 751.5 L 487.5 751.5 Z M 1218.5 739.5 L 1421.5 739.5 L 1421.5 802.5 L 1218.5 802.5 Z M 487.5 751.5 L 1161.5 751.5 L 1161.5 806.5 L 487.5 806.5 Z M 1218.5 802.5 L 1421.5 802.5 L 1421.5 835.5 L 1218.5 835.5 Z M 487.5 806.5 L 1161.5 806.5 L 1161.5 838.5 L 487.5 838.5 Z M 1218.5 835.5 L 1421.5 835.5 L 1421.5 842.5 L 1218.5 842.5 Z M 487.5 838.5 L 1161.5 838.5 L 1161.5 850.5 L 487.5 850.5 Z M 487.5 838.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 520.5 245.5 L 574.5 245.5 L 574.5 252.5 L 520.5 252.5 Z M 818.5 245.5 L 876.5 245.5 L 876.5 252.5 L 818.5 252.5 Z M 1362.5 245.5 L 1417.5 245.5 L 1417.5 252.5 L 1362.5 252.5 Z M 1106.5 245.5 L 1267.5 245.5 L 1267.5 252.5 L 1106.5 252.5 Z M 670.5 245.5 L 723.5 245.5 L 723.5 252.5 L 670.5 252.5 Z M 1106.5 252.5 L 1267.5 252.5 L 1267.5 285.5 L 1106.5 285.5 Z M 670.5 252.5 L 723.5 252.5 L 723.5 285.5 L 670.5 285.5 Z M 1362.5 252.5 L 1417.5 252.5 L 1417.5 285.5 L 1362.5 285.5 Z M 520.5 252.5 L 574.5 252.5 L 574.5 285.5 L 520.5 285.5 Z M 818.5 252.5 L 876.5 252.5 L 876.5 285.5 L 818.5 285.5 Z M 670.5 285.5 L 723.5 285.5 L 723.5 325.5 L 670.5 325.5 Z M 818.5 285.5 L 876.5 285.5 L 876.5 328.5 L 818.5 328.5 Z M 1106.5 285.5 L 1267.5 285.5 L 1267.5 331.5 L 1106.5 331.5 Z M 1362.5 285.5 L 1417.5 285.5 L 1417.5 331.5 L 1362.5 331.5 Z M 520.5 285.5 L 574.5 285.5 L 574.5 336.5 L 520.5 336.5 Z M 670.5 325.5 L 723.5 325.5 L 723.5 357.5 L 670.5 357.5 Z M 818.5 328.5 L 876.5 328.5 L 876.5 361.5 L 818.5 361.5 Z M 1362.5 331.5 L 1417.5 331.5 L 1417.5 364.5 L 1362.5 364.5 Z M 1106.5 331.5 L 1267.5 331.5 L 1267.5 364.5 L 1106.5 364.5 Z M 520.5 336.5 L 574.5 336.5 L 574.5 368.5 L 520.5 368.5 Z M 670.5 357.5 L 723.5 357.5 L 723.5 398.5 L 670.5 398.5 Z M 818.5 361.5 L 876.5 361.5 L 876.5 405.5 L 818.5 405.5 Z M 1106.5 364.5 L 1267.5 364.5 L 1267.5 411.5 L 1106.5 411.5 Z M 1362.5 364.5 L 1417.5 364.5 L 1417.5 411.5 L 1362.5 411.5 Z M 520.5 368.5 L 574.5 368.5 L 574.5 419.5 L 520.5 419.5 Z M 670.5 398.5 L 723.5 398.5 L 723.5 430.5 L 670.5 430.5 Z M 818.5 405.5 L 876.5 405.5 L 876.5 438.5 L 818.5 438.5 Z M 1106.5 411.5 L 1267.5 411.5 L 1267.5 444.5 L 1106.5 444.5 Z M 1362.5 411.5 L 1417.5 411.5 L 1417.5 444.5 L 1362.5 444.5 Z M 520.5 419.5 L 574.5 419.5 L 574.5 451.5 L 520.5 451.5 Z M 670.5 430.5 L 723.5 430.5 L 723.5 470.5 L 670.5 470.5 Z M 818.5 438.5 L 876.5 438.5 L 876.5 482.5 L 818.5 482.5 Z M 1362.5 444.5 L 1417.5 444.5 L 1417.5 490.5 L 1362.5 490.5 Z M 1106.5 444.5 L 1267.5 444.5 L 1267.5 490.5 L 1106.5 490.5 Z M 670.5 470.5 L 723.5 470.5 L 723.5 503.5 L 670.5 503.5 Z M 818.5 482.5 L 876.5 482.5 L 876.5 514.5 L 818.5 514.5 Z M 1106.5 490.5 L 1267.5 490.5 L 1267.5 522.5 L 1106.5 522.5 Z M 1362.5 490.5 L 1417.5 490.5 L 1417.5 522.5 L 1362.5 522.5 Z M 971.5 245.5 L 1011.5 245.5 L 1011.5 530.5 L 971.5 530.5 Z M 520.5 451.5 L 574.5 451.5 L 574.5 530.5 L 520.5 530.5 Z M 1362.5 522.5 L 1417.5 522.5 L 1417.5 530.5 L 1362.5 530.5 Z M 818.5 514.5 L 876.5 514.5 L 876.5 530.5 L 818.5 530.5 Z M 670.5 503.5 L 723.5 503.5 L 723.5 530.5 L 670.5 530.5 Z M 1106.5 522.5 L 1267.5 522.5 L 1267.5 530.5 L 1106.5 530.5 Z M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1272.5 699.5 L 1367.5 699.5 L 1367.5 842.5 L 1272.5 842.5 Z M 710.5 707.5 L 805.5 707.5 L 805.5 850.5 L 710.5 850.5 Z M 1011.5 707.5 L 1106.5 707.5 L 1106.5 850.5 L 1011.5 850.5 Z M 861.5 707.5 L 956.5 707.5 L 956.5 850.5 L 861.5 850.5 Z M 574.5 707.5 L 670.5 707.5 L 670.5 850.5 L 574.5 850.5 Z M 574.5 707.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1267.5 245.5 L 1362.5 245.5 L 1362.5 530.5 L 1267.5 530.5 Z M 574.5 245.5 L 670.5 245.5 L 670.5 530.5 L 574.5 530.5 Z M 723.5 245.5 L 818.5 245.5 L 818.5 530.5 L 723.5 530.5 Z M 876.5 245.5 L 971.5 245.5 L 971.5 530.5 L 876.5 530.5 Z M 1011.5 245.5 L 1106.5 245.5 L 1106.5 530.5 L 1011.5 530.5 Z M 1011.5 245.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 488.5 161.5 L 520.5 161.5 L 520.5 193.5 L 488.5 193.5 Z M 1401.5 161.5 L 1434.5 161.5 L 1434.5 193.5 L 1401.5 193.5 Z M 1310.5 161.5 L 1342.5 161.5 L 1342.5 193.5 L 1310.5 193.5 Z M 1219.5 161.5 L 1251.5 161.5 L 1251.5 193.5 L 1219.5 193.5 Z M 1127.5 161.5 L 1160.5 161.5 L 1160.5 193.5 L 1127.5 193.5 Z M 1036.5 161.5 L 1068.5 161.5 L 1068.5 193.5 L 1036.5 193.5 Z M 945.5 161.5 L 977.5 161.5 L 977.5 193.5 L 945.5 193.5 Z M 853.5 161.5 L 886.5 161.5 L 886.5 193.5 L 853.5 193.5 Z M 762.5 161.5 L 794.5 161.5 L 794.5 193.5 L 762.5 193.5 Z M 671.5 161.5 L 703.5 161.5 L 703.5 193.5 L 671.5 193.5 Z M 579.5 161.5 L 612.5 161.5 L 612.5 193.5 L 579.5 193.5 Z M 476.5 252.5 L 509.5 252.5 L 509.5 285.5 L 476.5 285.5 Z M 1382.5 252.5 L 1415.5 252.5 L 1415.5 285.5 L 1382.5 285.5 Z M 1314.5 252.5 L 1346.5 252.5 L 1346.5 285.5 L 1314.5 285.5 Z M 1158.5 252.5 L 1190.5 252.5 L 1190.5 285.5 L 1158.5 285.5 Z M 1089.5 252.5 L 1122.5 252.5 L 1122.5 285.5 L 1089.5 285.5 Z M 1021.5 252.5 L 1053.5 252.5 L 1053.5 285.5 L 1021.5 285.5 Z M 952.5 252.5 L 985.5 252.5 L 985.5 285.5 L 952.5 285.5 Z M 884.5 252.5 L 916.5 252.5 L 916.5 285.5 L 884.5 285.5 Z M 815.5 252.5 L 848.5 252.5 L 848.5 285.5 L 815.5 285.5 Z M 747.5 252.5 L 779.5 252.5 L 779.5 285.5 L 747.5 285.5 Z M 613.5 252.5 L 646.5 252.5 L 646.5 285.5 L 613.5 285.5 Z M 545.5 252.5 L 577.5 252.5 L 577.5 285.5 L 545.5 285.5 Z M 611.5 844.5 L 643.5 844.5 L 643.5 876.5 L 611.5 876.5 Z M 1117.5 844.5 L 1149.5 844.5 L 1149.5 876.5 L 1117.5 876.5 Z M 1048.5 844.5 L 1081.5 844.5 L 1081.5 876.5 L 1048.5 876.5 Z M 885.5 844.5 L 917.5 844.5 L 917.5 876.5 L 885.5 876.5 Z M 816.5 844.5 L 849.5 844.5 L 849.5 876.5 L 816.5 876.5 Z M 748.5 844.5 L 780.5 844.5 L 780.5 876.5 L 748.5 876.5 Z M 679.5 844.5 L 711.5 844.5 L 711.5 876.5 L 679.5 876.5 Z M 488.5 935.5 L 520.5 935.5 L 520.5 968.5 L 488.5 968.5 Z M 1401.5 935.5 L 1434.5 935.5 L 1434.5 968.5 L 1401.5 968.5 Z M 1310.5 935.5 L 1342.5 935.5 L 1342.5 968.5 L 1310.5 968.5 Z M 1219.5 935.5 L 1251.5 935.5 L 1251.5 968.5 L 1219.5 968.5 Z M 1127.5 935.5 L 1160.5 935.5 L 1160.5 968.5 L 1127.5 968.5 Z M 1036.5 935.5 L 1068.5 935.5 L 1068.5 968.5 L 1036.5 968.5 Z M 945.5 935.5 L 977.5 935.5 L 977.5 968.5 L 945.5 968.5 Z M 853.5 935.5 L 886.5 935.5 L 886.5 968.5 L 853.5 968.5 Z M 762.5 935.5 L 794.5 935.5 L 794.5 968.5 L 762.5 968.5 Z M 671.5 935.5 L 703.5 935.5 L 703.5 968.5 L 671.5 968.5 Z M 579.5 935.5 L 612.5 935.5 L 612.5 968.5 L 579.5 968.5 Z M 579.5 935.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface349">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -198,6 +198,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1421.210938 709.457031 L 1421.210938 725.5 L 1415.992188 725.5 L 1415.992188 709.457031 L 1400.230469 684.601562 L 1406.679688 684.601562 L 1418.6875 704.519531 L 1430.355469 684.601562 L 1436.582031 684.601562 Z M 1421.210938 709.457031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1401 390 L 1434 390 M 1401 358 L 1434 358 M 1401 358 L 1401 390 M 1434 358 L 1434 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1401 390 L 1434 390 M 1401 358 L 1434 358 M 1434 390 L 1434 358 M 1401 390 L 1401 358 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 458 122 L 458 131 M 453 127 L 462 127 M 457 128 L 459 128 M 457 126 L 459 126 M 457 126 L 457 128 M 459 126 L 459 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor2/sky130_fd_sc_hvl__xor2_1.svg b/cells/xor2/sky130_fd_sc_hvl__xor2_1.svg
index a49790c..d5f28f3 100644
--- a/cells/xor2/sky130_fd_sc_hvl__xor2_1.svg
+++ b/cells/xor2/sky130_fd_sc_hvl__xor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 396.5 98.5 L 1526.5 98.5 L 1526.5 593.5 L 396.5 593.5 Z M 396.5 98.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 458.5 161.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -33,9 +33,9 @@
 <clipPath id="clip6">
   <path d="M 458.5 161.5 L 1463.5 161.5 L 1463.5 193.5 L 458.5 193.5 Z M 487.5 707.5 L 1383.5 707.5 L 1383.5 715.5 L 487.5 715.5 Z M 487.5 715.5 L 1383.5 715.5 L 1383.5 747.5 L 487.5 747.5 Z M 487.5 747.5 L 1383.5 747.5 L 1383.5 810.5 L 487.5 810.5 Z M 487.5 810.5 L 1383.5 810.5 L 1383.5 842.5 L 487.5 842.5 Z M 487.5 842.5 L 1383.5 842.5 L 1383.5 850.5 L 487.5 850.5 Z M 487.5 842.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAmSURBVDiNY2BgYPjPAAHk0vQClLqT1jS9wED7czQciKPpBWjpDwArz0+xoXriqgAAAABJRU5ErkJggg=="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -47,7 +47,7 @@
   <path d="M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 487.5 245.5 L 541.5 245.5 L 541.5 252.5 L 487.5 252.5 Z M 964.5 245.5 L 1017.5 245.5 L 1017.5 252.5 L 964.5 252.5 Z M 771.5 245.5 L 868.5 245.5 L 868.5 252.5 L 771.5 252.5 Z M 1380.5 245.5 L 1435.5 245.5 L 1435.5 252.5 L 1380.5 252.5 Z M 1112.5 245.5 L 1166.5 245.5 L 1166.5 271.5 L 1112.5 271.5 Z M 487.5 252.5 L 541.5 252.5 L 541.5 285.5 L 487.5 285.5 Z M 964.5 252.5 L 1017.5 252.5 L 1017.5 285.5 L 964.5 285.5 Z M 1380.5 252.5 L 1435.5 252.5 L 1435.5 285.5 L 1380.5 285.5 Z M 771.5 252.5 L 868.5 252.5 L 868.5 285.5 L 771.5 285.5 Z M 1112.5 271.5 L 1166.5 271.5 L 1166.5 304.5 L 1112.5 304.5 Z M 771.5 285.5 L 868.5 285.5 L 868.5 321.5 L 771.5 321.5 Z M 487.5 285.5 L 541.5 285.5 L 541.5 331.5 L 487.5 331.5 Z M 1380.5 285.5 L 1435.5 285.5 L 1435.5 331.5 L 1380.5 331.5 Z M 771.5 321.5 L 868.5 321.5 L 868.5 353.5 L 771.5 353.5 Z M 487.5 331.5 L 541.5 331.5 L 541.5 364.5 L 487.5 364.5 Z M 1380.5 331.5 L 1435.5 331.5 L 1435.5 364.5 L 1380.5 364.5 Z M 964.5 285.5 L 1017.5 285.5 L 1017.5 374.5 L 964.5 374.5 Z M 771.5 353.5 L 868.5 353.5 L 868.5 389.5 L 771.5 389.5 Z M 964.5 374.5 L 1017.5 374.5 L 1017.5 406.5 L 964.5 406.5 Z M 487.5 364.5 L 541.5 364.5 L 541.5 411.5 L 487.5 411.5 Z M 1380.5 364.5 L 1435.5 364.5 L 1435.5 411.5 L 1380.5 411.5 Z M 771.5 389.5 L 868.5 389.5 L 868.5 422.5 L 771.5 422.5 Z M 487.5 411.5 L 541.5 411.5 L 541.5 444.5 L 487.5 444.5 Z M 1380.5 411.5 L 1435.5 411.5 L 1435.5 444.5 L 1380.5 444.5 Z M 1380.5 444.5 L 1435.5 444.5 L 1435.5 490.5 L 1380.5 490.5 Z M 1231.5 245.5 L 1285.5 245.5 L 1285.5 490.5 L 1231.5 490.5 Z M 487.5 444.5 L 541.5 444.5 L 541.5 490.5 L 487.5 490.5 Z M 1380.5 490.5 L 1435.5 490.5 L 1435.5 522.5 L 1380.5 522.5 Z M 487.5 490.5 L 541.5 490.5 L 541.5 522.5 L 487.5 522.5 Z M 1231.5 490.5 L 1285.5 490.5 L 1285.5 522.5 L 1231.5 522.5 Z M 1112.5 304.5 L 1166.5 304.5 L 1166.5 530.5 L 1112.5 530.5 Z M 964.5 406.5 L 1017.5 406.5 L 1017.5 530.5 L 964.5 530.5 Z M 487.5 522.5 L 541.5 522.5 L 541.5 530.5 L 487.5 530.5 Z M 636.5 245.5 L 676.5 245.5 L 676.5 530.5 L 636.5 530.5 Z M 1231.5 522.5 L 1285.5 522.5 L 1285.5 530.5 L 1231.5 530.5 Z M 1380.5 522.5 L 1435.5 522.5 L 1435.5 530.5 L 1380.5 530.5 Z M 771.5 422.5 L 868.5 422.5 L 868.5 530.5 L 771.5 530.5 Z M 458.5 935.5 L 1463.5 935.5 L 1463.5 968.5 L 458.5 968.5 Z M 458.5 935.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAqSURBVDiNY2BgYGD4zwABuGhiVNAWUMOF9FFBWzBYfDkaDsSqoC2guR8Ae39PscoLRjkAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -65,9 +65,9 @@
 <clipPath id="clip10">
   <path d="M 1234.5 707.5 L 1329.5 707.5 L 1329.5 850.5 L 1234.5 850.5 Z M 541.5 707.5 L 636.5 707.5 L 636.5 850.5 L 541.5 850.5 Z M 690.5 707.5 L 785.5 707.5 L 785.5 850.5 L 690.5 850.5 Z M 950.5 707.5 L 1045.5 707.5 L 1045.5 850.5 L 950.5 850.5 Z M 1085.5 707.5 L 1181.5 707.5 L 1181.5 850.5 L 1085.5 850.5 Z M 1085.5 707.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
@@ -75,9 +75,9 @@
 <clipPath id="clip11">
   <path d="M 1285.5 245.5 L 1380.5 245.5 L 1380.5 530.5 L 1285.5 530.5 Z M 541.5 245.5 L 636.5 245.5 L 636.5 530.5 L 541.5 530.5 Z M 676.5 245.5 L 771.5 245.5 L 771.5 530.5 L 676.5 530.5 Z M 868.5 245.5 L 964.5 245.5 L 964.5 530.5 L 868.5 530.5 Z M 1017.5 245.5 L 1112.5 245.5 L 1112.5 530.5 L 1017.5 530.5 Z M 1017.5 245.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask6">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
@@ -91,15 +91,15 @@
 <clipPath id="clip14">
   <path d="M 488.5 161.5 L 520.5 161.5 L 520.5 193.5 L 488.5 193.5 Z M 1401.5 161.5 L 1434.5 161.5 L 1434.5 193.5 L 1401.5 193.5 Z M 1310.5 161.5 L 1342.5 161.5 L 1342.5 193.5 L 1310.5 193.5 Z M 1219.5 161.5 L 1251.5 161.5 L 1251.5 193.5 L 1219.5 193.5 Z M 1127.5 161.5 L 1160.5 161.5 L 1160.5 193.5 L 1127.5 193.5 Z M 1036.5 161.5 L 1068.5 161.5 L 1068.5 193.5 L 1036.5 193.5 Z M 945.5 161.5 L 977.5 161.5 L 977.5 193.5 L 945.5 193.5 Z M 853.5 161.5 L 886.5 161.5 L 886.5 193.5 L 853.5 193.5 Z M 762.5 161.5 L 794.5 161.5 L 794.5 193.5 L 762.5 193.5 Z M 671.5 161.5 L 703.5 161.5 L 703.5 193.5 L 671.5 193.5 Z M 579.5 161.5 L 612.5 161.5 L 612.5 193.5 L 579.5 193.5 Z M 1114.5 252.5 L 1146.5 252.5 L 1146.5 271.5 L 1114.5 271.5 Z M 1114.5 271.5 L 1146.5 271.5 L 1146.5 285.5 L 1114.5 285.5 Z M 1182.5 252.5 L 1215.5 252.5 L 1215.5 285.5 L 1182.5 285.5 Z M 1251.5 252.5 L 1283.5 252.5 L 1283.5 285.5 L 1251.5 285.5 Z M 1320.5 252.5 L 1352.5 252.5 L 1352.5 285.5 L 1320.5 285.5 Z M 770.5 252.5 L 803.5 252.5 L 803.5 285.5 L 770.5 285.5 Z M 1045.5 252.5 L 1078.5 252.5 L 1078.5 285.5 L 1045.5 285.5 Z M 908.5 252.5 L 940.5 252.5 L 940.5 285.5 L 908.5 285.5 Z M 839.5 252.5 L 871.5 252.5 L 871.5 285.5 L 839.5 285.5 Z M 633.5 252.5 L 666.5 252.5 L 666.5 285.5 L 633.5 285.5 Z M 702.5 252.5 L 734.5 252.5 L 734.5 285.5 L 702.5 285.5 Z M 565.5 252.5 L 597.5 252.5 L 597.5 285.5 L 565.5 285.5 Z M 481.5 844.5 L 514.5 844.5 L 514.5 876.5 L 481.5 876.5 Z M 1398.5 844.5 L 1431.5 844.5 L 1431.5 876.5 L 1398.5 876.5 Z M 1330.5 844.5 L 1362.5 844.5 L 1362.5 876.5 L 1330.5 876.5 Z M 1124.5 844.5 L 1157.5 844.5 L 1157.5 876.5 L 1124.5 876.5 Z M 1056.5 844.5 L 1088.5 844.5 L 1088.5 876.5 L 1056.5 876.5 Z M 987.5 844.5 L 1020.5 844.5 L 1020.5 876.5 L 987.5 876.5 Z M 919.5 844.5 L 951.5 844.5 L 951.5 876.5 L 919.5 876.5 Z M 850.5 844.5 L 883.5 844.5 L 883.5 876.5 L 850.5 876.5 Z M 782.5 844.5 L 814.5 844.5 L 814.5 876.5 L 782.5 876.5 Z M 713.5 844.5 L 746.5 844.5 L 746.5 876.5 L 713.5 876.5 Z M 550.5 844.5 L 582.5 844.5 L 582.5 876.5 L 550.5 876.5 Z M 488.5 935.5 L 520.5 935.5 L 520.5 968.5 L 488.5 968.5 Z M 1401.5 935.5 L 1434.5 935.5 L 1434.5 968.5 L 1401.5 968.5 Z M 1310.5 935.5 L 1342.5 935.5 L 1342.5 968.5 L 1310.5 968.5 Z M 1219.5 935.5 L 1251.5 935.5 L 1251.5 968.5 L 1219.5 968.5 Z M 1127.5 935.5 L 1160.5 935.5 L 1160.5 968.5 L 1127.5 968.5 Z M 1036.5 935.5 L 1068.5 935.5 L 1068.5 968.5 L 1036.5 968.5 Z M 945.5 935.5 L 977.5 935.5 L 977.5 968.5 L 945.5 968.5 Z M 853.5 935.5 L 886.5 935.5 L 886.5 968.5 L 853.5 968.5 Z M 762.5 935.5 L 794.5 935.5 L 794.5 968.5 L 762.5 968.5 Z M 671.5 935.5 L 703.5 935.5 L 703.5 968.5 L 671.5 968.5 Z M 579.5 935.5 L 612.5 935.5 L 612.5 968.5 L 579.5 968.5 Z M 579.5 935.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern7" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface315">
+<g id="surface345">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1161.449219 643.832031 L 1161.339844 645.625 L 1161.058594 647.253906 L 1160.554688 648.769531 L 1159.878906 650.113281 L 1158.984375 651.40625 L 1157.917969 652.527344 L 1156.738281 653.480469 L 1155.503906 654.210938 L 1154.101562 654.769531 L 1152.644531 655.21875 L 1151.070312 655.445312 L 1149.390625 655.5 L 1130.933594 655.5 L 1130.933594 614.601562 L 1147.539062 614.601562 L 1149.949219 614.769531 L 1152.082031 615.164062 L 1153.988281 615.835938 L 1155.617188 616.789062 L 1157.019531 618.023438 L 1158.140625 619.539062 L 1158.589844 620.378906 L 1158.984375 621.277344 L 1159.261719 622.121094 L 1159.488281 623.074219 L 1159.597656 624.027344 L 1159.65625 624.980469 L 1159.488281 627 L 1158.984375 628.738281 L 1158.195312 630.367188 L 1157.074219 631.714844 L 1155.671875 632.949219 L 1153.988281 633.902344 L 1155.617188 634.628906 L 1157.019531 635.414062 L 1158.253906 636.3125 L 1159.261719 637.324219 L 1160.046875 638.390625 L 1160.664062 639.511719 L 1160.890625 640.183594 L 1161.058594 640.859375 L 1161.226562 641.53125 L 1161.339844 642.316406 L 1161.394531 643.046875 Z M 1154.4375 625.710938 L 1154.269531 624.027344 L 1153.765625 622.625 L 1152.980469 621.390625 L 1151.859375 620.492188 L 1150.457031 619.820312 L 1148.714844 619.371094 L 1148.324219 619.371094 L 1147.929688 619.316406 L 1147.539062 619.257812 L 1146.640625 619.257812 L 1146.246094 619.203125 L 1136.148438 619.203125 L 1136.148438 632.21875 L 1146.246094 632.21875 L 1148.324219 632.105469 L 1150.117188 631.769531 L 1151.632812 631.152344 L 1152.753906 630.3125 L 1153.652344 629.1875 L 1154.214844 627.84375 L 1154.269531 627.5625 L 1154.324219 627.226562 L 1154.382812 626.886719 L 1154.382812 626.101562 Z M 1148.882812 650.898438 L 1150.457031 650.84375 L 1151.859375 650.507812 L 1153.09375 649.945312 L 1154.101562 649.214844 L 1154.941406 648.261719 L 1155.617188 647.085938 L 1155.785156 646.636719 L 1155.898438 646.132812 L 1156.066406 645.570312 L 1156.121094 645.066406 L 1156.175781 644.503906 L 1156.234375 643.886719 L 1156.121094 642.652344 L 1155.898438 641.476562 L 1155.503906 640.464844 L 1154.941406 639.511719 L 1154.214844 638.726562 L 1153.371094 637.996094 L 1152.753906 637.660156 L 1152.082031 637.378906 L 1151.351562 637.15625 L 1150.566406 636.988281 L 1149.726562 636.875 L 1148.882812 636.820312 L 1136.148438 636.820312 L 1136.148438 650.898438 Z M 1148.882812 650.898438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1127 460 L 1160 460 M 1127 428 L 1160 428 M 1127 428 L 1127 460 M 1160 428 L 1160 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1127 460 L 1160 460 M 1127 428 L 1160 428 M 1160 460 L 1160 428 M 1127 460 L 1127 428 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 458 122 L 458 131 M 453 127 L 462 127 M 457 128 L 459 128 M 457 126 L 459 126 M 457 126 L 457 128 M 459 126 L 459 128 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>